revert celery propagate_traces

Author: sentrivana

sentry_sdk/integrations/celery/__init__.py

@@ -62,10 +62,12 @@ class CeleryIntegration(Integration):
 
     def __init__(
         self,
+        propagate_traces=True,
         monitor_beat_tasks=False,
         exclude_beat_tasks=None,
     ):
-        # type: (bool, Optional[List[str]]) -> None
+        # type: (bool, bool, Optional[List[str]]) -> None
+        self.propagate_traces = propagate_traces
         self.monitor_beat_tasks = monitor_beat_tasks
         self.exclude_beat_tasks = exclude_beat_tasks
 
@@ -252,6 +254,12 @@ def apply_async(*args, **kwargs):
             return f(*args, **kwargs)
 
         kwarg_headers = kwargs.get("headers") or {}
+        propagate_traces = kwarg_headers.pop(
+            "sentry-propagate-traces", integration.propagate_traces
+        )
+
+        if not propagate_traces:
+            return f(*args, **kwargs)
 
         if isinstance(args[0], Task):
             task_name = args[0].name  # type: str

tests/integrations/celery/integration_tests/test_celery_beat_cron_monitoring.py

@@ -34,10 +34,11 @@ def celery_init(sentry_init, celery_config):
 
     from sentry_sdk.integrations.celery import CeleryIntegration
 
-    def inner(monitor_beat_tasks=False, **kwargs):
+    def inner(propagate_traces=True, monitor_beat_tasks=False, **kwargs):
         sentry_init(
             integrations=[
                 CeleryIntegration(
+                    propagate_traces=propagate_traces,
                     monitor_beat_tasks=monitor_beat_tasks,
                 )
             ],

tests/integrations/celery/test_celery.py

@@ -30,13 +30,15 @@ def inner(signal, f):
 @pytest.fixture
 def init_celery(sentry_init, request):
     def inner(
+        propagate_traces=True,
         backend="always_eager",
         monitor_beat_tasks=False,
         **kwargs,
     ):
         sentry_init(
             integrations=[
                 CeleryIntegration(
+                    propagate_traces=propagate_traces,
                     monitor_beat_tasks=monitor_beat_tasks,
                 )
             ],
@@ -533,7 +535,9 @@ def test_sentry_propagate_traces_override(init_celery):
     Test if the `sentry-propagate-traces` header given to `apply_async`
     overrides the `propagate_traces` parameter in the integration constructor.
     """
-    celery = init_celery(traces_sample_rate=1.0, release="abcdef")
+    celery = init_celery(
+        propagate_traces=True, traces_sample_rate=1.0, release="abcdef"
+    )
 
     # Since we're applying the task inline eagerly,
     # we need to cleanup the otel context for this test.