test(celery): add traceparent header assertions in task header tests

Author: hangy

tests/integrations/celery/test_celery.py

@@ -496,6 +496,7 @@ def dummy_task(self, x, y):
     expected_headers = sentry_crons_setup.copy()
     # Newly added headers
     expected_headers["sentry-trace"] = mock.ANY
+    expected_headers["traceparent"] = mock.ANY
     expected_headers["baggage"] = mock.ANY
     expected_headers["sentry-task-enqueued-time"] = mock.ANY
 
@@ -569,6 +570,7 @@ def test_apply_async_manually_span(sentry_init):
     def dummy_function(*args, **kwargs):
         headers = kwargs.get("headers")
         assert "sentry-trace" in headers
+        assert "traceparent" in headers
         assert "baggage" in headers
 
     wrapped = _wrap_task_run(dummy_function)
@@ -813,18 +815,23 @@ def test_send_task_wrapped(
     assert set(kwargs["headers"].keys()) == {
         "sentry-task-enqueued-time",
         "sentry-trace",
+        "traceparent",
         "baggage",
         "headers",
     }
     assert set(kwargs["headers"]["headers"].keys()) == {
         "sentry-trace",
+        "traceparent",
         "baggage",
         "sentry-task-enqueued-time",
     }
     assert (
         kwargs["headers"]["sentry-trace"]
         == kwargs["headers"]["headers"]["sentry-trace"]
     )
+    assert (
+        kwargs["headers"]["traceparent"] == kwargs["headers"]["headers"]["traceparent"]
+    )
 
     (event,) = events  # We should have exactly one event (the transaction)
     assert event["type"] == "transaction"

tests/integrations/celery/test_update_celery_task_headers.py

@@ -83,6 +83,10 @@ def test_span_with_transaction(sentry_init):
 
             assert outgoing_headers["sentry-trace"] == span.to_traceparent()
             assert outgoing_headers["headers"]["sentry-trace"] == span.to_traceparent()
+            assert outgoing_headers["traceparent"] == span.to_w3c_traceparent()
+            assert (
+                outgoing_headers["headers"]["traceparent"] == span.to_w3c_traceparent()
+            )
             assert outgoing_headers["baggage"] == transaction.get_baggage().serialize()
             assert (
                 outgoing_headers["headers"]["baggage"]
@@ -103,6 +107,10 @@ def test_span_with_transaction_custom_headers(sentry_init):
 
             assert outgoing_headers["sentry-trace"] == span.to_traceparent()
             assert outgoing_headers["headers"]["sentry-trace"] == span.to_traceparent()
+            assert outgoing_headers["traceparent"] == span.to_w3c_traceparent()
+            assert (
+                outgoing_headers["headers"]["traceparent"] == span.to_w3c_traceparent()
+            )
 
             incoming_baggage = Baggage.from_incoming_header(headers["baggage"])
             combined_baggage = copy(transaction.get_baggage())
@@ -145,6 +153,8 @@ def test_celery_trace_propagation_default(sentry_init, monitor_beat_tasks):
 
     assert outgoing_headers["sentry-trace"] == scope.get_traceparent()
     assert outgoing_headers["headers"]["sentry-trace"] == scope.get_traceparent()
+    assert outgoing_headers["traceparent"] == scope._get_w3c_traceparent()
+    assert outgoing_headers["headers"]["traceparent"] == scope._get_w3c_traceparent()
     assert outgoing_headers["baggage"] == scope.get_baggage().serialize()
     assert outgoing_headers["headers"]["baggage"] == scope.get_baggage().serialize()
 
@@ -181,6 +191,8 @@ def test_celery_trace_propagation_traces_sample_rate(
 
     assert outgoing_headers["sentry-trace"] == scope.get_traceparent()
     assert outgoing_headers["headers"]["sentry-trace"] == scope.get_traceparent()
+    assert outgoing_headers["traceparent"] == scope._get_w3c_traceparent()
+    assert outgoing_headers["headers"]["traceparent"] == scope._get_w3c_traceparent()
     assert outgoing_headers["baggage"] == scope.get_baggage().serialize()
     assert outgoing_headers["headers"]["baggage"] == scope.get_baggage().serialize()
 
@@ -217,6 +229,8 @@ def test_celery_trace_propagation_enable_tracing(
 
     assert outgoing_headers["sentry-trace"] == scope.get_traceparent()
     assert outgoing_headers["headers"]["sentry-trace"] == scope.get_traceparent()
+    assert outgoing_headers["traceparent"] == scope._get_w3c_traceparent()
+    assert outgoing_headers["headers"]["traceparent"] == scope._get_w3c_traceparent()
     assert outgoing_headers["baggage"] == scope.get_baggage().serialize()
     assert outgoing_headers["headers"]["baggage"] == scope.get_baggage().serialize()