Fixed generation of baggage when a dsc is already in propagation cont…

…ext (#2232)

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."
             )

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