Made code easier to follow

getsentry · Dec 6, 2022 · 031e79a · 031e79a
1 parent b09d094
commit 031e79a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/sentry_sdk/integrations/opentelemetry/propagator.py b/sentry_sdk/integrations/opentelemetry/propagator.py
@@ -103,7 +103,7 @@ def inject(self, carrier, context=None, setter=default_setter):
 
         setter.set(carrier, SENTRY_TRACE_HEADER_NAME, sentry_span.to_traceparent())
 
-        baggage = hasattr(sentry_span, "get_baggage") and sentry_span.get_baggage()
+        baggage = sentry_span.containing_transaction.get_baggage()
         if baggage:
             setter.set(carrier, BAGGAGE_HEADER_NAME, baggage.serialize())
 

diff --git a/tests/integrations/opentelemetry/test_propagator.py b/tests/integrations/opentelemetry/test_propagator.py
@@ -172,7 +172,7 @@ def test_inject_sentry_span_no_baggage():
     sentry_span.to_traceparent = mock.Mock(
         return_value="1234567890abcdef1234567890abcdef-1234567890abcdef-1"
     )
-    sentry_span.get_baggage = mock.Mock(return_value=None)
+    sentry_span.containing_transaction.get_baggage = mock.Mock(return_value=None)
 
     span_processor = SentrySpanProcessor()
     span_processor.otel_span_map[span_id] = sentry_span
@@ -223,7 +223,7 @@ def test_inject_sentry_span_baggage():
         "sentry-user_id": "Amélie",
     }
     baggage = Baggage(sentry_items=sentry_items)
-    sentry_span.get_baggage = MagicMock(return_value=baggage)
+    sentry_span.containing_transaction.get_baggage = MagicMock(return_value=baggage)
 
     span_processor = SentrySpanProcessor()
     span_processor.otel_span_map[span_id] = sentry_span