Fixed generation of baggage when a dsc is already in propagation context (getsentry#2232)

antonpirker · web-flow · commit 1eb96007d3ff · 2023-07-05T16:12:54.000+02:00
diff --git a/sentry_sdk/hub.py b/sentry_sdk/hub.py
@@ -814,7 +814,7 @@ def trace_propagation_meta(self, span=None):
         Return meta tags which should be injected into HTML templates
         to allow propagation of trace information.
         """
-        if span is None:
+        if span is not None:
             logger.warning(
                 "The parameter `span` in trace_propagation_meta() is deprecated and will be removed in the future."
             )
diff --git a/sentry_sdk/scope.py b/sentry_sdk/scope.py
@@ -254,10 +254,13 @@ def get_baggage(self):
         if self._propagation_context is None:
             return None
 
-        if self._propagation_context.get("dynamic_sampling_context") is None:
+        dynamic_sampling_context = self._propagation_context.get(
+            "dynamic_sampling_context"
+        )
+        if dynamic_sampling_context is None:
             return Baggage.from_options(self)
-
-        return None
+        else:
+            return Baggage(dynamic_sampling_context)
 
     def get_trace_context(self):
         # type: () -> Any

Original file line number	Diff line number	Diff line change
`@@ -814,7 +814,7 @@ def trace_propagation_meta(self, span=None):`
`814`	`814`	`Return meta tags which should be injected into HTML templates`
`815`	`815`	`to allow propagation of trace information.`
`816`	`816`	`"""`
`817`		`- if span is None:`
	`817`	`+ if span is not None:`
`818`	`818`	`logger.warning(`
`819`	`819`	"The parameter `span` in trace_propagation_meta() is deprecated and will be removed in the future."
`820`	`820`	`)`