.

Author: sentrivana

sentry_sdk/integrations/celery/__init__.py

@@ -353,6 +353,7 @@ def _inner(*args: "Any", **kwargs: "Any") -> "Any":
                     sentry_sdk.traces.continue_trace(headers)
                     span = sentry_sdk.traces.start_span(
                         name=task.name,
+                        parent_span=None,  # make this a segment
                         attributes={
                             "sentry.origin": CeleryIntegration.origin,
                             "sentry.span.source": TransactionSource.TASK.value,
@@ -552,9 +553,10 @@ def sentry_publish(self: "Producer", *args: "Any", **kwargs: "Any") -> "Any":
             # method will still work.
             kwargs_headers = {}
 
-        if "task" not in kwargs_headers:
-            # filter out heartbeat and other internal Celery events
-            return original_publish(self, *args, **kwargs)
+        # XXX[ivana]: check whether this is needed with the parent checks
+        # if "task" not in kwargs_headers:
+        #    # filter out heartbeat and other internal Celery events
+        #    return original_publish(self, *args, **kwargs)
 
         task_name = kwargs_headers.get("task")
         task_id = kwargs_headers.get("id")

tests/integrations/celery/test_celery.py

@@ -240,18 +240,14 @@ def dummy_task(x, y):
             assert error_event["contexts"]["trace"]["trace_id"] == span.trace_id
             assert error_event["exception"]["values"][0]["type"] == "ZeroDivisionError"
 
-        span_items = [item.payload for item in items]
-        process_span, execution_span, submit_span, submission_span = span_items
+        process_span, execution_span, submit_span, submission_span = [
+            item.payload for item in items
+        ]
 
         assert execution_span["name"] == "dummy_task"
+        assert execution_span["is_segment"] is True
         assert execution_span["attributes"]["sentry.span.source"] == "task"
         assert execution_span["trace_id"] == span.trace_id
-
-        assert submit_span["name"] == "dummy_task"
-        assert submit_span["trace_id"] == span.trace_id
-        assert submit_span["attributes"]["sentry.origin"] == "auto.queue.celery"
-        assert submit_span["parent_span_id"] == span.span_id
-
         if task_fails:
             assert execution_span["status"] == "error"
         else:
@@ -260,6 +256,18 @@ def dummy_task(x, y):
         assert process_span["name"] == "dummy_task"
         assert process_span["trace_id"] == span.trace_id
         assert process_span["attributes"]["sentry.op"] == "queue.process"
+        assert process_span["parent_span_id"] == execution_span["span_id"]
+
+        assert submission_span["name"] == "submission"
+        assert submission_span["is_segment"] is True
+
+        assert submit_span["name"] == "dummy_task"
+        assert submit_span["attributes"]["sentry.op"] == "queue.submit.celery"
+        assert submit_span["attributes"]["sentry.origin"] == "auto.queue.celery"
+        assert (
+            submit_span["parent_span_id"] == submission_span["span_id"] == span.span_id
+        )
+        assert submit_span["trace_id"] == span.trace_id
 
     else:
         events = capture_events()