fixes

Author: sentrivana

sentry_sdk/integrations/opentelemetry/sampler.py

@@ -217,7 +217,12 @@ def should_sample(
             sample_rand = parent_sample_rand
         else:
             # We are the head SDK and we need to generate a new sample_rand
-            sample_rand = cast(Decimal, _generate_sample_rand(str(trace_id), (0, 1)))
+            sample_rand = _generate_sample_rand(str(trace_id), (0, 1))
+
+        if sample_rand is None:
+            # If we failed to generate a sample_rand, abort
+            logger.debug(f"[Tracing] Failed to generate a sample_rand, dropping {name}")
+            return dropped_result(parent_span_context, attributes)
 
         # Explicit sampled value provided at start_span
         custom_sampled = cast(

tests/integrations/opentelemetry/test_propagator.py

@@ -139,11 +139,11 @@ def test_inject_continue_trace(sentry_init):
         "HTTP_BAGGAGE": baggage,
     }
 
-    expected_baggage = baggage + ",sentry-sample_rand=0.002849"
+    expected_baggage = baggage + ",sentry-sample_rand=0.001111"
 
     with patch(
         "sentry_sdk.tracing_utils.Random.uniform",
-        return_value=0.002849,
+        return_value=0.001111,
     ):
         with sentry_sdk.continue_trace(incoming_headers):
             with sentry_sdk.start_span(name="foo") as span:
@@ -195,12 +195,12 @@ def test_inject_head_sdk(sentry_init):
         "sentry-trace_id={trace_id},"
         "sentry-sample_rate=1.0,"
         "sentry-sampled=true,"
-        "sentry-sample_rand=0.123456"
+        "sentry-sample_rand=0.111111"
     )
 
     with patch(
         "sentry_sdk.tracing_utils.Random.uniform",
-        return_value=0.123456,
+        return_value=0.111111,
     ):
         with sentry_sdk.start_span(name="foo") as span:
             SentryPropagator().inject(carrier, setter=setter)

tests/integrations/stdlib/test_httplib.py

@@ -233,7 +233,7 @@ def test_outgoing_trace_headers(
         "sentry-public_key=49d0f7386ad645858ae85020e393bef3,"
         "sentry-sample_rate=0.01337,"
         "sentry-user_id=Am%C3%A9lie,"
-        "sentry-sample_rand=0.00337,"
+        "sentry-sample_rand=0.003370,"
         "sentry-sampled=true"
     )
 

tests/tracing/test_sample_rand.py

@@ -128,7 +128,11 @@ def test_invalid_sampled_and_sample_rate(sentry_init, incoming):
 
     sample_rate, sampled = incoming
 
-    baggage = f"sentry-sample_rate={sample_rate},sentry-sampled={sampled},sentry-trace_id=771a43a4192642f0b136d5159a501700"  # noqa: E231
+    baggage = (
+        f"sentry-sample_rate={sample_rate},"  # noqa: E231
+        f"sentry-sampled={sampled},"  # noqa: E231
+        "sentry-trace_id=771a43a4192642f0b136d5159a501700"
+    )
     sentry_trace = f"771a43a4192642f0b136d5159a501700-1234567890abcdef-{1 if sampled == 'true' else 0}"
 
     with sentry_sdk.continue_trace(