move rounding to separate helper func

Author: sentrivana

sentry_sdk/integrations/opentelemetry/sampler.py

@@ -8,6 +8,7 @@
 import sentry_sdk
 from sentry_sdk.tracing_utils import (
     _generate_sample_rand,
+    _round_sample_rand,
     has_tracing_enabled,
 )
 from sentry_sdk.utils import is_valid_sample_rate, logger
@@ -86,10 +87,7 @@ def get_parent_sample_rand(parent_context, trace_id):
         if parent_sample_rand is None:
             return None
 
-        try:
-            return Decimal(parent_sample_rand)
-        except Exception:
-            return None
+        return _round_sample_rand(parent_sample_rand)
 
     return None
 
@@ -119,7 +117,9 @@ def dropped_result(parent_span_context, attributes, sample_rate=None, sample_ran
         trace_state = trace_state.update(TRACESTATE_SAMPLE_RATE_KEY, str(sample_rate))
 
     if sample_rand is not None:
-        trace_state = trace_state.update(TRACESTATE_SAMPLE_RAND_KEY, str(sample_rand))
+        trace_state = trace_state.update(
+            TRACESTATE_SAMPLE_RAND_KEY, f"{sample_rand:.6f}"  # noqa: E231
+        )
 
     is_root_span = not (
         parent_span_context.is_valid and not parent_span_context.is_remote
@@ -169,7 +169,9 @@ def sampled_result(span_context, attributes, sample_rate=None, sample_rand=None)
         trace_state = trace_state.update(TRACESTATE_SAMPLE_RATE_KEY, str(sample_rate))
 
     if sample_rand is not None:
-        trace_state = trace_state.update(TRACESTATE_SAMPLE_RAND_KEY, str(sample_rand))
+        trace_state = trace_state.update(
+            TRACESTATE_SAMPLE_RAND_KEY, f"{sample_rand:.6f}"  # noqa: E231
+        )
 
     return SamplingResult(
         Decision.RECORD_AND_SAMPLE,

sentry_sdk/tracing_utils.py

@@ -783,12 +783,7 @@ def _generate_sample_rand(
     while sample_rand >= upper:
         sample_rand = rng.uniform(lower, upper)
 
-    # Round down to exactly six decimal-digit precision.
-    # Setting the context is needed to avoid an InvalidOperation exception
-    # in case the user has changed the default precision.
-    return Decimal(sample_rand).quantize(
-        Decimal("0.000001"), rounding=ROUND_DOWN, context=Context(prec=6)
-    )
+    return _round_sample_rand(sample_rand)
 
 
 def _sample_rand_range(parent_sampled, sample_rate):
@@ -806,6 +801,21 @@ def _sample_rand_range(parent_sampled, sample_rate):
         return sample_rate, 1.0
 
 
+def _round_sample_rand(sample_rand):
+    # type: (Decimal) -> Optional[Decimal]
+    # Round down to exactly six decimal-digit precision.
+    # Setting the context is needed to avoid an InvalidOperation exception
+    # in case the user has changed the default precision.
+    try:
+        return Decimal(sample_rand).quantize(
+            Decimal("0.000001"), rounding=ROUND_DOWN, context=Context(prec=6)
+        )
+    except Exception as ex:
+        logger.debug(f"Failed to round sample_rand {sample_rand}: {ex}")
+
+    return None
+
+
 # Circular imports
 from sentry_sdk.tracing import (
     BAGGAGE_HEADER_NAME,

tests/integrations/opentelemetry/test_propagator.py

@@ -1,4 +1,3 @@
-import decimal
 from unittest.mock import MagicMock, patch
 
 import pytest