fix: Write child spans into scope

untitaker · untitaker · commit f239d12f8dac · 2019-06-18T17:58:16.000+02:00
diff --git a/sentry_sdk/hub.py b/sentry_sdk/hub.py
@@ -372,6 +372,10 @@ def span(self, span=None, **kwargs):
             yield span
             return
 
+        _, scope = self._stack[-1]
+        old_span = scope.span
+        scope.span = span
+
         try:
             yield span
         except Exception:
@@ -382,6 +386,7 @@ def span(self, span=None, **kwargs):
         finally:
             span.finish()
             self.finish_trace(span)
+            scope.span = old_span
 
     def trace(self, *args, **kwargs):
         return self.span(self.start_trace(*args, **kwargs))
@@ -405,7 +410,6 @@ def start_trace(self, span=None, **kwargs):
                 span.trace_id,
                 scope.span.trace_id,
             )
-        scope.span = span
 
         return span
 
diff --git a/sentry_sdk/scope.py b/sentry_sdk/scope.py
@@ -106,10 +106,8 @@ def span(self):
     @span.setter
     def span(self, span):
         self._span = span
-        if span.transaction:
+        if span is not None and span.transaction:
             self._transaction = span.transaction
-        elif self._transaction:
-            span.transaction = self._transaction
 
     def set_tag(self, key, value):
         # type: (str, Any) -> None
diff --git a/tests/integrations/celery/test_celery.py b/tests/integrations/celery/test_celery.py
@@ -62,10 +62,9 @@ def dummy_task(x, y):
         foo = 42  # noqa
         return x / y
 
-    span = Hub.current.start_trace()
-
-    invocation(dummy_task, 1, 2)
-    invocation(dummy_task, 1, 0)
+    with Hub.current.trace() as span:
+        invocation(dummy_task, 1, 2)
+        invocation(dummy_task, 1, 0)
 
     event, = events
 
@@ -115,8 +114,8 @@ def test_simple_no_propagation(capture_events, init_celery):
     def dummy_task():
         1 / 0
 
-    span = Hub.current.start_trace()
-    dummy_task.delay()
+    with Hub.current.trace() as span:
+        dummy_task.delay()
 
     event, = events
     assert event["contexts"]["trace"]["trace_id"] != span.trace_id
