fix: Fix CI

untitaker · untitaker · commit d6daf15deaec · 2019-05-31T10:37:38.000+02:00
diff --git a/sentry_sdk/tracing.py b/sentry_sdk/tracing.py
@@ -61,12 +61,12 @@ def __init__(
         self.timestamp = None
 
     def __repr__(self):
-        return "<%s(transaction=%r, trace_id=%r, span_id=%r, ref=%r)>" % (
+        return "<%s(transaction=%r, trace_id=%r, span_id=%r, parent_span_id=%r)>" % (
             self.__class__.__name__,
             self.transaction,
             self.trace_id,
             self.span_id,
-            self.ref,
+            self.parent_span_id,
         )
 
     @classmethod
@@ -112,9 +112,9 @@ def from_traceparent(cls, traceparent):
         trace_id, span_id, sampled = match.groups()
 
         if trace_id is not None:
-            trace_id = int(trace_id, 16)
+            trace_id = "%x" % (int(trace_id, 16),)
         if span_id is not None:
-            span_id = int(span_id, 16)
+            span_id = "%x" % (int(span_id, 16),)
         if sampled is not None:
             sampled = sampled != "0"
 
diff --git a/tests/integrations/celery/test_celery.py b/tests/integrations/celery/test_celery.py
@@ -63,16 +63,14 @@ def dummy_task(x, y):
         foo = 42  # noqa
         return x / y
 
-    span_context = Span.start_trace()
-    with configure_scope() as scope:
-        scope.set_span_context(span_context)
+    span = Hub.current.start_trace()
 
     invocation(dummy_task, 1, 2)
     invocation(dummy_task, 1, 0)
 
     event, = events
-    assert event["contexts"]["trace"]["trace_id"] == span_context.trace_id
-    assert event["contexts"]["trace"]["span_id"] != span_context.span_id
+    assert event["contexts"]["trace"]["trace_id"] == span.trace_id
+    assert event["contexts"]["trace"]["span_id"] != span.span_id
     assert event["transaction"] == "dummy_task"
     assert event["extra"]["celery-job"] == dict(
         task_name="dummy_task", **expected_context
@@ -92,13 +90,11 @@ def test_simple_no_propagation(capture_events, init_celery):
     def dummy_task():
         1 / 0
 
-    span_context = Span.start_trace()
-    with configure_scope() as scope:
-        scope.set_span_context(span_context)
+    span = Hub.current.start_trace()
     dummy_task.delay()
 
     event, = events
-    assert event["contexts"]["trace"]["trace_id"] != span_context.trace_id
+    assert event["contexts"]["trace"]["trace_id"] != span.trace_id
     assert event["transaction"] == "dummy_task"
     exception, = event["exception"]["values"]
     assert exception["type"] == "ZeroDivisionError"
