set attrs later

Author: sentrivana

sentry_sdk/_span_batcher.py

@@ -151,11 +151,6 @@ 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

@@ -28,6 +28,7 @@
     logger,
     get_before_send_log,
     get_before_send_metric,
+    get_default_attributes,
     has_logs_enabled,
     has_metrics_enabled,
 )
@@ -943,6 +944,12 @@ def _capture_span(self, span):
         if not has_span_streaming_enabled(self.options):
             return
 
+        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
+
         self._span_batcher.add(span)
 
     def _capture_log(self, log):

sentry_sdk/tracing.py

@@ -14,7 +14,6 @@
     nanosecond_time,
     should_be_treated_as_error,
     serialize_attribute,
-    get_default_attributes,
 )
 
 from typing import TYPE_CHECKING
@@ -355,11 +354,6 @@ def __init__(
 
         self.update_active_thread()
         self.set_profiler_id(get_profiler_id())
-        self._set_initial_attributes()
-
-    def _set_initial_attributes(self):
-        attributes = get_default_attributes()
-        self._attributes = attributes | self._attributes
 
     # TODO this should really live on the Transaction class rather than the Span
     # class