.

Author: sentrivana

tests/test_dsc.py

@@ -413,6 +413,7 @@ def my_traces_sampler(sampling_context):
     if expected_sampled == "tracing-disabled-no-transactions-should-be-sent":
         assert len(envelopes) == 0
     else:
+        assert len(envelopes) == 1
         transaction_envelope = envelopes[0]
         dsc_in_envelope_header = transaction_envelope.headers["trace"]
 

tests/tracing/test_sampling.py

@@ -7,7 +7,6 @@
 import sentry_sdk
 from sentry_sdk import start_span, capture_exception
 from sentry_sdk.tracing import BAGGAGE_HEADER_NAME
-from sentry_sdk.tracing_utils import Baggage
 from sentry_sdk.utils import logger
 
 
@@ -61,7 +60,9 @@ def test_uses_traces_sample_rate_correctly(
     sentry_init(traces_sample_rate=traces_sample_rate)
 
     with sentry_sdk.continue_trace(
-        {BAGGAGE_HEADER_NAME: "sentry-sample_rand=0.500000"}
+        {
+            BAGGAGE_HEADER_NAME: "sentry-sample_rand=0.500000,sentry-trace_id=397f36434d07b20135324b2e6ae70c77"
+        }
     ):
         with start_span(name="dogpark") as root_span:
             assert root_span.sampled is expected_decision
@@ -78,9 +79,13 @@ def test_uses_traces_sampler_return_value_correctly(
 ):
     sentry_init(traces_sampler=mock.Mock(return_value=traces_sampler_return_value))
 
-    baggage = Baggage(sentry_items={"sample_rand": "0.500000"})
-    root_span = start_span(name="dogpark", baggage=baggage)
-    assert root_span.sampled is expected_decision
+    with sentry_sdk.continue_trace(
+        {
+            BAGGAGE_HEADER_NAME: "sentry-sample_rand=0.500000,sentry-trace_id=397f36434d07b20135324b2e6ae70c77"
+        }
+    ):
+        with start_span(name="dogpark") as root_span:
+            assert root_span.sampled is expected_decision
 
 
 @pytest.mark.parametrize("traces_sampler_return_value", [True, False])