more tracing

Author: tbarbugli

getstream/video/rtc/connection_manager.py

@@ -139,7 +139,7 @@ async def _on_ice_trickle(self, event):
     async def _on_subscriber_offer(self, event: events_pb2.SubscriberOffer):
         logger.info("Subscriber offer received")
 
-        with telemetry.start_as_current_span("rtx.on_subscriber_offer") as span:
+        with telemetry.start_as_current_span("rtc.on_subscriber_offer") as span:
             await self.subscriber_negotiation_lock.acquire()
 
             try:
@@ -163,20 +163,20 @@ async def _on_subscriber_offer(self, event: events_pb2.SubscriberOffer):
                 span.set_attribute("remote_description.sdp", fixed_sdp)
 
                 with telemetry.start_as_current_span(
-                    "rtx.on_subscriber_offer.set_remote_description"
+                    "rtc.on_subscriber_offer.set_remote_description"
                 ):
                     await self.subscriber_pc.setRemoteDescription(remote_description)
 
                 # Create the answer based on the remote offer (which includes our candidates)
                 with telemetry.start_as_current_span(
-                    "rtx.on_subscriber_offer.create_answer"
+                    "rtc.on_subscriber_offer.create_answer"
                 ) as span:
                     answer = await self.subscriber_pc.createAnswer()
                     span.set_attribute("answer.sdp", answer.sdp)
 
                 # Set the local description. aiortc will manage the SDP content.
                 with telemetry.start_as_current_span(
-                    "rtx.on_subscriber_offer.set_local_description"
+                    "rtc.on_subscriber_offer.set_local_description"
                 ):
                     await self.subscriber_pc.setLocalDescription(answer)
 
@@ -391,7 +391,8 @@ async def __aexit__(self, exc_type, exc_val, exc_tb):
 
     async def add_tracks(self, audio=None, video=None):
         """Add multiple audio and video tracks in a single negotiation."""
-        await self._peer_manager.add_tracks(audio, video)
+        with telemetry.start_as_current_span("rtc.add_tracks"):
+            await self._peer_manager.add_tracks(audio, video)
 
     async def start_recording(
         self, recording_types, user_ids=None, output_dir="recordings"

getstream/video/rtc/peer_connection.py

@@ -9,6 +9,7 @@
 import aiortc
 from aiortc.contrib.media import MediaRelay
 
+from getstream.common import telemetry
 from getstream.video.rtc.connection_utils import (
     create_audio_track_info,
     prepare_video_track_info,
@@ -75,8 +76,6 @@ async def add_tracks(
 
         relayed_audio = None
         relayed_video = None
-        audio_relay = None
-        video_relay = None
         audio_info = None
         video_info = None
         track_infos = []
@@ -103,8 +102,14 @@ async def add_tracks(
             if video:
                 self.publisher_pc.addTrack(relayed_video)
                 logger.info(f"Added relayed video track {relayed_video.id}")
-            offer = await self.publisher_pc.createOffer()
-            await self.publisher_pc.setLocalDescription(offer)
+
+            with telemetry.start_as_current_span("rtc.publisher_pc.create_offer"):
+                offer = await self.publisher_pc.createOffer()
+
+            with telemetry.start_as_current_span(
+                "rtc.publisher_pc.set_local_description"
+            ):
+                await self.publisher_pc.setLocalDescription(offer)
 
             try:
                 patched_sdp = patch_sdp_offer(self.publisher_pc.localDescription.sdp)
@@ -142,7 +147,10 @@ async def add_tracks(
                     )
                 )
                 await self.publisher_pc.handle_answer(response)
-                await self.publisher_pc.wait_for_connected()
+                with telemetry.start_as_current_span(
+                    "rtc.publisher_pc.wait_for_connected"
+                ):
+                    await self.publisher_pc.wait_for_connected()
             except SfuRpcError as e:
                 logger.error(f"Failed to set publisher: {e}")
                 raise