adapt tests

Author: sentrivana

tests/integrations/aiohttp/test_aiohttp.py

@@ -618,7 +618,7 @@ async def handler(request):
 
     raw_server = await aiohttp_raw_server(handler)
 
-    with mock.patch("sentry_sdk.tracing_utils.Random.uniform", return_value=0.5):
+    with mock.patch("sentry_sdk.tracing_utils.Random.randrange", return_value=500000):
         with start_transaction(
             name="/interactions/other-dogs/new-dog",
             op="greeting.sniff",

tests/integrations/celery/test_celery.py

@@ -518,8 +518,8 @@ def test_baggage_propagation(init_celery):
     def dummy_task(self, x, y):
         return _get_headers(self)
 
-    # patch random.uniform to return a predictable sample_rand value
-    with mock.patch("sentry_sdk.tracing_utils.Random.uniform", return_value=0.5):
+    # patch random.randrange to return a predictable sample_rand value
+    with mock.patch("sentry_sdk.tracing_utils.Random.randrange", return_value=500000):
         with start_transaction() as transaction:
             result = dummy_task.apply_async(
                 args=(1, 0),

tests/integrations/httpx/test_httpx.py

@@ -170,8 +170,8 @@ def test_outgoing_trace_headers_append_to_baggage(
 
     url = "http://example.com/"
 
-    # patch random.uniform to return a predictable sample_rand value
-    with mock.patch("sentry_sdk.tracing_utils.Random.uniform", return_value=0.5):
+    # patch random.randrange to return a predictable sample_rand value
+    with mock.patch("sentry_sdk.tracing_utils.Random.randrange", return_value=500000):
         with start_transaction(
             name="/interactions/other-dogs/new-dog",
             op="greeting.sniff",

tests/integrations/stdlib/test_httplib.py

@@ -236,7 +236,7 @@ def test_outgoing_trace_headers_head_sdk(sentry_init, monkeypatch):
     monkeypatch.setattr(HTTPSConnection, "send", mock_send)
 
     sentry_init(traces_sample_rate=0.5, release="foo")
-    with mock.patch("sentry_sdk.tracing_utils.Random.uniform", return_value=0.25):
+    with mock.patch("sentry_sdk.tracing_utils.Random.randrange", return_value=250000):
         transaction = Transaction.continue_from_headers({})
 
     with start_transaction(transaction=transaction, name="Head SDK tx") as transaction:

tests/test_dsc.py

@@ -175,7 +175,7 @@ def my_traces_sampler(sampling_context):
     }
 
     # We continue the incoming trace and start a new transaction
-    with mock.patch("sentry_sdk.tracing_utils.Random.uniform", return_value=0.125):
+    with mock.patch("sentry_sdk.tracing_utils.Random.randrange", return_value=125000):
         transaction = sentry_sdk.continue_trace(incoming_http_headers)
         with sentry_sdk.start_transaction(transaction, name="foo"):
             pass

tests/test_monitor.py

@@ -73,7 +73,7 @@ def test_transaction_uses_downsampled_rate(
     assert monitor.downsample_factor == 1
 
     # make sure we don't sample the transaction
-    with mock.patch("sentry_sdk.tracing_utils.Random.uniform", return_value=0.75):
+    with mock.patch("sentry_sdk.tracing_utils.Random.randrange", return_value=750000):
         with sentry_sdk.start_transaction(name="foobar") as transaction:
             assert transaction.sampled is False
             assert transaction.sample_rate == 0.5

tests/test_propagationcontext.py

@@ -136,13 +136,13 @@ def test_sample_rand_filled(parent_sampled, sample_rate, expected_interval):
     else:
         sample_rate_str = ""
 
-    # for convenience, we'll just return the lower bound of the interval
-    mock_uniform = mock.Mock(return_value=expected_interval[0])
+    # for convenience, we'll just return the lower bound of the interval as an integer
+    mock_randrange = mock.Mock(return_value=int(expected_interval[0] * 1000000))
 
     def mock_random_class(seed):
         assert seed == "00000000000000000000000000000000", "seed should be the trace_id"
         rv = Mock()
-        rv.uniform = mock_uniform
+        rv.randrange = mock_randrange
         return rv
 
     with mock.patch("sentry_sdk.tracing_utils.Random", mock_random_class):
@@ -158,17 +158,20 @@ def mock_random_class(seed):
         ctx.dynamic_sampling_context["sample_rand"]
         == f"{expected_interval[0]:.6f}"  # noqa: E231
     )
-    assert mock_uniform.call_count == 1
-    assert mock_uniform.call_args[0] == expected_interval
+    assert mock_randrange.call_count == 1
+    assert mock_randrange.call_args[0] == (
+        int(expected_interval[0] * 1000000),
+        int(expected_interval[1] * 1000000),
+    )
 
 
 def test_sample_rand_rounds_down():
     # Mock value that should round down to 0.999_999
-    mock_uniform = mock.Mock(return_value=0.999_999_9)
+    mock_randrange = mock.Mock(return_value=999999)
 
     def mock_random_class(_):
         rv = Mock()
-        rv.uniform = mock_uniform
+        rv.randrange = mock_randrange
         return rv
 
     with mock.patch("sentry_sdk.tracing_utils.Random", mock_random_class):

tests/tracing/test_integration_tests.py

@@ -169,7 +169,7 @@ def test_dynamic_sampling_head_sdk_creates_dsc(
     envelopes = capture_envelopes()
 
     # make sure transaction is sampled for both cases
-    with mock.patch("sentry_sdk.tracing_utils.Random.uniform", return_value=0.25):
+    with mock.patch("sentry_sdk.tracing_utils.Random.randrange", return_value=250000):
         transaction = Transaction.continue_from_headers({}, name="Head SDK tx")
 
     # will create empty mutable baggage

tests/tracing/test_sample_rand.py

@@ -1,5 +1,3 @@
-import decimal
-from decimal import Inexact, FloatOperation
 from unittest import mock
 
 import pytest
@@ -20,7 +18,8 @@ def test_deterministic_sampled(sentry_init, capture_events, sample_rate, sample_
     events = capture_events()
 
     with mock.patch(
-        "sentry_sdk.tracing_utils.Random.uniform", return_value=sample_rand
+        "sentry_sdk.tracing_utils.Random.randrange",
+        return_value=int(sample_rand * 1000000),
     ):
         with sentry_sdk.start_transaction() as transaction:
             assert (
@@ -55,35 +54,3 @@ def test_transaction_uses_incoming_sample_rand(
     # Transaction event captured if sample_rand < sample_rate, indicating that
     # sample_rand is used to make the sampling decision.
     assert len(events) == int(sample_rand < sample_rate)
-
-
-def test_decimal_context(sentry_init, capture_events):
-    """
-    Ensure that having a user altered decimal context with a precision below 6
-    does not cause an InvalidOperation exception.
-    """
-    sentry_init(traces_sample_rate=1.0)
-    events = capture_events()
-
-    old_prec = decimal.getcontext().prec
-    old_inexact = decimal.getcontext().traps[Inexact]
-    old_float_operation = decimal.getcontext().traps[FloatOperation]
-
-    decimal.getcontext().prec = 2
-    decimal.getcontext().traps[Inexact] = True
-    decimal.getcontext().traps[FloatOperation] = True
-
-    try:
-        with mock.patch(
-            "sentry_sdk.tracing_utils.Random.uniform", return_value=0.123456789
-        ):
-            with sentry_sdk.start_transaction() as transaction:
-                assert (
-                    transaction.get_baggage().sentry_items["sample_rand"] == "0.123456"
-                )
-    finally:
-        decimal.getcontext().prec = old_prec
-        decimal.getcontext().traps[Inexact] = old_inexact
-        decimal.getcontext().traps[FloatOperation] = old_float_operation
-
-    assert len(events) == 1

tests/tracing/test_sample_rand_propagation.py

@@ -35,9 +35,9 @@ def test_continue_trace_missing_sample_rand():
         "baggage": "sentry-placeholder=asdf",
     }
 
-    mock_uniform = Mock(return_value=0.5)
-
-    with mock.patch("sentry_sdk.tracing_utils.Random.uniform", mock_uniform):
+    with mock.patch(
+        "sentry_sdk.tracing_utils.Random.randrange", Mock(return_value=500000)
+    ):
         transaction = sentry_sdk.continue_trace(headers)
 
     assert transaction.get_baggage().sentry_items["sample_rand"] == "0.500000"