mypy

Author: sentrivana

MIGRATION_GUIDE.md

@@ -156,6 +156,7 @@ Looking to upgrade from Sentry SDK 2.x to 3.x? Here's a comprehensive list of wh
 - `profiles_sample_rate` and `profiler_mode` were removed from options available via `_experiments`. Use the top-level `profiles_sample_rate` and `profiler_mode` options instead.
 - `Transport.capture_event` has been removed. Use `Transport.capture_envelope` instead.
 - Function transports are no longer supported. Subclass the `Transport` instead.
+- `start_transaction` (`start_span`) no longer takes a `baggage` argument. Use the `continue_trace()` context manager instead to propagate baggage.
 
 ### Deprecated
 

sentry_sdk/integrations/opentelemetry/sampler.py

@@ -197,7 +197,7 @@ def should_sample(
             lower, upper = _sample_rand_range(parent_sampled, parent_sample_rate)
 
             try:
-                sample_rand = _generate_sample_rand(trace_id, (lower, upper))
+                sample_rand = _generate_sample_rand(str(trace_id), (lower, upper))
             except ValueError:
                 # ValueError is raised if the interval is invalid, i.e. lower >= upper.
                 # lower >= upper might happen if the incoming trace's sampled flag

sentry_sdk/tracing_utils.py

@@ -457,25 +457,35 @@ def _fill_sample_rand(self):
 
         This function does nothing if there is no dynamic_sampling_context.
         """
-        if self.dynamic_sampling_context is None:
+        if self.dynamic_sampling_context is None or self.baggage is None:
             return
 
-        try:
-            sample_rand = Decimal(self.baggage.sentry_items.get("sample_rand"))
-        except (TypeError, ValueError, InvalidOperation):
-            sample_rand = None
+        sentry_baggage = self.baggage.sentry_items
+
+        sample_rand = None
+        if sentry_baggage.get("sample_rand"):
+            try:
+                sample_rand = Decimal(sentry_baggage["sample_rand"])
+            except (ValueError, InvalidOperation):
+                logger.debug(
+                    f"Failed to convert incoming sample_rand to int: {sample_rand}"
+                )
 
         if sample_rand is not None and 0 <= sample_rand < 1:
             # sample_rand is present and valid, so don't overwrite it
             return
 
-        # Get the sample rate and compute the transformation that will map the random value
-        # to the desired range: [0, 1), [0, sample_rate), or [sample_rate, 1).
-        try:
-            sample_rate = float(self.baggage.sentry_items.get("sample_rate"))
-        except (TypeError, ValueError):
-            sample_rate = None
+        sample_rate = None
+        if sentry_baggage.get("sample_rate"):
+            try:
+                sample_rate = float(sentry_baggage["sample_rate"])
+            except (ValueError, KeyError):
+                logger.debug(
+                    f"Failed to convert incoming sample_rate to float: {sample_rate}"
+                )
 
+        # Compute the transformation that will map the random value
+        # to the desired range: [0, 1), [0, sample_rate), or [sample_rate, 1).
         lower, upper = _sample_rand_range(self.parent_sampled, sample_rate)
 
         try:
@@ -753,7 +763,7 @@ def get_current_span(scope=None):
 
 
 def _generate_sample_rand(
-    trace_id,  # type: Optional[int]
+    trace_id,  # type: Optional[str]
     interval=(0.0, 1.0),  # type: tuple[float, float]
 ):
     # type: (...) -> decimal.Decimal