merge

Author: sentrivana

sentry_sdk/_span_batcher.py

@@ -4,14 +4,12 @@
 from typing import TYPE_CHECKING
 
 from sentry_sdk._batcher import Batcher
-from sentry_sdk.consts import SPANSTATUS
 from sentry_sdk.envelope import Envelope, Item, PayloadRef
-from sentry_sdk.utils import format_timestamp, serialize_attribute, safe_repr
+from sentry_sdk.utils import format_timestamp, serialize_attribute
 
 if TYPE_CHECKING:
     from typing import Any, Callable, Optional
-    from sentry_sdk.traces import SpanStatus, StreamedSpan
-    from sentry_sdk._types import SerializedAttributeValue
+    from sentry_sdk.traces import StreamedSpan
 
 
 class SpanBatcher(Batcher["StreamedSpan"]):
@@ -88,9 +86,9 @@ def _to_transport_format(item: "StreamedSpan") -> "Any":
         elif item.parent_span_id:
             res["parent_span_id"] = item.parent_span_id
 
-        if item.attributes:
+        if item._attributes:
             res["attributes"] = {
-                k: serialize_attribute(v) for (k, v) in item.attributes.items()
+                k: serialize_attribute(v) for (k, v) in item._attributes.items()
             }
 
         return res
@@ -101,7 +99,7 @@ def _flush(self) -> None:
                 return None
 
             envelopes = []
-            for trace_id, spans in self._span_buffer.items():
+            for spans in self._span_buffer.values():
                 if spans:
                     dsc = spans[0].dynamic_sampling_context()
 

sentry_sdk/scope.py

@@ -31,7 +31,6 @@
     has_tracing_enabled,
     has_span_streaming_enabled,
     is_ignored_span,
-    normalize_incoming_data,
     PropagationContext,
 )
 from sentry_sdk.traces import StreamedSpan
@@ -1683,7 +1682,7 @@ def _apply_scope_attributes_to_telemetry(
         if isinstance(telemetry, dict):
             attributes = telemetry["attributes"]
         else:
-            attributes = telemetry.attributes
+            attributes = telemetry._attributes
 
         for attribute, value in self._attributes.items():
             if attribute not in attributes:
@@ -1695,7 +1694,7 @@ def _apply_user_attributes_to_telemetry(
         if isinstance(telemetry, dict):
             attributes = telemetry["attributes"]
         else:
-            attributes = telemetry.attributes
+            attributes = telemetry._attributes
 
         if not should_send_default_pii() or self._user is None:
             return

sentry_sdk/traces.py

@@ -204,7 +204,7 @@ class StreamedSpan:
 
     __slots__ = (
         "name",
-        "attributes",
+        "_attributes",
         "_span_id",
         "_trace_id",
         "parent_span_id",
@@ -250,7 +250,7 @@ def __init__(
         self._scope = scope
 
         self.name: str = name
-        self.attributes: "Attributes" = attributes or {}
+        self._attributes: "Attributes" = attributes or {}
 
         self._trace_id = trace_id
         self.parent_span_id = parent_span_id
@@ -318,7 +318,7 @@ def __enter__(self) -> "StreamedSpan":
                 "span_id": self.span_id,
                 "parent_span_id": self.parent_span_id,
                 "parent_sampled": self.parent_sampled,
-                "attributes": self.attributes,
+                "attributes": self._attributes,
             }
             custom_sampling_context = (
                 scope.get_active_propagation_context()._custom_sampling_context
@@ -432,21 +432,21 @@ def _end(
         self._finished = True
 
     def get_attributes(self) -> "Attributes":
-        return self.attributes
+        return self._attributes
 
     def set_attribute(self, key: str, value: "AttributeValue") -> None:
-        self.attributes[key] = format_attribute(value)
+        self._attributes[key] = format_attribute(value)
+
+    def set_attributes(self, attributes: "Attributes") -> None:
+        for key, value in attributes.items():
+            self.set_attribute(key, value)
 
     def remove_attribute(self, key: str) -> None:
         try:
-            del self.attributes[key]
+            del self._attributes[key]
         except KeyError:
             pass
 
-    def set_attributes(self, attributes: "Attributes") -> None:
-        for key, value in attributes.items():
-            self.set_attribute(key, value)
-
     def set_status(self, status: "Union[SpanStatus, str]") -> None:
         if isinstance(status, Enum):
             status = status.value