Respect parent_sampled decision in propagation_context sentry-trace header

Author: sl0thentr0py

sentry_sdk/scope.py

@@ -505,11 +505,7 @@ def get_traceparent(self, *args, **kwargs):
 
         # If this scope has a propagation context, return traceparent from there
         if self._propagation_context is not None:
-            traceparent = "%s-%s" % (
-                self._propagation_context.trace_id,
-                self._propagation_context.span_id,
-            )
-            return traceparent
+            return self._propagation_context.to_traceparent()
 
         # Fall back to isolation scope's traceparent. It always has one
         return self.get_isolation_scope().get_traceparent()

sentry_sdk/tracing_utils.py

@@ -432,6 +432,21 @@ def span_id(self, value):
         # type: (str) -> None
         self._span_id = value
 
+    def to_traceparent(self):
+        # type: () -> str
+        if self.parent_sampled is True:
+            sampled = "1"
+        elif self.parent_sampled is False:
+            sampled = "0"
+        else:
+            sampled = None
+
+        traceparent = "%s-%s" % (self.trace_id, self.span_id)
+        if sampled is not None:
+            traceparent += "-%s" % (sampled,)
+
+        return traceparent
+
     def update(self, other_dict):
         # type: (Dict[str, Any]) -> None
         """