ref: Add test for continue_from_headers

untitaker · untitaker · commit ad6cf7847481 · 2019-06-11T20:00:26.000+02:00
diff --git a/sentry_sdk/hub.py b/sentry_sdk/hub.py
@@ -383,8 +383,8 @@ def span(self, span=None, **kwargs):
             span.finish()
             self.finish_trace(span)
 
-    def trace(self, **kwargs):
-        return self.span(self.start_trace(**kwargs))
+    def trace(self, *args, **kwargs):
+        return self.span(self.start_trace(*args, **kwargs))
 
     def start_span(self, **kwargs):
         _, scope = self._stack[-1]
@@ -393,8 +393,10 @@ def start_span(self, **kwargs):
             return span.new_span(**kwargs)
         return None
 
-    def start_trace(self, **kwargs):
-        span = Span.start_trace(**kwargs)
+    def start_trace(self, span=None, **kwargs):
+        if span is None:
+            span = Span.start_trace(**kwargs)
+
         _, scope = self._stack[-1]
 
         if scope.span is not None:
diff --git a/sentry_sdk/tracing.py b/sentry_sdk/tracing.py
@@ -125,9 +125,9 @@ def from_traceparent(cls, traceparent):
         trace_id, span_id, sampled_str = match.groups()
 
         if trace_id is not None:
-            trace_id = "%x" % (int(trace_id, 16),)
+            trace_id = "{:032x}".format(int(trace_id, 16))
         if span_id is not None:
-            span_id = "%x" % (int(span_id, 16),)
+            span_id = "{:016x}".format(int(span_id, 16))
 
         if sampled_str is not None:
             sampled = sampled_str != "0"
diff --git a/tests/test_tracing.py b/tests/test_tracing.py
@@ -1,6 +1,7 @@
 import pytest
 
-from sentry_sdk import Hub
+from sentry_sdk import Hub, capture_message
+from sentry_sdk.tracing import Span
 
 
 @pytest.mark.parametrize("sample_rate", [0.0, 1.0])
@@ -26,3 +27,35 @@ def test_basic(sentry_init, capture_events, sample_rate):
         assert parent_span["transaction"] == "hi"
     else:
         assert not events
+
+
+def test_continue_from_headers(sentry_init, capture_events):
+    sentry_init(traces_sample_rate=1.0)
+    events = capture_events()
+
+    with Hub.current.trace(transaction="hi"):
+        with Hub.current.span() as old_span:
+            headers = dict(Hub.current.iter_trace_propagation_headers())
+
+    span = Span.continue_from_headers(headers)
+    assert span is not None
+    assert span.trace_id == old_span.trace_id
+
+    with Hub.current.trace(span):
+        with Hub.current.configure_scope() as scope:
+            scope.transaction = "ho"
+
+        capture_message("hello")
+
+    trace1, message, trace2 = events
+
+    assert trace1["transaction"] == "hi"
+    assert trace2["transaction"] == "ho"
+
+    assert (
+        trace1["contexts"]["trace"]["trace_id"]
+        == trace2["contexts"]["trace"]["trace_id"]
+        == span.trace_id
+        == message["contexts"]["trace"]["trace_id"]
+    )
+    assert message["message"] == "hello"
