From 02ac556b182db7bc89675a4e897d4037fe227921 Mon Sep 17 00:00:00 2001 From: Ivana Kellyer Date: Mon, 28 Sep 2026 11:32:20 +0200 Subject: [PATCH 1/3] chore: Use top-level API in tests --- tests/integrations/flask/test_flask.py | 6 +- tests/integrations/graphene/test_graphene.py | 6 +- tests/integrations/huey/test_huey.py | 16 ++-- tests/integrations/loguru/test_loguru.py | 38 ++++----- tests/test_attributes.py | 14 ++-- tests/test_logs.py | 2 +- tests/test_metrics.py | 2 +- tests/tracing/test_decorator.py | 12 +-- tests/tracing/test_sampling.py | 6 +- tests/tracing/test_span_batcher.py | 2 +- tests/tracing/test_span_streaming.py | 88 ++++++++++---------- 11 files changed, 96 insertions(+), 96 deletions(-) diff --git a/tests/integrations/flask/test_flask.py b/tests/integrations/flask/test_flask.py index fa84780fd9..498f74d82e 100644 --- a/tests/integrations/flask/test_flask.py +++ b/tests/integrations/flask/test_flask.py @@ -380,7 +380,7 @@ def index(): except ZeroDivisionError: pass - sentry_sdk.get_client().flush() + sentry_sdk.flush() (first_event, error_event, session) = envelopes first_event = first_event.get_event() @@ -1085,7 +1085,7 @@ def test_response_status_code_ok_in_transaction_context( client = app.test_client() client.get("/message") - sentry_sdk.get_client().flush() + sentry_sdk.flush() (_, transaction_envelope, _) = envelopes transaction = transaction_envelope.get_transaction_event() @@ -1112,7 +1112,7 @@ def test_response_status_code_not_found_in_transaction_context( client = app.test_client() client.get("/not-existing-route") - sentry_sdk.get_client().flush() + sentry_sdk.flush() (transaction_envelope, _) = envelopes transaction = transaction_envelope.get_transaction_event() diff --git a/tests/integrations/graphene/test_graphene.py b/tests/integrations/graphene/test_graphene.py index 60f47463cb..724f68b220 100644 --- a/tests/integrations/graphene/test_graphene.py +++ b/tests/integrations/graphene/test_graphene.py @@ -458,7 +458,7 @@ def graphql_server_sync(): client = sync_app.test_client() client.post("/graphql", json=query) - sentry_sdk.get_client().flush() + sentry_sdk.flush() spans = [item.payload for item in items] assert len(spans) == 2 @@ -518,7 +518,7 @@ def graphql_server_sync(): client = sync_app.test_client() client.post("/graphql", json=query) - sentry_sdk.get_client().flush() + sentry_sdk.flush() spans = [item.payload for item in items] assert len(spans) == 2 @@ -612,7 +612,7 @@ def graphql_server_sync(): client = sync_app.test_client() client.post("/graphql", json=query) - sentry_sdk.get_client().flush() + sentry_sdk.flush() events = [item.payload for item in items if item.type == "event"] assert len(events) == 1 diff --git a/tests/integrations/huey/test_huey.py b/tests/integrations/huey/test_huey.py index a81a348d87..91435fa4ad 100644 --- a/tests/integrations/huey/test_huey.py +++ b/tests/integrations/huey/test_huey.py @@ -93,7 +93,7 @@ def division(a, b): execute_huey_task( huey, division, 1, int(not task_fails), exceptions=(DivisionByZero,) ) - sentry_sdk.get_client().flush() + sentry_sdk.flush() payloads = [i.payload for i in items] # The task is enqueued without a wrapping span, so in streaming mode no @@ -156,7 +156,7 @@ def retry_task(context): if has_span_streaming: items = capture_items("span") execute_huey_task(huey, retry_task, context) - sentry_sdk.get_client().flush() + sentry_sdk.flush() payloads = [i.payload for i in items] # The initial enqueue happens without a wrapping span, so no producer @@ -179,7 +179,7 @@ def retry_task(context): task = huey.dequeue() huey.execute(task) - sentry_sdk.get_client().flush() + sentry_sdk.flush() all_payloads = [i.payload for i in items] @@ -223,7 +223,7 @@ def cancel_task(): if has_span_streaming: items = capture_items("span") execute_huey_task(huey, cancel_task) - sentry_sdk.get_client().flush() + sentry_sdk.flush() payloads = [i.payload for i in items] # Enqueued without a wrapping span -> no producer span in streaming mode. @@ -269,7 +269,7 @@ def maybe_locked_task(): with huey.lock_task(lock_name): assert huey.is_locked(task_lock_name) == should_be_locked execute_huey_task(huey, maybe_locked_task) - sentry_sdk.get_client().flush() + sentry_sdk.flush() payloads = [i.payload for i in items] # Enqueued without a wrapping span -> no producer span in streaming mode. @@ -325,7 +325,7 @@ def division(a, b): if has_span_streaming: items = capture_items("event") execute_huey_task(huey, division, 1, b=0, exceptions=(DivisionByZero,)) - sentry_sdk.get_client().flush() + sentry_sdk.flush() events = [item.payload for item in items] else: events = capture_events() @@ -443,7 +443,7 @@ def task2(): task = huey.dequeue() huey.execute(task) - sentry_sdk.get_client().flush() + sentry_sdk.flush() assert len(items) == 6 ( @@ -575,7 +575,7 @@ def task2(results): task = huey.dequeue() huey.execute(task) - sentry_sdk.get_client().flush() + sentry_sdk.flush() assert len(items) == 6 ( diff --git a/tests/integrations/loguru/test_loguru.py b/tests/integrations/loguru/test_loguru.py index 2db777d3c3..bc3312e974 100644 --- a/tests/integrations/loguru/test_loguru.py +++ b/tests/integrations/loguru/test_loguru.py @@ -145,7 +145,7 @@ def test_sentry_logs_warning( logger.warning("this is {} a {}", "just", "template") - sentry_sdk.get_client().flush() + sentry_sdk.flush() logs = [item.payload for item in items] attrs = logs[0]["attributes"] @@ -168,7 +168,7 @@ def test_sentry_logs_debug( envelopes = capture_envelopes() logger.debug("this is %s a template %s", "1", "2") - sentry_sdk.get_client().flush() + sentry_sdk.flush() assert len(envelopes) == 0 @@ -194,7 +194,7 @@ def test_sentry_log_levels(sentry_init, capture_items, uninstall_integration, re logger.error("this is a log") logger.critical("this is a log") - sentry_sdk.get_client().flush() + sentry_sdk.flush() logs = [item.payload for item in items] assert len(logs) == 4 @@ -229,7 +229,7 @@ def test_disable_loguru_logs( logger.error("this is a log") logger.critical("this is a log") - sentry_sdk.get_client().flush() + sentry_sdk.flush() logs = [item.payload for item in items] assert len(logs) == 0 @@ -251,7 +251,7 @@ def test_disable_sentry_logs_by_default( logger.error("this is a log") logger.critical("this is a log") - sentry_sdk.get_client().flush() + sentry_sdk.flush() logs = [item.payload for item in items] assert len(logs) == 0 @@ -274,7 +274,7 @@ def test_enable_sentry_logs_if_enable_logs_is_true( logger.error("this is a log") logger.critical("this is a log") - sentry_sdk.get_client().flush() + sentry_sdk.flush() logs = [item.payload for item in items] assert len(logs) == 5 @@ -299,7 +299,7 @@ def test_disable_sentry_logs_if_enable_logs_is_true_but_integration_option_is_fa logger.error("this is a log") logger.critical("this is a log") - sentry_sdk.get_client().flush() + sentry_sdk.flush() logs = [item.payload for item in items] assert not logs @@ -323,7 +323,7 @@ def test_disable_sentry_logs_explicitly( logger.error("this is a log") logger.critical("this is a log") - sentry_sdk.get_client().flush() + sentry_sdk.flush() logs = [item.payload for item in items] assert len(logs) == 0 @@ -348,7 +348,7 @@ def test_no_log_infinite_loop( envelopes = capture_envelopes() logger.debug("this is %s a template %s", "1", "2") - sentry_sdk.get_client().flush() + sentry_sdk.flush() assert len(envelopes) == 1 @@ -366,7 +366,7 @@ def test_logging_errors( logger.error(Exception("test exc 1")) logger.error("error is %s", Exception("test exc 2")) - sentry_sdk.get_client().flush() + sentry_sdk.flush() error_event_1 = envelopes[0].items[0].payload.json assert error_event_1["level"] == "error" @@ -424,7 +424,7 @@ def record(self, val): with patch("loguru._handler.Message", FakeMessage): logger.error("some message") - sentry_sdk.get_client().flush() + sentry_sdk.flush() logs = [item.payload for item in items] assert len(logs) == 1 @@ -473,7 +473,7 @@ def record(self, val): with patch("loguru._handler.Message", FakeMessage): logger.error("some message") - sentry_sdk.get_client().flush() + sentry_sdk.flush() logs = [item.payload for item in items] assert len(logs) == 1 @@ -491,7 +491,7 @@ def test_logger_with_all_attributes( items = capture_items("log") logger.warning("log #{}", 1) - sentry_sdk.get_client().flush() + sentry_sdk.flush() logs = [item.payload for item in items] @@ -564,7 +564,7 @@ def test_logger_capture_parameters_from_args( logger.warning("Task ID: {}", 123) - sentry_sdk.get_client().flush() + sentry_sdk.flush() logs = [item.payload for item in items] @@ -583,7 +583,7 @@ def test_logger_capture_parameters_from_kwargs( logger.warning("Task ID: {task_id}", task_id=123) - sentry_sdk.get_client().flush() + sentry_sdk.flush() logs = [item.payload for item in items] @@ -603,7 +603,7 @@ def test_logger_capture_parameters_from_contextualize( with logger.contextualize(task_id=123): logger.warning("Log") - sentry_sdk.get_client().flush() + sentry_sdk.flush() logs = [item.payload for item in items] @@ -621,7 +621,7 @@ def test_logger_capture_parameters_from_bind( items = capture_items("log") logger.bind(task_id=123).warning("Log") - sentry_sdk.get_client().flush() + sentry_sdk.flush() logs = [item.payload for item in items] @@ -639,7 +639,7 @@ def test_logger_capture_parameters_from_patch( items = capture_items("log") logger.patch(lambda record: record["extra"].update(task_id=123)).warning("Log") - sentry_sdk.get_client().flush() + sentry_sdk.flush() logs = [item.payload for item in items] @@ -657,7 +657,7 @@ def test_no_parameters_no_template( items = capture_items("log") logger.warning("Logging a hardcoded warning") - sentry_sdk.get_client().flush() + sentry_sdk.flush() logs = [item.payload for item in items] diff --git a/tests/test_attributes.py b/tests/test_attributes.py index d76bb13c8f..8e2e36747e 100644 --- a/tests/test_attributes.py +++ b/tests/test_attributes.py @@ -21,7 +21,7 @@ def test_top_level_api(sentry_init, capture_items): sentry_sdk.remove_attribute("nonexistent") sentry_sdk.metrics.count("test", 1) - sentry_sdk.get_client().flush() + sentry_sdk.flush() metrics = [item.payload for item in items] (metric,) = metrics @@ -56,7 +56,7 @@ def test_scope_precedence(sentry_init, capture_items): current_scope.set_attribute("overwritten.attribute", "current") sentry_sdk.metrics.count("test", 1) - sentry_sdk.get_client().flush() + sentry_sdk.flush() metrics = [item.payload for item in items] (metric,) = metrics @@ -99,7 +99,7 @@ def test_telemetry_precedence(sentry_init, capture_items): }, ) - sentry_sdk.get_client().flush() + sentry_sdk.flush() metrics = [item.payload for item in items] (metric,) = metrics @@ -122,7 +122,7 @@ def test_attribute_out_of_scope(sentry_init, capture_items): sentry_sdk.metrics.count("test", 1) - sentry_sdk.get_client().flush() + sentry_sdk.flush() metrics = [item.payload for item in items] (metric,) = metrics @@ -141,7 +141,7 @@ def test_remove_attribute(sentry_init, capture_items): sentry_sdk.metrics.count("test", 1) - sentry_sdk.get_client().flush() + sentry_sdk.flush() metrics = [item.payload for item in items] (metric,) = metrics @@ -177,7 +177,7 @@ class Cat: sentry_sdk.metrics.count("test", 1) - sentry_sdk.get_client().flush() + sentry_sdk.flush() metrics = [item.payload for item in items] (metric,) = metrics @@ -208,7 +208,7 @@ def test_user_attributes(sentry_init, capture_items): with sentry_sdk.traces.start_span(name="login"): sentry_sdk.metrics.count("test", 1) - sentry_sdk.get_client().flush() + sentry_sdk.flush() metric, span = [item.payload for item in items] diff --git a/tests/test_logs.py b/tests/test_logs.py index 15f75456be..40cdb90cbd 100644 --- a/tests/test_logs.py +++ b/tests/test_logs.py @@ -547,7 +547,7 @@ def test_transport_format(sentry_init, capture_envelopes): sentry_sdk.logger.warning("This is a log...") - sentry_sdk.get_client().flush() + sentry_sdk.flush() assert len(envelopes) == 1 assert len(envelopes[0].items) == 1 diff --git a/tests/test_metrics.py b/tests/test_metrics.py index 5583a22cc8..f8aa05efac 100644 --- a/tests/test_metrics.py +++ b/tests/test_metrics.py @@ -333,7 +333,7 @@ def test_transport_format(sentry_init, capture_envelopes): sentry_sdk.metrics.count("test.counter", 1) - sentry_sdk.get_client().flush() + sentry_sdk.flush() assert len(envelopes) == 1 assert len(envelopes[0].items) == 1 diff --git a/tests/tracing/test_decorator.py b/tests/tracing/test_decorator.py index e315b6f1ca..bcbd669be7 100644 --- a/tests/tracing/test_decorator.py +++ b/tests/tracing/test_decorator.py @@ -100,7 +100,7 @@ def traced_function(): result = traced_function() assert result == "ok" - sentry_sdk.get_client().flush() + sentry_sdk.flush() spans = [item.payload for item in items] assert len(spans) == 1 @@ -129,7 +129,7 @@ def traced_function(): result = traced_function() assert result == "ok" - sentry_sdk.get_client().flush() + sentry_sdk.flush() spans = [item.payload for item in items] assert len(spans) == 1 @@ -157,7 +157,7 @@ def traced_function(): result = traced_function() assert result == "ok" - sentry_sdk.get_client().flush() + sentry_sdk.flush() spans = [item.payload for item in items] assert len(spans) == 2 @@ -185,7 +185,7 @@ async def traced_function(): result = await traced_function() assert result == "ok" - sentry_sdk.get_client().flush() + sentry_sdk.flush() spans = [item.payload for item in items] assert len(spans) == 1 @@ -217,7 +217,7 @@ async def traced_function(): result = await traced_function() assert result == "ok" - sentry_sdk.get_client().flush() + sentry_sdk.flush() spans = [item.payload for item in items] assert len(spans) == 1 @@ -248,7 +248,7 @@ async def traced_function(): result = await traced_function() assert result == "ok" - sentry_sdk.get_client().flush() + sentry_sdk.flush() spans = [item.payload for item in items] assert len(spans) == 2 diff --git a/tests/tracing/test_sampling.py b/tests/tracing/test_sampling.py index 0685498d13..dabbb81f34 100644 --- a/tests/tracing/test_sampling.py +++ b/tests/tracing/test_sampling.py @@ -711,7 +711,7 @@ def test_unsampled_spans_produce_client_report_if_traces_sample_rate_defined( with sentry_sdk.traces.start_span(name="child2"): pass - sentry_sdk.get_client().flush() + sentry_sdk.flush() spans = [item.payload for item in items] assert not spans @@ -740,7 +740,7 @@ def test_unsampled_spans_produce_client_report_if_traces_sampler_defined( with sentry_sdk.traces.start_span(name="child2"): pass - sentry_sdk.get_client().flush() + sentry_sdk.flush() spans = [item.payload for item in items] assert not spans @@ -769,7 +769,7 @@ def test_no_client_reports_if_tracing_is_off( with sentry_sdk.traces.start_span(name="child2"): pass - sentry_sdk.get_client().flush() + sentry_sdk.flush() spans = [item.payload for item in items] assert not spans diff --git a/tests/tracing/test_span_batcher.py b/tests/tracing/test_span_batcher.py index 8eae824ce0..f249125c90 100644 --- a/tests/tracing/test_span_batcher.py +++ b/tests/tracing/test_span_batcher.py @@ -420,7 +420,7 @@ def test_transport_format(sentry_init, capture_envelopes): with sentry_sdk.traces.start_span(name="test"): ... - sentry_sdk.get_client().flush() + sentry_sdk.flush() assert len(envelopes) == 1 assert len(envelopes[0].items) == 1 diff --git a/tests/tracing/test_span_streaming.py b/tests/tracing/test_span_streaming.py index 5de65e4802..fd6902e39b 100644 --- a/tests/tracing/test_span_streaming.py +++ b/tests/tracing/test_span_streaming.py @@ -34,7 +34,7 @@ def test_start_span(sentry_init, capture_items): assert child._is_segment() is False assert child._segment == segment - sentry_sdk.get_client().flush() + sentry_sdk.flush() spans = [item.payload for item in items] assert len(spans) == 2 @@ -74,7 +74,7 @@ def test_start_span_no_context_manager(sentry_init, capture_items): child.end() segment.end() - sentry_sdk.get_client().flush() + sentry_sdk.flush() spans = [item.payload for item in items] assert len(spans) == 2 @@ -120,7 +120,7 @@ def traces_sampler(sampling_context): segment.set_attribute("delayed_attribute", 12) segment.end() - sentry_sdk.get_client().flush() + sentry_sdk.flush() spans = [item.payload for item in items] assert len(spans) == 1 @@ -143,7 +143,7 @@ def test_start_span_attributes(sentry_init, capture_items): ): ... - sentry_sdk.get_client().flush() + sentry_sdk.flush() spans = [item.payload for item in items] assert len(spans) == 1 @@ -175,7 +175,7 @@ def traces_sampler(sampling_context): ): ... - sentry_sdk.get_client().flush() + sentry_sdk.flush() spans = [item.payload for item in items] assert len(spans) == 1 @@ -216,7 +216,7 @@ def traces_sampler(sampling_context): assert received_trace_id == trace_id - sentry_sdk.get_client().flush() + sentry_sdk.flush() spans = [item.payload for item in items] assert len(spans) == 1 @@ -250,7 +250,7 @@ def before_send_span(span, hint): ): ... - sentry_sdk.get_client().flush() + sentry_sdk.flush() spans = [item.payload for item in items] assert len(spans) == 1 @@ -285,7 +285,7 @@ def before_send_span(span, hint): with sentry_sdk.traces.start_span(name="span"): ... - sentry_sdk.get_client().flush() + sentry_sdk.flush() spans = [item.payload for item in items] assert len(spans) == 1 @@ -312,7 +312,7 @@ def before_send_span(span, hint): with sentry_sdk.traces.start_span(name="span"): ... - sentry_sdk.get_client().flush() + sentry_sdk.flush() spans = [item.payload for item in items] assert len(spans) == 1 @@ -344,7 +344,7 @@ def before_send_span(span, hint): with sentry_sdk.traces.start_span(name="ignored"): ... - sentry_sdk.get_client().flush() + sentry_sdk.flush() spans = [item.payload for item in items] assert not spans @@ -371,7 +371,7 @@ def before_send_span(span, hint): with sentry_sdk.traces.start_span(name="span", attributes={"original": "value"}): ... - sentry_sdk.get_client().flush() + sentry_sdk.flush() spans = [item.payload for item in items] # The exception in before_send_span is swallowed and the original, @@ -402,7 +402,7 @@ def before_send_span(span, hint): with sentry_sdk.traces.start_span(name="span"): ... - sentry_sdk.get_client().flush() + sentry_sdk.flush() spans = [item.payload for item in items] assert len(spans) == 1 @@ -436,7 +436,7 @@ def experimental(span, hint): with sentry_sdk.traces.start_span(name="span"): ... - sentry_sdk.get_client().flush() + sentry_sdk.flush() spans = [item.payload for item in items] assert len(spans) == 1 @@ -483,7 +483,7 @@ def test_span_attributes(sentry_init, capture_items): assert attributes["attribute3"] == 4.5 assert attributes["attribute4"] is False - sentry_sdk.get_client().flush() + sentry_sdk.flush() spans = [item.payload for item in items] assert len(spans) == 1 @@ -522,7 +522,7 @@ class Class: assert isinstance(attributes["attribute2"], str) assert "Class" in attributes["attribute2"] - sentry_sdk.get_client().flush() + sentry_sdk.flush() spans = [item.payload for item in items] assert len(spans) == 1 @@ -554,7 +554,7 @@ def traces_sampler(sampling_context): with sentry_sdk.traces.start_span(name="retained", attributes={"drop": False}): ... - sentry_sdk.get_client().flush() + sentry_sdk.flush() spans = [item.payload for item in items] assert len(spans) == 1 @@ -580,7 +580,7 @@ def traces_sampler(sampling_context): with sentry_sdk.traces.start_span(name="test"): ... - sentry_sdk.get_client().flush() + sentry_sdk.flush() spans = [item.payload for item in items] # Falls back to traces_sample_rate=1.0, so span should still be sent @@ -627,7 +627,7 @@ def test_start_inactive_span(sentry_init, capture_items): # Should have segment as parent since child1 is inactive pass - sentry_sdk.get_client().flush() + sentry_sdk.flush() spans = [item.payload for item in items] assert len(spans) == 3 @@ -663,7 +663,7 @@ def test_start_span_override_parent(sentry_init, capture_items): with sentry_sdk.traces.start_span(name="child2", parent_span=segment): pass - sentry_sdk.get_client().flush() + sentry_sdk.flush() spans = [item.payload for item in items] assert len(spans) == 3 @@ -703,7 +703,7 @@ def test_sibling_segments(sentry_init, capture_items): with sentry_sdk.traces.start_span(name="segment2"): ... - sentry_sdk.get_client().flush() + sentry_sdk.flush() spans = [item.payload for item in items] assert len(spans) == 2 @@ -738,7 +738,7 @@ def test_sibling_segments_new_trace(sentry_init, capture_items): with sentry_sdk.traces.start_span(name="segment2"): ... - sentry_sdk.get_client().flush() + sentry_sdk.flush() spans = [item.payload for item in items] assert len(spans) == 2 @@ -785,7 +785,7 @@ def test_continue_trace_sampled(sentry_init, capture_items): assert span._parent_span_id == parent_span_id assert span._sample_rand == float(sample_rand) - sentry_sdk.get_client().flush() + sentry_sdk.flush() spans = [item.payload for item in items] assert len(spans) == 1 @@ -825,7 +825,7 @@ def test_continue_trace_unsampled(sentry_init, capture_items): assert span.trace_id == trace_id assert span.span_id != "0000000000000000" - sentry_sdk.get_client().flush() + sentry_sdk.flush() spans = [item.payload for item in items] assert len(spans) == 0 @@ -874,7 +874,7 @@ def test_backpressure_outcome( with sentry_sdk.traces.start_span(name="span") as span: pass - sentry_sdk.get_client().flush() + sentry_sdk.flush() spans = [item.payload for item in items] # Original traces_sample_rate is 0.5, downsampled sample rate is 0.25, so: @@ -922,7 +922,7 @@ def test_continue_trace_no_sample_rand(sentry_init, capture_items): assert span._parent_span_id == parent_span_id assert isinstance(span._sample_rand, float) - sentry_sdk.get_client().flush() + sentry_sdk.flush() spans = [item.payload for item in items] assert len(spans) == 1 @@ -1309,7 +1309,7 @@ def test_set_span_status(sentry_init, capture_items): with sentry_sdk.traces.start_span(name="span") as span: span.status = "error" - sentry_sdk.get_client().flush() + sentry_sdk.flush() spans = [item.payload for item in items] assert len(spans) == 2 @@ -1331,7 +1331,7 @@ def test_set_span_status_on_error(sentry_init, capture_items): with sentry_sdk.traces.start_span(name="span") as span: raise ValueError("oh no!") - sentry_sdk.get_client().flush() + sentry_sdk.flush() spans = [item.payload for item in items] assert len(spans) == 1 @@ -1352,7 +1352,7 @@ def test_set_span_status_on_ignored_span(sentry_init, capture_items): with sentry_sdk.traces.start_span(name="ignored") as span: span.status = "error" - sentry_sdk.get_client().flush() + sentry_sdk.flush() spans = [item.payload for item in items] assert len(spans) == 0 @@ -1460,7 +1460,7 @@ def test_ignore_spans_set_in_experiments( assert span.sampled is True assert isinstance(span, StreamedSpan) - sentry_sdk.get_client().flush() + sentry_sdk.flush() spans = [item.payload for item in items] if ignored: @@ -1489,7 +1489,7 @@ def test_ignore_spans_basic( with sentry_sdk.traces.start_span(name="not ignored") as span: assert span.sampled is True - sentry_sdk.get_client().flush() + sentry_sdk.flush() spans = [item.payload for item in items] @@ -1527,7 +1527,7 @@ def test_ignore_spans_ignored_segment_drops_whole_tree( assert span2.sampled is False assert isinstance(span2, NoOpStreamedSpan) - sentry_sdk.get_client().flush() + sentry_sdk.flush() spans = [item.payload for item in items] assert len(spans) == 0 @@ -1566,7 +1566,7 @@ def test_ignore_spans_ignored_segment_drops_whole_tree_explicit_parent_span( span2.end() ignored_span.end() - sentry_sdk.get_client().flush() + sentry_sdk.flush() spans = [item.payload for item in items] @@ -1603,7 +1603,7 @@ def test_ignore_spans_set_ignored_child_span_as_parent( assert span.sampled is True assert span._parent_span_id == segment.span_id - sentry_sdk.get_client().flush() + sentry_sdk.flush() spans = [item.payload for item in items] assert len(spans) == 2 @@ -1655,7 +1655,7 @@ def test_ignore_spans_set_ignored_child_span_as_parent_explicit_parent_span( ignored_span1.end() segment.end() - sentry_sdk.get_client().flush() + sentry_sdk.flush() spans = [item.payload for item in items] assert len(spans) == 2 @@ -1696,7 +1696,7 @@ def test_ignore_spans_reparenting(sentry_init, capture_items): assert span5.sampled is True assert span5._parent_span_id == span3.span_id - sentry_sdk.get_client().flush() + sentry_sdk.flush() spans = [item.payload for item in items] assert len(spans) == 3 @@ -1726,7 +1726,7 @@ def test_ignored_spans_produce_client_report( with sentry_sdk.traces.start_span(name="span2"): pass - sentry_sdk.get_client().flush() + sentry_sdk.flush() spans = [item.payload for item in items] assert not spans @@ -1759,7 +1759,7 @@ def test_segment_span_has_profiler_id( with sentry_sdk.traces.start_span(name="profiled segment"): time.sleep(0.1) - sentry_sdk.get_client().flush() + sentry_sdk.flush() time.sleep(0.3) # wait for profiler to flush spans = [item.payload for item in items] @@ -1794,7 +1794,7 @@ def test_segment_span_no_profiler_id_when_unsampled( with sentry_sdk.traces.start_span(name="segment"): time.sleep(0.05) - sentry_sdk.get_client().flush() + sentry_sdk.flush() time.sleep(0.2) spans = [item.payload for item in items] @@ -1851,7 +1851,7 @@ def test_default_attributes(sentry_init, capture_envelopes): with sentry_sdk.traces.start_span(name="test"): ... - sentry_sdk.get_client().flush() + sentry_sdk.flush() assert len(envelopes) == 1 assert len(envelopes[0].items) == 1 @@ -1930,7 +1930,7 @@ def test_trace_lifecycle_top_level_enables_streaming(sentry_init, capture_items) with sentry_sdk.traces.start_span(name="segment") as segment: assert isinstance(segment, StreamedSpan) - sentry_sdk.get_client().flush() + sentry_sdk.flush() spans = [item.payload for item in items] assert len(spans) == 1 @@ -1959,7 +1959,7 @@ def test_ignore_spans_top_level( assert span.sampled is True assert isinstance(span, StreamedSpan) - sentry_sdk.get_client().flush() + sentry_sdk.flush() spans = [item.payload for item in items] if ignored: @@ -1988,7 +1988,7 @@ def test_ignore_spans_top_level_with_trace_lifecycle_in_experiments( with sentry_sdk.traces.start_span(name="not ignored") as span: assert span.sampled is True - sentry_sdk.get_client().flush() + sentry_sdk.flush() spans = [item.payload for item in items] assert len(spans) == 1 @@ -2012,7 +2012,7 @@ def test_ignore_spans_empty_top_level_overrides_experiments(sentry_init, capture assert span.sampled is True assert isinstance(span, StreamedSpan) - sentry_sdk.get_client().flush() + sentry_sdk.flush() spans = [item.payload for item in items] assert len(spans) == 1 @@ -2054,7 +2054,7 @@ def test_top_level_trace_lifecycle_takes_precedence_over_experiments( else: assert isinstance(segment, NoOpStreamedSpan) - sentry_sdk.get_client().flush() + sentry_sdk.flush() spans = [item.payload for item in items] if streaming_enabled: From 49ae70cabb4c9d039dbaaac16009a9a62dc50873 Mon Sep 17 00:00:00 2001 From: Ivana Kellyer Date: Mon, 28 Sep 2026 12:44:08 +0200 Subject: [PATCH 2/3] . From 4716b242a7b529b59ebac0cf53c72198464297c0 Mon Sep 17 00:00:00 2001 From: Ivana Kellyer Date: Mon, 28 Sep 2026 13:06:06 +0200 Subject: [PATCH 3/3] ci