fix: Ensure celery flags are properly set

Author: adinhodovic

src/django_o11y/tracing/setup.py

@@ -161,8 +161,6 @@ def setup_celery_o11y(app: Any, config: dict[str, Any] | None = None) -> None:
     # Keep Django/structlog logging ownership in workers.
     app.conf.worker_hijack_root_logger = False
     app.conf.worker_redirect_stdouts = False
-    app.conf.worker_send_task_events = True
-    app.conf.task_send_sent_event = True
 
     from django_structlog.celery.steps import DjangoStructLogInitStep
 
@@ -217,11 +215,11 @@ def setup_worker_metrics(celery_config: dict[str, Any]) -> None:
 
 
 def _configure_celery_metrics_events(config: dict[str, Any]) -> None:
-    """Enable producer-side Celery events needed by celery-exporter.
+    """Set Celery event flags needed by celery-exporter on the app conf at startup.
 
-    Workers set their event flags in ``setup_celery_o11y``. This function
-    covers the Django web process that publishes tasks, ensuring
-    ``task-sent`` events are emitted when metrics are enabled.
+    Setting these on the app conf before the worker boots means the worker
+    reads the correct values during its own startup sequence, avoiding the
+    ``task events: OFF`` banner.
     """
     celery_config = config.get("CELERY", {})
     if not config.get("METRICS", {}).get("PROMETHEUS_ENABLED", True):
@@ -233,10 +231,11 @@ def _configure_celery_metrics_events(config: dict[str, Any]) -> None:
         import celery as celery_module
 
         app = celery_module.current_app
+        app.conf.worker_send_task_events = True
         app.conf.task_send_sent_event = True
     except Exception:  # pragma: no cover
         provider_logger.debug(
-            "Failed to enable Celery producer task-sent events in Django process",
+            "Failed to enable Celery task events in Django/worker process",
             exc_info=True,
         )
 

tests/celery/test_celery.py

@@ -93,41 +93,43 @@ def test_auto_setup_skips_when_celery_disabled(celery_app):
         get_o11y_config.cache_clear()
 
 
-def test_celery_setup_enables_task_events(celery_app):
-    """setup_celery_o11y sets worker_send_task_events and task_send_sent_event."""
-    from django_o11y.tracing import setup
+def test_configure_celery_metrics_events_sets_flags(celery_app):
+    """_configure_celery_metrics_events sets worker_send_task_events and task_send_sent_event."""
+    from unittest.mock import patch
 
-    original_pid = setup._instrumented_pid
-    setup._instrumented_pid = None
+    from django_o11y.tracing.setup import _configure_celery_metrics_events
 
-    try:
-        config = {"CELERY": {"ENABLED": True}}
-        setup.setup_celery_o11y(celery_app, config=config)
+    config = {
+        "CELERY": {"ENABLED": True, "METRICS_ENABLED": True},
+        "METRICS": {"PROMETHEUS_ENABLED": True},
+    }
 
-        assert celery_app.conf.worker_send_task_events is True
-        assert celery_app.conf.task_send_sent_event is True
-    finally:
-        setup._instrumented_pid = original_pid
+    with patch("celery.current_app", celery_app):
+        _configure_celery_metrics_events(config)
 
+    assert celery_app.conf.worker_send_task_events is True
+    assert celery_app.conf.task_send_sent_event is True
 
-def test_celery_setup_does_not_set_events_when_disabled(celery_app):
-    """Task events are not touched when CELERY.ENABLED is False."""
-    from django_o11y.tracing import setup
 
-    original_pid = setup._instrumented_pid
-    setup._instrumented_pid = None
-    # Reset to a known baseline
+def test_configure_celery_metrics_events_skips_when_metrics_disabled(celery_app):
+    """Task events are not set when Prometheus metrics are disabled."""
+    from unittest.mock import patch
+
+    from django_o11y.tracing.setup import _configure_celery_metrics_events
+
     celery_app.conf.worker_send_task_events = False
     celery_app.conf.task_send_sent_event = False
 
-    try:
-        config = {"CELERY": {"ENABLED": False}}
-        setup.setup_celery_o11y(celery_app, config=config)
+    config = {
+        "CELERY": {"ENABLED": True, "METRICS_ENABLED": True},
+        "METRICS": {"PROMETHEUS_ENABLED": False},
+    }
 
-        assert celery_app.conf.worker_send_task_events is False
-        assert celery_app.conf.task_send_sent_event is False
-    finally:
-        setup._instrumented_pid = original_pid
+    with patch("celery.current_app", celery_app):
+        _configure_celery_metrics_events(config)
+
+    assert celery_app.conf.worker_send_task_events is False
+    assert celery_app.conf.task_send_sent_event is False
 
 
 def test_celery_prefork_pool_detection_defaults_to_prefork():