Merge branch 'master' into feat/span-first

Author: sentrivana

sentry_sdk/_span_batcher.py

@@ -88,7 +88,7 @@ def _to_transport_format(item: "StreamedSpan") -> "Any":
             "span_id": item.span_id,
             "name": item._name,
             "status": item._status,
-            "is_segment": item.is_segment(),
+            "is_segment": item._is_segment(),
             "start_timestamp": item._start_timestamp.timestamp(),
         }
 

sentry_sdk/traces.py

@@ -355,7 +355,7 @@ def _end(self, end_timestamp: "Optional[Union[float, datetime]]" = None) -> None
             return
 
         # Stop the profiler
-        if self.is_segment():
+        if self._is_segment():
             if self._continuous_profile is not None:
                 self._continuous_profile.stop()
 
@@ -474,8 +474,8 @@ def start_timestamp(self) -> "Optional[datetime]":
     def timestamp(self) -> "Optional[datetime]":
         return self._timestamp
 
-    def is_segment(self) -> bool:
-        return self._segment == self
+    def _is_segment(self) -> bool:
+        return self._segment is self
 
     def _dynamic_sampling_context(self) -> "dict[str, str]":
         return self._segment._get_baggage().dynamic_sampling_context()
@@ -556,7 +556,7 @@ def _get_trace_context(self) -> "dict[str, Any]":
         return context
 
     def _start_profile(self) -> None:
-        if not self.is_segment():
+        if not self._is_segment():
             return
 
         try_autostart_continuous_profiler()
@@ -691,8 +691,8 @@ def set_attributes(self, attributes: "Attributes") -> None:
     def remove_attribute(self, key: str) -> None:
         pass
 
-    def is_segment(self) -> bool:
-        return False
+    def _is_segment(self) -> bool:
+        return self._scope is not None
 
     def _to_traceparent(self) -> str:
         propagation_context = (

tests/tracing/test_span_streaming.py

@@ -46,9 +46,9 @@ def test_start_span(sentry_init, capture_envelopes):
     events = capture_envelopes()
 
     with sentry_sdk.traces.start_span(name="segment") as segment:
-        assert segment.is_segment() is True
+        assert segment._is_segment() is True
         with sentry_sdk.traces.start_span(name="child") as child:
-            assert child.is_segment() is False
+            assert child._is_segment() is False
             assert child._segment == segment
 
     sentry_sdk.get_client().flush()