Update some tests to new default value

Author: antonpirker

tests/integrations/aiohttp/test_aiohttp.py

@@ -448,7 +448,10 @@ async def hello(request):
 async def test_trace_from_headers_if_performance_disabled(
     sentry_init, aiohttp_client, capture_events
 ):
-    sentry_init(integrations=[AioHttpIntegration()])
+    sentry_init(
+        integrations=[AioHttpIntegration()],
+        traces_sample_rate=None,  # disable all performance monitoring
+    )
 
     async def hello(request):
         capture_message("It's a good day to try dividing by 0")

tests/integrations/asgi/test_asgi.py

@@ -269,7 +269,9 @@ async def test_has_trace_if_performance_disabled(
     asgi3_app_with_error_and_msg,
     capture_events,
 ):
-    sentry_init()
+    sentry_init(
+        traces_sample_rate=None,  # disable all performance monitoring
+    )
     app = SentryAsgiMiddleware(asgi3_app_with_error_and_msg)
 
     with pytest.raises(ZeroDivisionError):

tests/integrations/django/test_basic.py

@@ -241,6 +241,7 @@ def test_trace_from_headers_if_performance_disabled(
                 http_methods_to_capture=("HEAD",),
             )
         ],
+        traces_sample_rate=None,  # disable all performance monitoring
     )
 
     events = capture_events()

tests/integrations/opentelemetry/test_sampler.py

@@ -6,14 +6,16 @@
 import sentry_sdk
 
 
+USE_DEFAULT_TRACES_SAMPLE_RATE = -1
+
 tracer = trace.get_tracer(__name__)
 
 
 @pytest.mark.parametrize(
     "traces_sample_rate, expected_num_of_envelopes",
     [
-        # special case for testing, do not pass any traces_sample_rate to init() (the default traces_sample_rate=None will be used)
-        (-1, 0),
+        # special case for testing, do not pass any traces_sample_rate to init() (the default traces_sample_rate=0 will be used)
+        (USE_DEFAULT_TRACES_SAMPLE_RATE, 0),
         # traces_sample_rate=None means do not create new traces, and also do not continue incoming traces. So, no envelopes at all.
         (None, 0),
         # traces_sample_rate=0 means do not create new traces (0% of the requests), but continue incoming traces. So envelopes will be created only if there is an incoming trace.
@@ -29,7 +31,7 @@ def test_sampling_traces_sample_rate_0_or_100(
     expected_num_of_envelopes,
 ):
     kwargs = {}
-    if traces_sample_rate != -1:
+    if traces_sample_rate != USE_DEFAULT_TRACES_SAMPLE_RATE:
         kwargs["traces_sample_rate"] = traces_sample_rate
 
     sentry_init(**kwargs)
@@ -176,8 +178,8 @@ def keep_only_a(sampling_context):
 @pytest.mark.parametrize(
     "traces_sample_rate, expected_num_of_envelopes",
     [
-        # special case for testing, do not pass any traces_sample_rate to init() (the default traces_sample_rate=None will be used)
-        (-1, 0),
+        # special case for testing, do not pass any traces_sample_rate to init() (the default traces_sample_rate=0 will be used)
+        (USE_DEFAULT_TRACES_SAMPLE_RATE, 1),
         # traces_sample_rate=None means do not create new traces, and also do not continue incoming traces. So, no envelopes at all.
         (None, 0),
         # traces_sample_rate=0 means do not create new traces (0% of the requests), but continue incoming traces. So envelopes will be created only if there is an incoming trace.
@@ -193,7 +195,7 @@ def test_sampling_parent_sampled(
     capture_envelopes,
 ):
     kwargs = {}
-    if traces_sample_rate != -1:
+    if traces_sample_rate != USE_DEFAULT_TRACES_SAMPLE_RATE:
         kwargs["traces_sample_rate"] = traces_sample_rate
 
     sentry_init(**kwargs)
@@ -227,9 +229,11 @@ def test_sampling_parent_sampled(
 @pytest.mark.parametrize(
     "traces_sample_rate, upstream_sampled, expected_num_of_envelopes",
     [
-        # special case for testing, do not pass any traces_sample_rate to init() (the default traces_sample_rate=None will be used)
-        (-1, 0, 0),
+        # special case for testing, do not pass any traces_sample_rate to init() (the default traces_sample_rate=0 will be used)
+        (USE_DEFAULT_TRACES_SAMPLE_RATE, 0, 0),
+        (USE_DEFAULT_TRACES_SAMPLE_RATE, 1, 1),
         # traces_sample_rate=None means do not create new traces, and also do not continue incoming traces. So, no envelopes at all.
+        (None, 0, 0),
         (None, 1, 0),
         # traces_sample_rate=0 means do not create new traces (0% of the requests), but continue incoming traces. So envelopes will be created only if there is an incoming trace.
         (0, 0, 0),
@@ -247,7 +251,7 @@ def test_sampling_parent_dropped(
     capture_envelopes,
 ):
     kwargs = {}
-    if traces_sample_rate != -1:
+    if traces_sample_rate != USE_DEFAULT_TRACES_SAMPLE_RATE:
         kwargs["traces_sample_rate"] = traces_sample_rate
 
     sentry_init(**kwargs)
@@ -281,8 +285,8 @@ def test_sampling_parent_dropped(
 @pytest.mark.parametrize(
     "traces_sample_rate, expected_num_of_envelopes",
     [
-        # special case for testing, do not pass any traces_sample_rate to init() (the default traces_sample_rate=None will be used)
-        (-1, 0),
+        # special case for testing, do not pass any traces_sample_rate to init() (the default traces_sample_rate=0 will be used)
+        (USE_DEFAULT_TRACES_SAMPLE_RATE, 0),
         # traces_sample_rate=None means do not create new traces, and also do not continue incoming traces. So, no envelopes at all.
         (None, 0),
         # traces_sample_rate=0 means do not create new traces (0% of the requests), but continue incoming traces. So envelopes will be created only if there is an incoming trace.
@@ -298,7 +302,7 @@ def test_sampling_parent_deferred(
     capture_envelopes,
 ):
     kwargs = {}
-    if traces_sample_rate != -1:
+    if traces_sample_rate != USE_DEFAULT_TRACES_SAMPLE_RATE:
         kwargs["traces_sample_rate"] = traces_sample_rate
 
     sentry_init(**kwargs)

tests/integrations/wsgi/test_wsgi.py

@@ -238,7 +238,9 @@ def dogpark(environ, start_response):
         capture_message("Attempting to fetch the ball")
         raise ValueError("Fetch aborted. The ball was not returned.")
 
-    sentry_init()
+    sentry_init(
+        traces_sample_rate=None,  # disable all performance monitoring
+    )
     app = SentryWsgiMiddleware(dogpark)
     client = Client(app)
     events = capture_events()
@@ -301,7 +303,9 @@ def dogpark(environ, start_response):
         capture_message("Attempting to fetch the ball")
         raise ValueError("Fetch aborted. The ball was not returned.")
 
-    sentry_init()
+    sentry_init(
+        traces_sample_rate=None,  # disable all performance monitoring
+    )
     app = SentryWsgiMiddleware(dogpark)
     client = Client(app)
     events = capture_events()