.

Author: sentrivana

sentry_sdk/scope.py

@@ -583,7 +583,11 @@ def get_traceparent(self, *args: "Any", **kwargs: "Any") -> "Optional[str]":
         client = self.get_client()
 
         # If we have an active span, return traceparent from there
-        if has_tracing_enabled(client.options) and self.span is not None:
+        if (
+            has_tracing_enabled(client.options)
+            and self.span is not None
+            and not isinstance(self.span, NoOpStreamedSpan)
+        ):
             return self.span._to_traceparent()
 
         # else return traceparent from the propagation context
@@ -597,7 +601,11 @@ def get_baggage(self, *args: "Any", **kwargs: "Any") -> "Optional[Baggage]":
         client = self.get_client()
 
         # If we have an active span, return baggage from there
-        if has_tracing_enabled(client.options) and self.span is not None:
+        if (
+            has_tracing_enabled(client.options)
+            and self.span is not None
+            and not isinstance(self.span, NoOpStreamedSpan)
+        ):
             return self.span._to_baggage()
 
         # else return baggage from the propagation context
@@ -607,7 +615,11 @@ def get_trace_context(self) -> "Dict[str, Any]":
         """
         Returns the Sentry "trace" context from the Propagation Context.
         """
-        if has_tracing_enabled(self.get_client().options) and self._span is not None:
+        if (
+            has_tracing_enabled(self.get_client().options)
+            and self._span is not None
+            and not isinstance(self.span, NoOpStreamedSpan)
+        ):
             return self._span._get_trace_context()
 
         # if we are tracing externally (otel), those values take precedence

tests/tracing/test_span_streaming.py

@@ -729,16 +729,14 @@ def test_outgoing_traceparent_and_baggage_when_noop_span_is_active(
         noop_span_id = span.span_id
 
         traceparent = sentry_sdk.get_traceparent()
-        assert traceparent != f"{noop_trace_id}-{noop_span_id}-0"
-        assert traceparent == f"{propagation_trace_id}-{propagation_span_id}-0"
+        assert traceparent != f"{noop_trace_id}-{noop_span_id}"
+        assert traceparent == f"{propagation_trace_id}-{propagation_span_id}"
 
         baggage = sentry_sdk.get_baggage()
         baggage_items = dict(tuple(item.split("=")) for item in baggage.split(","))
         assert "sentry-trace_id" in baggage_items
         assert baggage_items["sentry-trace_id"] != noop_trace_id
         assert baggage_items["sentry-trace_id"] == propagation_trace_id
-        assert "sentry-sampled" in baggage_items
-        assert baggage_items["sentry-sampled"] == "false"
 
 
 def test_trace_decorator(sentry_init, capture_envelopes):