shuffle around

Author: sentrivana

sentry_sdk/tracing.py

@@ -362,9 +362,8 @@ def _set_initial_attributes(self):
         self._attributes = attributes | self._attributes
 
         self._attributes["sentry.segment.id"] = self.containing_transaction.span_id
-        if hasattr(self.containing_transaction, "name"):
-            # TODO[span-first]: fix this properly
-            self._attributes["sentry.segment.name"] = self.containing_transaction.name
+        # 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
@@ -882,9 +881,10 @@ def __init__(  # type: ignore[misc]
         **kwargs,  # type: Unpack[SpanKwargs]
     ):
         # type: (...) -> None
+        self.name = name
+
         super().__init__(**kwargs)
 
-        self.name = name
         self.source = source
         self.sample_rate = None  # type: Optional[float]
         self.parent_sampled = parent_sampled

sentry_sdk/utils.py

@@ -1790,9 +1790,8 @@ def get_default_attributes():
     if thread_name is not None:
         attributes["thread.name"] = thread_name
 
-    # The user, if present, is always set on the isolation scope.
-    # TODO[ivana]: gate behing PII?
     if should_send_default_pii():
+        # The user, if present, is always set on the isolation scope.
         isolation_scope = sentry_sdk.get_isolation_scope()
         if isolation_scope._user is not None:
             for attribute, user_attribute in (