dsc

Author: sentrivana

sentry_sdk/_span_batcher.py

@@ -162,30 +162,35 @@ def _flush(self):
                 return None
 
             for trace_id, spans in self._span_buffer.items():
-                envelope = Envelope(
-                    headers={
-                        "sent_at": format_timestamp(datetime.now(timezone.utc)),
-                    }
-                    # TODO[span-first] more headers
-                )
+                if spans:
+                    trace_context = spans[0].get_trace_context()
+                    dsc = trace_context.get("dynamic_sampling_context")
+                    # XXX[span-first]: empty dsc?
 
-                envelope.add_item(
-                    Item(
-                        type="span",
-                        content_type="application/vnd.sentry.items.span.v2+json",
+                    envelope = Envelope(
                         headers={
-                            "item_count": len(spans),
-                        },
-                        payload=PayloadRef(
-                            json={
-                                "items": [
-                                    self._span_to_transport_format(span)
-                                    for span in spans
-                                ]
-                            }
-                        ),
+                            "sent_at": format_timestamp(datetime.now(timezone.utc)),
+                            "trace": dsc,
+                        }
+                    )
+
+                    envelope.add_item(
+                        Item(
+                            type="span",
+                            content_type="application/vnd.sentry.items.span.v2+json",
+                            headers={
+                                "item_count": len(spans),
+                            },
+                            payload=PayloadRef(
+                                json={
+                                    "items": [
+                                        self._span_to_transport_format(span)
+                                        for span in spans
+                                    ]
+                                }
+                            ),
+                        )
                     )
-                )
 
             self._span_buffer.clear()
 

sentry_sdk/client.py

@@ -947,10 +947,15 @@ def _capture_span(self, span):
         attributes = get_default_attributes()
         span._attributes = attributes | span._attributes
 
-        span._attributes["sentry.segment.id"] = span.containing_transaction.span_id
-        span._attributes["sentry.segment.name"] = span.containing_transaction.name
+        segment = span.containing_transaction
+        span._attributes["sentry.segment.id"] = segment.span_id
+        span._attributes["sentry.segment.name"] = segment.name
 
-        self._span_batcher.add(span)
+        if self._span_batcher:
+            logger.debug(
+                f"[Tracing] Adding span {span.span_id} of segment {segment.span_id} to batcher"
+            )
+            self._span_batcher.add(span)
 
     def _capture_log(self, log):
         # type: (Optional[Log]) -> None

sentry_sdk/tracing.py

@@ -742,7 +742,6 @@ def finish(self, scope=None, end_timestamp=None):
                 has_span_streaming_enabled(client.options)
                 and self.containing_transaction.sampled
             ):
-                logger.debug(f"[Tracing] Adding span {self.span_id} to buffer")
                 client._capture_span(self)
 
         return None
@@ -1113,7 +1112,6 @@ def finish(
 
         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
 

sentry_sdk/transport.py

@@ -478,9 +478,10 @@ def _send_envelope(self, envelope):
             print("Headers")
             print(item.headers)
             print("Attributes")
-            for i in item.payload.json["items"]:
-                for attribute, value in i["attributes"].items():
-                    print(attribute, value)
+            if item.payload.json.get("items"):
+                for i in item.payload.json["items"]:
+                    for attribute, value in i["attributes"].items():
+                        print(attribute, value)
             print("Payload")
             print(item.payload.json)
             print()