go via client

Author: sentrivana

sentry_sdk/_span_batcher.py

@@ -19,8 +19,8 @@
 
 
 class SpanBatcher:
-    # TODO[span-first]: Adjust limits. However, there's still a restriction of
-    # at most 1000 spans per envelope.
+    # TODO[span-first]: Adjust limits. Protocol dictates at most 1000 spans
+    # in an envelope.
     MAX_SPANS_BEFORE_FLUSH = 1_000
     MAX_SPANS_BEFORE_DROP = 2_000
     FLUSH_WAIT_TIME = 5.0
@@ -107,9 +107,7 @@ def add(self, span):
                 return None
 
             self._span_buffer[span.trace_id].append(span)
-            if (
-                self.get_size() >= self.MAX_SPANS_BEFORE_FLUSH
-            ):  # TODO[span-first] should this be per bucket?
+            if self.get_size() >= self.MAX_SPANS_BEFORE_FLUSH:
                 self._flush_event.set()
 
     def kill(self):
@@ -130,10 +128,12 @@ def _span_to_transport_format(span):
         # type: (Span) -> SpanV2
         from sentry_sdk.utils import attribute_value_to_transport_format, safe_repr
 
+        is_segment = isinstance(span, Transaction)
+
         res = {
             "trace_id": span.trace_id,
             "span_id": span.span_id,
-            "name": span.description,  # TODO[span-first]
+            "name": span.name if is_segment else span.description,
             "status": SPANSTATUS.OK
             if span.status in (SPANSTATUS.OK, SPANSTATUS.UNSET)
             else SPANSTATUS.ERROR,
@@ -151,6 +151,11 @@ def _span_to_transport_format(span):
                 for (k, v) in span._attributes.items()
             }
 
+        # We set these as late as possible to increase the odds of the span
+        # getting a good segment name
+        res["attributes"]["sentry.segment.id"] = span.containing_transaction.span_id
+        res["attributes"]["sentry.segment.name"] = span.containing_transaction.name
+
         return res
 
     def _flush(self):

sentry_sdk/client.py

@@ -937,6 +937,14 @@ def capture_event(
 
         return return_value
 
+    def _capture_span(self, span):
+        # type: (Span) -> None
+        # Used for span streaming (trace_lifecycle == "stream").
+        if not has_span_streaming_enabled(self.options):
+            return
+
+        self._span_batcher.add(span)
+
     def _capture_log(self, log):
         # type: (Optional[Log]) -> None
         # TODO[ivana]: Use get_default_attributes here

sentry_sdk/tracing.py

@@ -361,10 +361,6 @@ def _set_initial_attributes(self):
         attributes = get_default_attributes()
         self._attributes = attributes | self._attributes
 
-        self._attributes["sentry.segment.id"] = self.containing_transaction.span_id
-        # TODO[span-first]: This might need to be updated if the segment name is updated
-        self._attributes["sentry.segment.name"] = self.containing_transaction.name
-
     # TODO this should really live on the Transaction class rather than the Span
     # class
     def init_span_recorder(self, maxlen):
@@ -753,7 +749,7 @@ def finish(self, scope=None, end_timestamp=None):
                 and self.containing_transaction.sampled
             ):
                 logger.debug(f"[Tracing] Adding span {self.span_id} to buffer")
-                client._span_batcher.add(self)
+                client._capture_span(self)
 
         return None
 
@@ -1121,9 +1117,10 @@ def finish(
 
             return None
 
-        if self._mode == "stream" and self.containing_transaction.sampled:
-            logger.debug(f"[Tracing] Adding span {self.span_id} to buffer")
-            client._span_batcher.add(self)
+        if self._mode == "stream":
+            if self.containing_transaction.sampled:
+                logger.debug(f"[Tracing] Adding span {self.span_id} to batcher")
+                client._capture_span(self)
             return
 
         finished_spans = [
@@ -1167,7 +1164,6 @@ def finish(
             self._profile = None
 
         event["measurements"] = self._measurements
-
         return scope.capture_event(event)
 
     def set_measurement(self, name, value, unit=""):