Cleanup

Author: antonpirker

tests/tracing/test_trace_propagation.py

@@ -58,7 +58,7 @@ def mock_putheader_fn(self, header, value):
         "traces_sample_rate=1",
     ],
 )
-def test_no_incoming_trace_and_trace_targets_matching(
+def test_no_incoming_trace_and_trace_propagation_targets_matching(
     sentry_init, capture_events, _mock_putheader, traces_sample_rate
 ):
     init_kwargs = {}
@@ -107,17 +107,23 @@ def test_no_incoming_trace_and_trace_targets_matching(
         "traces_sample_rate=1",
     ],
 )
-def test_with_incoming_trace_and_trace_targets_matching(
+def test_no_incoming_trace_and_trace_propagation_targets_not_matching(
     sentry_init, capture_events, _mock_putheader, traces_sample_rate
 ):
-    init_kwargs = {}
+    init_kwargs = {
+        "trace_propagation_targets": [
+            "http://someothersite.com",
+        ],
+    }
     if traces_sample_rate != USE_DEFAULT_TRACES_SAMPLE_RATE:
         init_kwargs["traces_sample_rate"] = traces_sample_rate
     sentry_init(**init_kwargs)
 
     events = capture_events()
 
-    with sentry_sdk.continue_trace(INCOMING_HEADERS):
+    NO_INCOMING_HEADERS = {}  # noqa: N806
+
+    with sentry_sdk.continue_trace(NO_INCOMING_HEADERS):
         with sentry_sdk.start_span(op="test", name="test"):
             requests.get("http://example.com")
 
@@ -130,18 +136,11 @@ def test_with_incoming_trace_and_trace_targets_matching(
     outgoing_request_headers = {key: value for key, value in _mock_putheader}
 
     # CHECK if trace information is added to the outgoing request
-    assert "sentry-trace" in outgoing_request_headers
-    assert "baggage" in outgoing_request_headers
+    assert "sentry-trace" not in outgoing_request_headers
+    assert "baggage" not in outgoing_request_headers
 
     # CHECK if incoming trace is continued
-    if traces_sample_rate in (0, 1, USE_DEFAULT_TRACES_SAMPLE_RATE):
-        # continue the incoming trace
-        assert INCOMING_TRACE_ID in outgoing_request_headers["sentry-trace"]
-        assert INCOMING_TRACE_ID in outgoing_request_headers["baggage"]
-    elif traces_sample_rate is None:
-        # do NOT continue the incoming trace
-        assert INCOMING_TRACE_ID not in outgoing_request_headers["sentry-trace"]
-        assert INCOMING_TRACE_ID not in outgoing_request_headers["baggage"]
+    # (no assert necessary, because the trace information is not added to the outgoing request (see previous asserts))
 
 
 @pytest.mark.parametrize(
@@ -159,23 +158,30 @@ def test_with_incoming_trace_and_trace_targets_matching(
         "traces_sample_rate=1",
     ],
 )
-def test_no_incoming_trace_and_trace_targets_not_matching(
-    sentry_init, capture_events, _mock_putheader, traces_sample_rate
+@pytest.mark.parametrize(
+    "incoming_parent_sampled",
+    ["deferred", "1", "0"],
+    ids=[
+        "incoming_parent_sampled=DEFERRED",
+        "incoming_parent_sampled=1",
+        "incoming_parent_sampled=0",
+    ],
+)
+def test_with_incoming_trace_and_trace_propagation_targets_matching(
+    sentry_init,
+    capture_events,
+    _mock_putheader,
+    incoming_parent_sampled,
+    traces_sample_rate,
 ):
-    init_kwargs = {
-        "trace_propagation_targets": [
-            "http://someothersite.com",
-        ],
-    }
+    init_kwargs = {}
     if traces_sample_rate != USE_DEFAULT_TRACES_SAMPLE_RATE:
         init_kwargs["traces_sample_rate"] = traces_sample_rate
     sentry_init(**init_kwargs)
 
     events = capture_events()
 
-    NO_INCOMING_HEADERS = {}  # noqa: N806
-
-    with sentry_sdk.continue_trace(NO_INCOMING_HEADERS):
+    with sentry_sdk.continue_trace(INCOMING_HEADERS):
         with sentry_sdk.start_span(op="test", name="test"):
             requests.get("http://example.com")
 
@@ -188,11 +194,18 @@ def test_no_incoming_trace_and_trace_targets_not_matching(
     outgoing_request_headers = {key: value for key, value in _mock_putheader}
 
     # CHECK if trace information is added to the outgoing request
-    assert "sentry-trace" not in outgoing_request_headers
-    assert "baggage" not in outgoing_request_headers
+    assert "sentry-trace" in outgoing_request_headers
+    assert "baggage" in outgoing_request_headers
 
     # CHECK if incoming trace is continued
-    # (no assert necessary, because the trace information is not added to the outgoing request (see previous asserts))
+    if traces_sample_rate in (0, 1, USE_DEFAULT_TRACES_SAMPLE_RATE):
+        # continue the incoming trace
+        assert INCOMING_TRACE_ID in outgoing_request_headers["sentry-trace"]
+        assert INCOMING_TRACE_ID in outgoing_request_headers["baggage"]
+    elif traces_sample_rate is None:
+        # do NOT continue the incoming trace
+        assert INCOMING_TRACE_ID not in outgoing_request_headers["sentry-trace"]
+        assert INCOMING_TRACE_ID not in outgoing_request_headers["baggage"]
 
 
 @pytest.mark.parametrize(
@@ -210,8 +223,21 @@ def test_no_incoming_trace_and_trace_targets_not_matching(
         "traces_sample_rate=1",
     ],
 )
-def test_with_incoming_trace_and_trace_targets_not_matching(
-    sentry_init, capture_events, _mock_putheader, traces_sample_rate
+@pytest.mark.parametrize(
+    "incoming_parent_sampled",
+    ["deferred", "1", "0"],
+    ids=[
+        "incoming_parent_sampled=DEFERRED",
+        "incoming_parent_sampled=1",
+        "incoming_parent_sampled=0",
+    ],
+)
+def test_with_incoming_trace_and_trace_propagation_targets_not_matching(
+    sentry_init,
+    capture_events,
+    _mock_putheader,
+    incoming_parent_sampled,
+    traces_sample_rate,
 ):
     init_kwargs = {
         "trace_propagation_targets": [