ref(celery): Use hub.trace

untitaker · untitaker · commit 6e9e5eedbe68 · 2019-06-11T18:12:04.000+02:00
diff --git a/sentry_sdk/integrations/celery.py b/sentry_sdk/integrations/celery.py
@@ -90,32 +90,19 @@ def _inner(*args, **kwargs):
         with hub.push_scope() as scope:
             scope._name = "celery"
             scope.clear_breadcrumbs()
-            span = _continue_trace(args[3].get("headers") or {}, scope)
+            scope.add_event_processor(_make_event_processor(task, *args, **kwargs))
 
             with capture_internal_exceptions():
+                # Celery task objects are not a thing to be trusted. Even
+                # something such as attribute access can fail.
                 scope.transaction = task.name
 
-            scope.add_event_processor(_make_event_processor(task, *args, **kwargs))
-
-            try:
+            with hub.trace(Span.continue_from_headers(args[3].get("headers") or {})):
                 return f(*args, **kwargs)
-            finally:
-                span.finish()
-                hub.finish_trace(span)
 
     return _inner
 
 
-def _continue_trace(headers, scope):
-    if headers:
-        span = Span.continue_from_headers(headers)
-    else:
-        span = Span.start_trace()
-
-    scope.span = span
-    return span
-
-
 def _wrap_task_call(task, f):
     # Need to wrap task call because the exception is caught before we get to
     # see it. Also celery's reported stacktrace is untrustworthy.
