Some cleanup

sentry_sdk/integrations/celery/__init__.py

@@ -322,9 +322,13 @@ def _inner(*args, **kwargs):
                     # for some reason, args[1] is a list if non-empty but a
                     # tuple if empty
                     attributes=_prepopulate_attributes(task, list(args[1]), args[2]),
-                ) as transaction:
-                    transaction.set_status(SPANSTATUS.OK)
-                    return f(*args, **kwargs)
+                ) as root_span:
+                    return_value = f(*args, **kwargs)
+
+                    if root_span.status is None:
+                        root_span.set_status(SPANSTATUS.OK)
+
+                    return return_value
 
     return _inner  # type: ignore
 

tests/conftest.py

@@ -68,9 +68,7 @@ def benchmark():
 )
 
 
-# Disabling this, because this leads in Potel to Celery tests failing
-# TODO: Check if disabling this broke a bunch of other test (not sure how to do)
-# @pytest.fixture(autouse=True)
+@pytest.fixture(autouse=True)
 def clean_scopes():
     """
     Resets the scopes for every test to avoid leaking data between tests.

tests/integrations/celery/test_celery.py

@@ -237,6 +237,9 @@ def dummy_task(x, y):
             "timestamp": submission_event["spans"][0]["timestamp"],
             "trace_id": str(span.trace_id),
             "status": "ok",
+            "tags": {
+                "status": "ok",
+            }
         }
     ]