.

Author: sentrivana

sentry_sdk/traces.py

@@ -649,17 +649,20 @@ def _set_segment_attributes(self) -> None:
 
 
 class NoOpStreamedSpan(StreamedSpan):
-    def __init__(self, name: "Optional[str]" = None, scope: "Optional[sentry_sdk.Scope]" = None, **kwargs: "Any") -> None:
-        self.name = name
-        self.parent_span_id = None
-        self.segment = None
-        self._scope = scope
-        self._context_manager_state = None
+    __slots__ = (
+        "name",
+        "segment",
+        "_scope",
+        "_context_manager_state",
+    )
+
+    def __init__(self, scope: "Optional[sentry_sdk.Scope]" = None, **kwargs: "Any") -> None:
+        self.segment = None  # type: ignore[assignment]
+        self._scope = scope  # type: ignore[assignment]
 
     def __repr__(self) -> str:
         return (
             f"<{self.__class__.__name__}("
-            f"name={self.name}, "
             f"sampled={self.sampled})>"
         )
 
@@ -689,21 +692,21 @@ def __exit__(
             quantity=1,
         )
 
-        if self._context_manager_state is None:
+        if self._scope is None:
             return
 
         with capture_internal_exceptions():
             scope, old_span = self._context_manager_state
             del self._context_manager_state
             scope.span = old_span
 
-    def start(self) -> None:
+    def start(self) -> "NoOpStreamedSpan":
         return self.__enter__()
 
-    def end(self) -> None:
+    def end(self, end_timestamp: "Optional[Union[float, datetime]]" = None) -> None:
         self.__exit__(None, None, None)
 
-    def finish(self) -> None:
+    def finish(self, end_timestamp: "Optional[Union[float, datetime]]" = None) -> None:
         pass
 
     def get_attributes(self) -> "Attributes":
@@ -712,7 +715,7 @@ def get_attributes(self) -> "Attributes":
     def set_attribute(self, key: str, value: "AttributeValue") -> None:
         pass
 
-    def set_attributes(self) -> None:
+    def set_attributes(self, attributes: "Attributes") -> None:
         pass
 
     def remove_attribute(self, key: str) -> None:
@@ -724,7 +727,7 @@ def set_name(self, name: str) -> None:
     def get_name(self) -> str:
         return ""
 
-    def set_flag(self) -> None:
+    def set_flag(self, flag: str, result: bool) -> None:
         pass
 
     def set_op(self, op: str) -> None:
@@ -751,21 +754,6 @@ def trace_id(self) -> str:
     def sampled(self) -> "Optional[bool]":
         return False
 
-    def dynamic_sampling_context(self) -> dict[str, str]:
-        return {}
-
-    def get_baggage(self) -> "Baggage":
-        return Baggage()
-
-    def to_baggage(self) -> "Optional[Baggage]":
-        return None
-
-    def to_traceparent(self) -> str:
-        return "0000-0000-0"
-
-    def iter_headers(self) -> "Iterator[tuple[str, str]]":
-        return
-
     def _set_segment_attributes(self) -> None:
         pass
 

tests/tracing/test_span_streaming.py

@@ -90,8 +90,8 @@ def test_start_span_no_context_manager(sentry_init, capture_envelopes):
     child = sentry_sdk.traces.start_span(name="child")
     child.start()
     assert child.segment == segment
-    child.finish()
-    segment.finish()
+    child.end()
+    segment.end()
 
     sentry_sdk.get_client().flush()
     spans = envelopes_to_spans(events)
@@ -137,7 +137,7 @@ def traces_sampler(sampling_context):
     segment = sentry_sdk.traces.start_span(name="segment")
     segment.set_attribute("delayed_attribute", 12)
     segment.start()
-    segment.finish()
+    segment.end()
 
     sentry_sdk.get_client().flush()
     spans = envelopes_to_spans(events)
@@ -1092,15 +1092,12 @@ def test_ignore_spans_set_ignored_child_span_as_parent(sentry_init, capture_enve
 
     with sentry_sdk.traces.start_span(name="segment") as segment:
         assert segment.sampled is True
-        assert segment.parent_span_id is None
 
         with sentry_sdk.traces.start_span(name="ignored") as ignored_span1:
             assert ignored_span1.sampled is False
-            assert ignored_span1.parent_span_id is None
 
             with sentry_sdk.traces.start_span(name="ignored") as ignored_span2:
                 assert ignored_span2.sampled is False
-                assert ignored_span2.parent_span_id is None
 
                 with sentry_sdk.traces.start_span(name="child") as span:
                     assert span.sampled is True
@@ -1145,15 +1142,13 @@ def test_ignore_spans_set_ignored_child_span_as_parent_explicit_parent_span(
     ignored_span1.start()
     assert isinstance(ignored_span1, NoOpStreamedSpan)
     assert ignored_span1.sampled is False
-    assert ignored_span1.parent_span_id is None
 
     ignored_span2 = sentry_sdk.traces.start_span(
         name="ignored", parent_span=ignored_span1
     )
     ignored_span2.start()
     assert isinstance(ignored_span2, NoOpStreamedSpan)
     assert ignored_span2.sampled is False
-    assert ignored_span2.parent_span_id is None
 
     span = sentry_sdk.traces.start_span(name="child", parent_span=ignored_span2)
     span.start()