diff --git a/tests/integrations/wsgi/test_wsgi.py b/tests/integrations/wsgi/test_wsgi.py index 487ccbfd69..76c80f6c6a 100644 --- a/tests/integrations/wsgi/test_wsgi.py +++ b/tests/integrations/wsgi/test_wsgi.py @@ -437,7 +437,7 @@ def test_app(environ, start_response): sentry_init( traces_sample_rate=1.0, - _experiments={"profiles_sample_rate": 1.0}, + profiles_sample_rate=1.0, ) app = SentryWsgiMiddleware(test_app) envelopes = capture_envelopes() diff --git a/tests/profiler/test_continuous_profiler.py b/tests/profiler/test_continuous_profiler.py index a3c3e54874..27994648f8 100644 --- a/tests/profiler/test_continuous_profiler.py +++ b/tests/profiler/test_continuous_profiler.py @@ -24,25 +24,16 @@ requires_gevent = pytest.mark.skipif(gevent is None, reason="gevent not enabled") -def get_client_options(use_top_level_profiler_mode): +def get_client_options(): def client_options( mode=None, auto_start=None, profile_session_sample_rate=1.0, lifecycle="manual" ): - if use_top_level_profiler_mode: - return { - "profile_lifecycle": lifecycle, - "profiler_mode": mode, - "profile_session_sample_rate": profile_session_sample_rate, - "_experiments": { - "continuous_profiling_auto_start": auto_start, - }, - } return { "profile_lifecycle": lifecycle, + "profiler_mode": mode, "profile_session_sample_rate": profile_session_sample_rate, "_experiments": { "continuous_profiling_auto_start": auto_start, - "continuous_profiling_mode": mode, }, } @@ -60,8 +51,7 @@ def client_options( @pytest.mark.parametrize( "make_options", [ - pytest.param(get_client_options(True), id="non-experiment"), - pytest.param(get_client_options(False), id="experiment"), + pytest.param(get_client_options()), ], ) def test_continuous_profiler_invalid_mode(mode, make_options, teardown_profiling): @@ -83,8 +73,7 @@ def test_continuous_profiler_invalid_mode(mode, make_options, teardown_profiling @pytest.mark.parametrize( "make_options", [ - pytest.param(get_client_options(True), id="non-experiment"), - pytest.param(get_client_options(False), id="experiment"), + pytest.param(get_client_options()), ], ) def test_continuous_profiler_valid_mode(mode, make_options, teardown_profiling): @@ -106,8 +95,7 @@ def test_continuous_profiler_valid_mode(mode, make_options, teardown_profiling): @pytest.mark.parametrize( "make_options", [ - pytest.param(get_client_options(True), id="non-experiment"), - pytest.param(get_client_options(False), id="experiment"), + pytest.param(get_client_options()), ], ) def test_continuous_profiler_setup_twice(mode, make_options, teardown_profiling): @@ -215,8 +203,7 @@ def assert_single_transaction_without_profile_chunks(envelopes): @pytest.mark.parametrize( "make_options", [ - pytest.param(get_client_options(True), id="non-experiment"), - pytest.param(get_client_options(False), id="experiment"), + pytest.param(get_client_options()), ], ) @mock.patch("sentry_sdk.profiler.continuous_profiler.PROFILE_BUFFER_SECONDS", 0.01) @@ -275,8 +262,7 @@ def test_continuous_profiler_auto_start_and_manual_stop( @pytest.mark.parametrize( "make_options", [ - pytest.param(get_client_options(True), id="non-experiment"), - pytest.param(get_client_options(False), id="experiment"), + pytest.param(get_client_options()), ], ) @mock.patch("sentry_sdk.profiler.continuous_profiler.PROFILE_BUFFER_SECONDS", 0.01) @@ -340,8 +326,7 @@ def test_continuous_profiler_manual_start_and_stop_sampled( @pytest.mark.parametrize( "make_options", [ - pytest.param(get_client_options(True), id="non-experiment"), - pytest.param(get_client_options(False), id="experiment"), + pytest.param(get_client_options()), ], ) def test_continuous_profiler_manual_start_and_stop_unsampled( @@ -382,8 +367,7 @@ def test_continuous_profiler_manual_start_and_stop_unsampled( @pytest.mark.parametrize( "make_options", [ - pytest.param(get_client_options(True), id="non-experiment"), - pytest.param(get_client_options(False), id="experiment"), + pytest.param(get_client_options()), ], ) @mock.patch("sentry_sdk.profiler.continuous_profiler.DEFAULT_SAMPLING_FREQUENCY", 21) @@ -444,8 +428,7 @@ def test_continuous_profiler_auto_start_and_stop_sampled( @pytest.mark.parametrize( "make_options", [ - pytest.param(get_client_options(True), id="non-experiment"), - pytest.param(get_client_options(False), id="experiment"), + pytest.param(get_client_options()), ], ) @mock.patch("sentry_sdk.profiler.continuous_profiler.PROFILE_BUFFER_SECONDS", 0.01) @@ -493,8 +476,7 @@ def test_continuous_profiler_auto_start_and_stop_unsampled( @pytest.mark.parametrize( "make_options", [ - pytest.param(get_client_options(True), id="non-experiment"), - pytest.param(get_client_options(False), id="experiment"), + pytest.param(get_client_options()), ], ) def test_continuous_profiler_manual_start_and_stop_noop_when_using_trace_lifecyle( diff --git a/tests/test_client.py b/tests/test_client.py index fb547e495a..9b0b4c3bdb 100644 --- a/tests/test_client.py +++ b/tests/test_client.py @@ -378,13 +378,6 @@ def test_socks_proxy(testcase, http2): ) -def test_simple_transport(sentry_init): - events = [] - sentry_init(transport=events.append) - capture_message("Hello World!") - assert events[0]["message"] == "Hello World!" - - def test_ignore_errors(sentry_init, capture_events): sentry_init(ignore_errors=[ZeroDivisionError]) events = capture_events()