.

Author: sentrivana

sentry_sdk/tracing_utils.py

@@ -495,7 +495,7 @@ def _fill_sample_rand(self):
 
     def _sample_rand(self):
         # type: () -> Optional[str]
-        """Convenience method to get the sample_rand value from the dynamic_sampling_context."""
+        """Convenience method to get the sample_rand value from the baggage."""
         if self.baggage is None:
             return None
 

tests/test_dsc.py

@@ -8,7 +8,6 @@
 This is not tested in this file.
 """
 
-import random
 from unittest import mock
 
 import pytest
@@ -269,14 +268,14 @@ def my_traces_sampler(sampling_context):
         ),
         (  # 4 traces_sampler overrides incoming (incoming not sampled)
             {
-                "incoming_sample_rate": 0.9,
+                "incoming_sample_rate": 0.3,
                 "incoming_sampled": "false",
                 "sentry_trace_header_parent_sampled": 0,
                 "use_local_traces_sampler": True,
-                "local_traces_sampler_result": 0.5,
+                "local_traces_sampler_result": 0.25,
                 "local_traces_sample_rate": 0.7,
             },
-            0.5,  # expected_sample_rate
+            0.25,  # expected_sample_rate
             "false",  # expected_sampled (traces sampler can override parent sampled)
         ),
         (  # 5 forwarding incoming (traces_sample_rate not set)
@@ -317,14 +316,14 @@ def my_traces_sampler(sampling_context):
         ),
         (  # 8 traces_sampler overrides incoming  (traces_sample_rate not set) (incoming not sampled)
             {
-                "incoming_sample_rate": 0.9,
+                "incoming_sample_rate": 0.3,
                 "incoming_sampled": "false",
                 "sentry_trace_header_parent_sampled": 0,
                 "use_local_traces_sampler": True,
-                "local_traces_sampler_result": 0.5,
+                "local_traces_sampler_result": 0.25,
                 "local_traces_sample_rate": None,
             },
-            0.5,  # expected_sample_rate
+            0.25,  # expected_sample_rate
             "false",  # expected_sampled
         ),
         (  # 9 traces_sample_rate overrides incoming (upstream deferred sampling decision)
@@ -405,7 +404,7 @@ def my_traces_sampler(sampling_context):
     }
 
     # We continue the incoming trace and start a new transaction
-    with mock.patch.object(random, "random", return_value=0.2):
+    with mock.patch("sentry_sdk.tracing_utils.Random.uniform", return_value=0.2):
         with sentry_sdk.continue_trace(incoming_http_headers):
             with sentry_sdk.start_span(name="foo"):
                 pass