diff --git a/scripts/init_serverless_sdk.py b/scripts/init_serverless_sdk.py index c3ad427936..33a85be4b0 100644 --- a/scripts/init_serverless_sdk.py +++ b/scripts/init_serverless_sdk.py @@ -23,7 +23,6 @@ dsn=os.environ["SENTRY_DSN"], integrations=[AwsLambdaIntegration(timeout_warning=True)], traces_sample_rate=float(os.environ["SENTRY_TRACES_SAMPLE_RATE"]), - trace_lifecycle="stream", ) diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py index f50f8e2141..b55460aee7 100644 --- a/sentry_sdk/consts.py +++ b/sentry_sdk/consts.py @@ -73,7 +73,6 @@ class CompressionAlgo(Enum): "transport_num_pools": Optional[int], "transport_http2": Optional[bool], "transport_async": Optional[bool], - "trace_lifecycle": Optional[Literal["static", "stream"]], "data_collection": Optional[DataCollectionUserOptions], }, total=False, @@ -1304,7 +1303,6 @@ def __init__( attach_stacktrace: bool = False, ca_certs: "Optional[str]" = None, traces_sample_rate: "Optional[float]" = None, - trace_lifecycle: "Optional[Literal['static', 'stream']]" = None, traces_sampler: "Optional[TracesSampler]" = None, profiler_mode: "Optional[ContinuousProfilerMode]" = None, profile_lifecycle: 'Literal["manual", "trace"]' = "manual", @@ -1727,17 +1725,12 @@ def __init__( :param before_send_span: An optional function to modify spans before they're sent to Sentry. Modifications to the span's attributes and name will be retained. Unlike ``before_send_log`` - and ``before_send_metric``, spans cannot be dropped by returning None. Only works when - ``trace_lifecycle="stream"`` is enabled. + and ``before_send_metric``, spans cannot be dropped by returning None. :param stream_gen_ai_spans: When set, generative AI spans are sent in a new transport format to reduce downstream data loss. - :param trace_lifecycle: Controls how traces are sent. Set to `"stream"` to send spans as they - finish, or `"static"` to send a completed trace as a transaction event. - - :param ignore_spans: A sequence of span-matching rules. Matching spans are ignored when - `trace_lifecycle="stream"` is enabled. + :param ignore_spans: A sequence of span-matching rules. Matching spans are ignored. :param _experiments: Dictionary of experimental, opt-in features that are not yet stable. diff --git a/sentry_sdk/traces.py b/sentry_sdk/traces.py index fa71c31d44..78789767cb 100644 --- a/sentry_sdk/traces.py +++ b/sentry_sdk/traces.py @@ -848,9 +848,6 @@ def get_current_span( ) -> "Optional[StreamedSpan]": """ Returns the currently active span on the scope if the span is a `StreamedSpan`, otherwise `None`. - - This function will only return a non-`None` value when the streaming trace lifecycle is enabled. - To enable the lifecycle, pass `trace_lifecycle="stream"` to `sentry.init()`. """ scope = scope or sentry_sdk.get_current_scope() current_span = scope.streamed_span diff --git a/tests/integrations/aiohttp/test_aiohttp.py b/tests/integrations/aiohttp/test_aiohttp.py index 18801b6a1c..274d18d535 100644 --- a/tests/integrations/aiohttp/test_aiohttp.py +++ b/tests/integrations/aiohttp/test_aiohttp.py @@ -302,7 +302,6 @@ async def test_tracing_unparseable_url(sentry_init, aiohttp_client, capture_item sentry_init( integrations=[AioHttpIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) async def hello(request): @@ -341,7 +340,6 @@ async def test_traces_sampler_gets_request_object_in_sampling_context( traces_sampler = mock.Mock() sentry_init( integrations=[AioHttpIntegration()], - trace_lifecycle="stream", traces_sampler=traces_sampler, ) @@ -372,7 +370,6 @@ async def test_has_trace_if_performance_enabled( sentry_init( integrations=[AioHttpIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) async def hello(request): @@ -423,7 +420,7 @@ async def hello(request): async def test_has_trace_if_performance_disabled( sentry_init, aiohttp_client, capture_events ): - sentry_init(integrations=[AioHttpIntegration()], trace_lifecycle="stream") + sentry_init(integrations=[AioHttpIntegration()]) async def hello(request): capture_message("It's a good day to try dividing by 0") @@ -459,7 +456,6 @@ async def test_trace_from_headers_if_performance_enabled( sentry_init( integrations=[AioHttpIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) async def hello(request): @@ -592,7 +588,6 @@ def before_breadcrumb(crumb, hint): sentry_init( integrations=[AioHttpIntegration()], before_breadcrumb=before_breadcrumb, - trace_lifecycle="stream", **pii_options, ) @@ -686,9 +681,7 @@ async def test_crumb_capture_client_error( url_expected, query_expected, ): - sentry_init( - integrations=[AioHttpIntegration()], trace_lifecycle="stream", **pii_options - ) + sentry_init(integrations=[AioHttpIntegration()], **pii_options) async def handler(request): return web.Response(status=status_code) @@ -738,7 +731,6 @@ async def test_outgoing_trace_headers_adds_missing_unsigned_propagation_headers( sentry_init( integrations=[AioHttpIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) async def handler(request): @@ -780,7 +772,6 @@ async def test_outgoing_trace_headers_appends_baggage_but_preserves_sentry_trace sentry_init( integrations=[AioHttpIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", release="d08ebdb9309e1b004c6f52202de58a09c2268e42", ) @@ -815,7 +806,6 @@ async def test_outgoing_trace_headers_preserves_signed_propagation_headers( sentry_init( integrations=[AioHttpIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) async def handler(request): @@ -855,7 +845,6 @@ async def test_outgoing_trace_headers_preserves_query_signed_baggage( sentry_init( integrations=[AioHttpIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) async def handler(request): @@ -894,7 +883,6 @@ async def test_request_source_disabled( sentry_init( integrations=[AioHttpIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", enable_http_request_source=False, http_request_source_threshold_ms=0, ) @@ -946,7 +934,6 @@ async def test_request_source_enabled( sentry_init( integrations=[AioHttpIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", http_request_source_threshold_ms=0, **extra_options, ) @@ -989,7 +976,6 @@ async def test_request_source( sentry_init( integrations=[AioHttpIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", enable_http_request_source=True, http_request_source_threshold_ms=0, ) @@ -1050,7 +1036,6 @@ async def test_request_source_with_module_in_search_path( sentry_init( integrations=[AioHttpIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", enable_http_request_source=True, http_request_source_threshold_ms=0, ) @@ -1105,7 +1090,6 @@ async def test_no_request_source_if_duration_too_short( sentry_init( integrations=[AioHttpIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", enable_http_request_source=True, http_request_source_threshold_ms=10**10, ) @@ -1151,7 +1135,6 @@ async def test_request_source_if_duration_over_threshold( sentry_init( integrations=[AioHttpIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", enable_http_request_source=True, http_request_source_threshold_ms=0, ) @@ -1211,7 +1194,6 @@ async def test_span_origin( ): sentry_init( integrations=[AioHttpIntegration()], - trace_lifecycle="stream", traces_sample_rate=1.0, ) @@ -1363,7 +1345,6 @@ async def test_tracing(sentry_init, aiohttp_client, capture_items, send_pii): integrations=[AioHttpIntegration()], traces_sample_rate=1.0, send_default_pii=send_pii, - trace_lifecycle="stream", ) async def hello(request): @@ -1434,7 +1415,6 @@ async def test_user_address_with_data_collection( sentry_init( integrations=[AioHttpIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", **init_kwargs, ) @@ -1468,7 +1448,6 @@ async def test_sensitive_header_scrubbing(sentry_init, aiohttp_client, capture_i sentry_init( integrations=[AioHttpIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) async def hello(request): @@ -1628,7 +1607,6 @@ async def test_sensitive_header_passthrough_with_pii( integrations=[AioHttpIntegration()], traces_sample_rate=1.0, send_default_pii=options["send_default_pii"], - trace_lifecycle="stream", _experiments={ "data_collection": options["data_collection"], }, @@ -1682,7 +1660,6 @@ async def test_sensitive_header_passthrough_with_pii_without_data_collection( integrations=[AioHttpIntegration()], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) async def hello(request): @@ -1720,7 +1697,6 @@ async def test_url_query_attribute( integrations=[AioHttpIntegration()], traces_sample_rate=1.0, send_default_pii=send_pii, - trace_lifecycle="stream", ) async def hello(request): @@ -1777,7 +1753,6 @@ async def test_transaction_style( sentry_init( integrations=[AioHttpIntegration(transaction_style=transaction_style)], traces_sample_rate=1.0, - trace_lifecycle="stream", ) async def hello(request): @@ -1819,7 +1794,6 @@ async def test_http_route( sentry_init( integrations=[AioHttpIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) async def hello(request): @@ -1843,7 +1817,6 @@ async def test_server_error(sentry_init, aiohttp_client, capture_items): sentry_init( integrations=[AioHttpIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) async def hello(request): @@ -1882,7 +1855,6 @@ async def test_http_exception(sentry_init, aiohttp_client, capture_items): sentry_init( integrations=[AioHttpIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) async def hello(request): @@ -1914,7 +1886,6 @@ async def test_http_exception_ok_status_not_overridden( sentry_init( integrations=[AioHttpIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) async def hello(request): @@ -1948,7 +1919,6 @@ async def test_outgoing_client_span( integrations=[AioHttpIntegration()], traces_sample_rate=1.0, send_default_pii=send_pii, - trace_lifecycle="stream", ) async def handler(request): @@ -2007,7 +1977,6 @@ async def test_outgoing_trace_headers( sentry_init( integrations=[AioHttpIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) async def handler(request): @@ -2041,7 +2010,6 @@ async def test_user_ip_address_on_all_spans( integrations=[AioHttpIntegration()], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) async def hello(request): @@ -2153,7 +2121,6 @@ async def test_server_url_query_data_collection( sentry_init( integrations=[AioHttpIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", **init_kwargs, ) @@ -2195,7 +2162,6 @@ async def test_client_url_query_data_collection( sentry_init( integrations=[AioHttpIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", **init_kwargs, ) diff --git a/tests/integrations/aiomysql/test_aiomysql.py b/tests/integrations/aiomysql/test_aiomysql.py index 3e8bd6be40..2e04ba908f 100644 --- a/tests/integrations/aiomysql/test_aiomysql.py +++ b/tests/integrations/aiomysql/test_aiomysql.py @@ -695,7 +695,6 @@ async def test_query_source_disabled(sentry_init, capture_items): traces_sample_rate=1.0, enable_db_query_source=False, db_query_source_threshold_ms=0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -739,7 +738,6 @@ async def test_query_source_enabled(sentry_init, capture_items, enable_db_query_ "integrations": [AioMySQLIntegration()], "traces_sample_rate": 1.0, "db_query_source_threshold_ms": 0, - "trace_lifecycle": "stream", } if enable_db_query_source is not None: sentry_options["enable_db_query_source"] = enable_db_query_source @@ -787,7 +785,6 @@ async def test_query_source(sentry_init, capture_items): traces_sample_rate=1.0, enable_db_query_source=True, db_query_source_threshold_ms=0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -843,7 +840,6 @@ async def test_no_query_source_if_duration_too_short(sentry_init, capture_items) traces_sample_rate=1.0, enable_db_query_source=True, db_query_source_threshold_ms=100, - trace_lifecycle="stream", ) items = capture_items("span") @@ -898,7 +894,6 @@ async def test_query_source_if_duration_over_threshold(sentry_init, capture_item traces_sample_rate=1.0, enable_db_query_source=True, db_query_source_threshold_ms=100, - trace_lifecycle="stream", ) items = capture_items("span") @@ -964,7 +959,6 @@ async def test_span_origin(sentry_init, capture_items): sentry_init( integrations=[AioMySQLIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -998,7 +992,6 @@ async def test_multiline_query_description_normalized(sentry_init, capture_items sentry_init( integrations=[AioMySQLIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -1038,7 +1031,6 @@ async def test_db_data_on_spans(sentry_init, capture_items): sentry_init( integrations=[AioMySQLIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") diff --git a/tests/integrations/anthropic/test_anthropic.py b/tests/integrations/anthropic/test_anthropic.py index 70b332d309..f7f30f9783 100644 --- a/tests/integrations/anthropic/test_anthropic.py +++ b/tests/integrations/anthropic/test_anthropic.py @@ -155,7 +155,6 @@ def test_nonstreaming_create_message( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) client = Anthropic(api_key="z") @@ -271,7 +270,6 @@ def test_nonstreaming_create_message_data_collection( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) if data_collection is not None: sentry_init_kwargs["_experiments"] = {"data_collection": data_collection} @@ -342,7 +340,6 @@ def test_nonstreaming_create_message_data_collection_tools( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=False, - trace_lifecycle="stream", ) if data_collection is not None: sentry_init_kwargs["_experiments"] = {"data_collection": data_collection} @@ -419,7 +416,6 @@ async def test_nonstreaming_create_message_data_collection_async( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) if data_collection is not None: sentry_init_kwargs["_experiments"] = {"data_collection": data_collection} @@ -519,7 +515,6 @@ def test_nonstreaming_create_message_data_collection_outputs( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) if data_collection is not None: sentry_init_kwargs["_experiments"] = {"data_collection": data_collection} @@ -629,7 +624,6 @@ async def test_nonstreaming_create_message_data_collection_outputs_async( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) if data_collection is not None: sentry_init_kwargs["_experiments"] = {"data_collection": data_collection} @@ -695,7 +689,6 @@ async def test_nonstreaming_create_message_async( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) client = AsyncAnthropic(api_key="z") @@ -822,7 +815,6 @@ def test_streaming_create_message( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) messages = [ @@ -934,7 +926,6 @@ def test_streaming_create_message_data_collection( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) if data_collection is not None: sentry_init_kwargs["_experiments"] = {"data_collection": data_collection} @@ -1060,7 +1051,6 @@ def test_streaming_create_message_data_collection_outputs( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) if data_collection is not None: sentry_init_kwargs["_experiments"] = {"data_collection": data_collection} @@ -1185,7 +1175,6 @@ def test_streaming_create_message_close( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) messages = [ @@ -1287,7 +1276,6 @@ def test_streaming_create_message_api_error( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) messages = [ @@ -1401,7 +1389,6 @@ def test_stream_messages( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) messages = [ @@ -1523,7 +1510,6 @@ def test_stream_messages_data_collection_outputs( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) if data_collection is not None: sentry_init_kwargs["_experiments"] = {"data_collection": data_collection} @@ -1646,7 +1632,6 @@ def test_stream_messages_close( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) messages = [ @@ -1752,7 +1737,6 @@ def test_stream_messages_api_error( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) messages = [ @@ -1871,7 +1855,6 @@ async def test_streaming_create_message_async( traces_sample_rate=1.0, default_integrations=False, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) messages = [ @@ -1995,7 +1978,6 @@ async def test_streaming_create_message_data_collection_outputs_async( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) if data_collection is not None: sentry_init_kwargs["_experiments"] = {"data_collection": data_collection} @@ -2126,7 +2108,6 @@ async def test_streaming_create_message_async_close( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) messages = [ @@ -2231,7 +2212,6 @@ async def test_streaming_create_message_async_api_error( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) messages = [ @@ -2349,7 +2329,6 @@ async def test_stream_message_async( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) messages = [ @@ -2473,7 +2452,6 @@ async def test_stream_messages_data_collection_outputs_async( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) if data_collection is not None: sentry_init_kwargs["_experiments"] = {"data_collection": data_collection} @@ -2602,7 +2580,6 @@ async def test_stream_messages_async_api_error( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) messages = [ @@ -2710,7 +2687,6 @@ async def test_stream_messages_async_close( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) messages = [ @@ -2865,7 +2841,6 @@ def test_streaming_create_message_with_input_json_delta( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) messages = [ @@ -3014,7 +2989,6 @@ def test_stream_messages_with_input_json_delta( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) messages = [ @@ -3170,7 +3144,6 @@ async def test_streaming_create_message_with_input_json_delta_async( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) messages = [ @@ -3327,7 +3300,6 @@ async def test_stream_message_with_input_json_delta_async( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) messages = [ @@ -3390,7 +3362,6 @@ def test_exception_message_create( integrations=[AnthropicIntegration()], disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) client = Anthropic(api_key="z") @@ -3418,7 +3389,6 @@ def test_span_status_error( integrations=[AnthropicIntegration()], disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("event", "span") @@ -3452,7 +3422,6 @@ async def test_span_status_error_async( integrations=[AnthropicIntegration()], disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("event", "span") @@ -3486,7 +3455,6 @@ async def test_exception_message_create_async( integrations=[AnthropicIntegration()], disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) client = AsyncAnthropic(api_key="z") @@ -3514,7 +3482,6 @@ def test_span_origin( integrations=[AnthropicIntegration()], disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) client = Anthropic(api_key="z") @@ -3546,7 +3513,6 @@ async def test_span_origin_async( integrations=[AnthropicIntegration()], disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) client = AsyncAnthropic(api_key="z") @@ -3608,7 +3574,6 @@ def test_set_output_data_with_input_json_delta(sentry_init): disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) span = sentry_sdk.traces.start_span(name="test") @@ -3662,7 +3627,6 @@ def test_anthropic_message_role_mapping( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) client = Anthropic(api_key="z") @@ -3722,7 +3686,6 @@ def test_nonstreaming_create_message_with_system_prompt( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) client = Anthropic(api_key="z") @@ -3812,7 +3775,6 @@ async def test_nonstreaming_create_message_with_system_prompt_async( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) client = AsyncAnthropic(api_key="z") @@ -3942,7 +3904,6 @@ def test_streaming_create_message_with_system_prompt( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) messages = [ @@ -4072,7 +4033,6 @@ def test_stream_messages_with_system_prompt( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) messages = [ @@ -4201,7 +4161,6 @@ async def test_stream_message_with_system_prompt_async( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) messages = [ @@ -4332,7 +4291,6 @@ async def test_streaming_create_message_with_system_prompt_async( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) messages = [ @@ -4411,7 +4369,6 @@ def test_system_prompt_with_complex_structure( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) client = Anthropic(api_key="z") @@ -4637,7 +4594,6 @@ def test_message_with_url_image( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) client = Anthropic(api_key="z") @@ -4687,7 +4643,6 @@ def test_message_with_file_image( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) client = Anthropic(api_key="z") @@ -4738,7 +4693,6 @@ def test_message_with_url_pdf( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) client = Anthropic(api_key="z") @@ -4788,7 +4742,6 @@ def test_message_with_file_document( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) client = Anthropic(api_key="z") @@ -4839,7 +4792,6 @@ def test_binary_content_not_stored_when_pii_disabled( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=False, - trace_lifecycle="stream", ) client = Anthropic(api_key="z") @@ -4883,7 +4835,6 @@ def test_binary_content_not_stored_when_prompts_disabled( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) client = Anthropic(api_key="z") @@ -4926,7 +4877,6 @@ def test_cache_tokens_nonstreaming( integrations=[AnthropicIntegration()], disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) client = Anthropic(api_key="z") @@ -4983,7 +4933,6 @@ def test_input_tokens_include_cache_write_nonstreaming( integrations=[AnthropicIntegration()], disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) client = Anthropic(api_key="z") @@ -5040,7 +4989,6 @@ def test_input_tokens_include_cache_read_nonstreaming( integrations=[AnthropicIntegration()], disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) client = Anthropic(api_key="z") @@ -5123,7 +5071,6 @@ def test_input_tokens_include_cache_read_streaming( integrations=[AnthropicIntegration()], disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -5194,7 +5141,6 @@ def test_stream_messages_input_tokens_include_cache_read_streaming( integrations=[AnthropicIntegration()], disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -5234,7 +5180,6 @@ def test_input_tokens_unchanged_without_caching( integrations=[AnthropicIntegration()], disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) client = Anthropic(api_key="z") @@ -5308,7 +5253,6 @@ def test_cache_tokens_streaming( integrations=[AnthropicIntegration()], disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -5376,7 +5320,6 @@ def test_stream_messages_cache_tokens( integrations=[AnthropicIntegration()], disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") diff --git a/tests/integrations/arq/test_arq.py b/tests/integrations/arq/test_arq.py index 1c1ea43a5c..fb219d330d 100644 --- a/tests/integrations/arq/test_arq.py +++ b/tests/integrations/arq/test_arq.py @@ -64,7 +64,6 @@ def inner( "integrations": [ArqIntegration()], "traces_sample_rate": 1.0, "send_default_pii": True, - "trace_lifecycle": "stream", } sentry_init_kwargs.update(init_kwargs or {}) sentry_init(**sentry_init_kwargs) @@ -113,7 +112,6 @@ def inner( "integrations": [ArqIntegration()], "traces_sample_rate": 1.0, "send_default_pii": True, - "trace_lifecycle": "stream", } sentry_init_kwargs.update(init_kwargs or {}) sentry_init(**sentry_init_kwargs) @@ -165,7 +163,6 @@ def inner( "integrations": [ArqIntegration()], "traces_sample_rate": 1.0, "send_default_pii": True, - "trace_lifecycle": "stream", } sentry_init_kwargs.update(init_kwargs or {}) sentry_init(**sentry_init_kwargs) diff --git a/tests/integrations/asgi/test_asgi.py b/tests/integrations/asgi/test_asgi.py index e7e68a31bd..bef2cf8823 100644 --- a/tests/integrations/asgi/test_asgi.py +++ b/tests/integrations/asgi/test_asgi.py @@ -180,7 +180,6 @@ async def test_capture_transaction( sentry_init( send_default_pii=should_send_pii, traces_sample_rate=1.0, - trace_lifecycle="stream", ) app = SentryAsgiMiddleware(asgi3_app) @@ -222,7 +221,6 @@ async def test_capture_transaction_with_error( sentry_init( send_default_pii=True, traces_sample_rate=1.0, - trace_lifecycle="stream", ) app = SentryAsgiMiddleware(asgi3_app_with_error) @@ -266,7 +264,6 @@ async def test_has_trace_if_performance_enabled( ): sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", ) app = SentryAsgiMiddleware(asgi3_app_with_error_and_msg) @@ -331,7 +328,6 @@ async def test_trace_from_headers_if_performance_enabled( ): sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", ) app = SentryAsgiMiddleware(asgi3_app_with_error_and_msg) @@ -404,7 +400,6 @@ async def test_websocket( sentry_init( send_default_pii=True, traces_sample_rate=1.0, - trace_lifecycle="stream", ) asgi3_ws_app = SentryAsgiMiddleware(asgi3_ws_app) @@ -446,7 +441,6 @@ async def test_auto_session_tracking_with_aggregates( sentry_init( send_default_pii=True, traces_sample_rate=1.0, - trace_lifecycle="stream", ) app = SentryAsgiMiddleware(asgi3_app) @@ -514,7 +508,6 @@ async def test_transaction_style( sentry_init( send_default_pii=True, traces_sample_rate=1.0, - trace_lifecycle="stream", ) app = SentryAsgiMiddleware(asgi3_app, transaction_style=transaction_style) @@ -691,7 +684,6 @@ async def test_get_request_attributes_url_with_filtered_host( sentry_init( send_default_pii=True, traces_sample_rate=1.0, - trace_lifecycle="stream", _experiments={ "data_collection": { "http_headers": {"request": {"mode": "allowlist", "terms": []}} @@ -723,7 +715,6 @@ async def test_get_request_attributes_url_with_headers_off( sentry_init( send_default_pii=True, traces_sample_rate=1.0, - trace_lifecycle="stream", _experiments={ "data_collection": {"http_headers": {"request": {"mode": "off"}}}, }, @@ -839,7 +830,6 @@ async def test_get_request_attributes_query_data_collection( ): sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", **init_kwargs, ) app = SentryAsgiMiddleware(asgi3_app) @@ -916,7 +906,6 @@ async def test_get_request_attributes_client_address_user_info( ): sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", **init_kwargs, ) app = SentryAsgiMiddleware(asgi3_app) @@ -972,7 +961,6 @@ async def test_transaction_name( """ sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -1036,7 +1024,6 @@ def dummy_traces_sampler(sampling_context): sentry_init( traces_sampler=dummy_traces_sampler, traces_sample_rate=1.0, - trace_lifecycle="stream", ) app = SentryAsgiMiddleware(asgi3_app, transaction_style=transaction_style) @@ -1053,7 +1040,6 @@ async def test_custom_transaction_name( ): sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", ) app = SentryAsgiMiddleware(asgi3_custom_transaction_app) @@ -1132,7 +1118,6 @@ async def app(scope, receive, send): kwargs = dict(init_kwargs) sentry_init( - trace_lifecycle="stream", traces_sample_rate=1.0, **kwargs, ) diff --git a/tests/integrations/asyncio/test_asyncio.py b/tests/integrations/asyncio/test_asyncio.py index ca718b2ba7..8bd298c749 100644 --- a/tests/integrations/asyncio/test_asyncio.py +++ b/tests/integrations/asyncio/test_asyncio.py @@ -73,7 +73,6 @@ async def test_create_task( integrations=[ AsyncioIntegration(), ], - trace_lifecycle="stream", ) items = capture_items("span") @@ -125,7 +124,6 @@ async def test_gather( integrations=[ AsyncioIntegration(), ], - trace_lifecycle="stream", ) items = capture_items("span") @@ -166,7 +164,6 @@ async def test_exception( integrations=[ AsyncioIntegration(), ], - trace_lifecycle="stream", ) events = capture_events() @@ -385,7 +382,6 @@ async def test_span_origin( sentry_init( integrations=[AsyncioIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -421,7 +417,6 @@ async def test_task_spans_false( integrations=[ AsyncioIntegration(task_spans=False), ], - trace_lifecycle="stream", ) items = capture_items("span") @@ -452,7 +447,7 @@ async def test_enable_asyncio_integration_with_task_spans_false( """ uninstall_integration("asyncio") - sentry_init(traces_sample_rate=1.0, trace_lifecycle="stream") + sentry_init(traces_sample_rate=1.0) assert "asyncio" not in sentry_sdk.get_client().integrations @@ -483,7 +478,6 @@ async def test_delayed_enable_integration( ): sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", ) assert "asyncio" not in sentry_sdk.get_client().integrations @@ -522,7 +516,7 @@ async def test_delayed_enable_integration( @minimum_python_38 @pytest.mark.asyncio async def test_delayed_enable_integration_with_options(sentry_init, capture_events): - sentry_init(traces_sample_rate=1.0, trace_lifecycle="stream") + sentry_init(traces_sample_rate=1.0) assert "asyncio" not in sentry_sdk.get_client().integrations @@ -549,9 +543,7 @@ async def test_delayed_enable_enabled_integration(sentry_init, uninstall_integra uninstall_integration("asyncio") integration = AsyncioIntegration() - sentry_init( - integrations=[integration], traces_sample_rate=1.0, trace_lifecycle="stream" - ) + sentry_init(integrations=[integration], traces_sample_rate=1.0) assert "asyncio" in sentry_sdk.get_client().integrations @@ -578,7 +570,6 @@ async def test_delayed_enable_integration_after_disabling( sentry_init( disabled_integrations=[AsyncioIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) assert "asyncio" not in sentry_sdk.get_client().integrations @@ -625,7 +616,6 @@ async def test_internal_tasks_not_wrapped( sentry_init( integrations=[AsyncioIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) async def user_task(): diff --git a/tests/integrations/asyncpg/test_asyncpg.py b/tests/integrations/asyncpg/test_asyncpg.py index 23b3058dcf..ca23a7f4bc 100644 --- a/tests/integrations/asyncpg/test_asyncpg.py +++ b/tests/integrations/asyncpg/test_asyncpg.py @@ -102,7 +102,6 @@ async def test_connect( ) -> None: sentry_init( integrations=[AsyncPGIntegration()], - trace_lifecycle="stream", _experiments={ "record_sql_params": True, }, @@ -132,7 +131,6 @@ async def test_execute( ) -> None: sentry_init( integrations=[AsyncPGIntegration()], - trace_lifecycle="stream", _experiments={ "record_sql_params": True, }, @@ -205,7 +203,6 @@ async def test_execute_many( ) -> None: sentry_init( integrations=[AsyncPGIntegration()], - trace_lifecycle="stream", _experiments={ "record_sql_params": True, }, @@ -248,7 +245,6 @@ async def test_record_params(sentry_init, capture_events) -> None: sentry_init( integrations=[AsyncPGIntegration(record_params=True)], _experiments={"record_sql_params": True}, - trace_lifecycle="stream", ) events = capture_events() @@ -289,7 +285,6 @@ async def test_cursor(sentry_init, capture_events) -> None: sentry_init( integrations=[AsyncPGIntegration()], _experiments={"record_sql_params": True}, - trace_lifecycle="stream", ) events = capture_events() @@ -344,7 +339,6 @@ async def test_cursor_manual(sentry_init, capture_events) -> None: sentry_init( integrations=[AsyncPGIntegration()], _experiments={"record_sql_params": True}, - trace_lifecycle="stream", ) events = capture_events() @@ -407,7 +401,6 @@ async def test_prepared_stmt(sentry_init, capture_events) -> None: sentry_init( integrations=[AsyncPGIntegration()], _experiments={"record_sql_params": True}, - trace_lifecycle="stream", ) events = capture_events() @@ -457,7 +450,6 @@ async def test_connection_pool(sentry_init, capture_events) -> None: sentry_init( integrations=[AsyncPGIntegration()], _experiments={"record_sql_params": True}, - trace_lifecycle="stream", ) events = capture_events() @@ -528,7 +520,6 @@ async def test_query_source_disabled( traces_sample_rate=1.0, enable_db_query_source=False, db_query_source_threshold_ms=0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -573,7 +564,6 @@ async def test_query_source_enabled( "integrations": [AsyncPGIntegration()], "traces_sample_rate": 1.0, "db_query_source_threshold_ms": 0, - "trace_lifecycle": "stream", } if enable_db_query_source is not None: sentry_options["enable_db_query_source"] = enable_db_query_source @@ -614,7 +604,6 @@ async def test_query_source(sentry_init, capture_items): traces_sample_rate=1.0, enable_db_query_source=True, db_query_source_threshold_ms=0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -651,7 +640,6 @@ async def test_query_source_with_module_in_search_path( traces_sample_rate=1.0, enable_db_query_source=True, db_query_source_threshold_ms=0, - trace_lifecycle="stream", ) from asyncpg_helpers.helpers import execute_query_in_connection @@ -707,7 +695,6 @@ async def test_no_query_source_if_duration_too_short( traces_sample_rate=1.0, enable_db_query_source=True, db_query_source_threshold_ms=100000, - trace_lifecycle="stream", ) items = capture_items("span") @@ -747,7 +734,6 @@ async def test_query_source_if_duration_over_threshold(sentry_init, capture_item sentry_init( integrations=[AsyncPGIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", enable_db_query_source=True, db_query_source_threshold_ms=100, ) @@ -797,7 +783,6 @@ async def test_span_origin(sentry_init, capture_items): sentry_init( integrations=[AsyncPGIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -837,7 +822,6 @@ async def test_multiline_query_description_normalized( sentry_init( integrations=[AsyncPGIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -899,7 +883,6 @@ async def test_query_source_execute( traces_sample_rate=1.0, enable_db_query_source=True, db_query_source_threshold_ms=0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -939,7 +922,6 @@ async def test_query_source_executemany( traces_sample_rate=1.0, enable_db_query_source=True, db_query_source_threshold_ms=0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -976,7 +958,6 @@ async def test_query_source_prepare( traces_sample_rate=1.0, enable_db_query_source=True, db_query_source_threshold_ms=0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -1024,7 +1005,6 @@ async def test_cursor_iteration_creates_db_cursor_iter_spans( sentry_init( integrations=[AsyncPGIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -1067,7 +1047,6 @@ async def test_cursor_fetch_methods_create_spans( traces_sample_rate=1.0, enable_db_query_source=True, db_query_source_threshold_ms=0, - trace_lifecycle="stream", ) items = capture_items() diff --git a/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkDataCollectionAllowlist/index.py b/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkDataCollectionAllowlist/index.py index d3ee76d93f..a79e1a03a7 100644 --- a/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkDataCollectionAllowlist/index.py +++ b/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkDataCollectionAllowlist/index.py @@ -7,7 +7,6 @@ dsn=os.environ.get("SENTRY_DSN"), traces_sample_rate=1.0, integrations=[AwsLambdaIntegration()], - trace_lifecycle="stream", _experiments={ "data_collection": { "http_headers": { diff --git a/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkDataCollectionDenylist/index.py b/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkDataCollectionDenylist/index.py index c8020cffe9..4c59de9cb4 100644 --- a/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkDataCollectionDenylist/index.py +++ b/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkDataCollectionDenylist/index.py @@ -7,7 +7,6 @@ dsn=os.environ.get("SENTRY_DSN"), traces_sample_rate=1.0, integrations=[AwsLambdaIntegration()], - trace_lifecycle="stream", _experiments={ "data_collection": { "http_headers": { diff --git a/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkDataCollectionOff/index.py b/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkDataCollectionOff/index.py index 1dbdd4feed..6f3a7a8126 100644 --- a/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkDataCollectionOff/index.py +++ b/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkDataCollectionOff/index.py @@ -7,7 +7,6 @@ dsn=os.environ.get("SENTRY_DSN"), traces_sample_rate=1.0, integrations=[AwsLambdaIntegration()], - trace_lifecycle="stream", _experiments={ "data_collection": { "http_headers": { diff --git a/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkDataCollectionUrlQueryAllowlist/index.py b/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkDataCollectionUrlQueryAllowlist/index.py index 9efbc997fc..67ed8be6e3 100644 --- a/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkDataCollectionUrlQueryAllowlist/index.py +++ b/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkDataCollectionUrlQueryAllowlist/index.py @@ -7,7 +7,6 @@ dsn=os.environ.get("SENTRY_DSN"), traces_sample_rate=1.0, integrations=[AwsLambdaIntegration()], - trace_lifecycle="stream", _experiments={ "data_collection": { "url_query_params": { diff --git a/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkDataCollectionUrlQueryDenylist/index.py b/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkDataCollectionUrlQueryDenylist/index.py index 2b6a20afde..389d7890ea 100644 --- a/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkDataCollectionUrlQueryDenylist/index.py +++ b/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkDataCollectionUrlQueryDenylist/index.py @@ -7,7 +7,6 @@ dsn=os.environ.get("SENTRY_DSN"), traces_sample_rate=1.0, integrations=[AwsLambdaIntegration()], - trace_lifecycle="stream", _experiments={ "data_collection": { "url_query_params": { diff --git a/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkDataCollectionUrlQueryOff/index.py b/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkDataCollectionUrlQueryOff/index.py index 3cfb298345..02446562d9 100644 --- a/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkDataCollectionUrlQueryOff/index.py +++ b/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkDataCollectionUrlQueryOff/index.py @@ -7,7 +7,6 @@ dsn=os.environ.get("SENTRY_DSN"), traces_sample_rate=1.0, integrations=[AwsLambdaIntegration()], - trace_lifecycle="stream", _experiments={ "data_collection": { "url_query_params": {"mode": "off"}, diff --git a/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkDataCollectionUserInfoOff/index.py b/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkDataCollectionUserInfoOff/index.py index 941a5578a7..18c5450196 100644 --- a/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkDataCollectionUserInfoOff/index.py +++ b/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkDataCollectionUserInfoOff/index.py @@ -7,7 +7,6 @@ dsn=os.environ.get("SENTRY_DSN"), traces_sample_rate=1.0, integrations=[AwsLambdaIntegration()], - trace_lifecycle="stream", _experiments={ "data_collection": { "user_info": False, diff --git a/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkDataCollectionUserInfoOn/index.py b/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkDataCollectionUserInfoOn/index.py index d5e9590979..07527dad4a 100644 --- a/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkDataCollectionUserInfoOn/index.py +++ b/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkDataCollectionUserInfoOn/index.py @@ -7,7 +7,6 @@ dsn=os.environ.get("SENTRY_DSN"), traces_sample_rate=1.0, integrations=[AwsLambdaIntegration()], - trace_lifecycle="stream", _experiments={ "data_collection": { "user_info": True, diff --git a/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkSendDefaultPii/index.py b/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkSendDefaultPii/index.py index ae997c8dfb..502a6ae3ee 100644 --- a/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkSendDefaultPii/index.py +++ b/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkSendDefaultPii/index.py @@ -8,7 +8,6 @@ traces_sample_rate=1.0, send_default_pii=True, integrations=[AwsLambdaIntegration()], - trace_lifecycle="stream", ) diff --git a/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkSpanStreaming/index.py b/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkSpanStreaming/index.py index 29fdb83aec..4f82a4eb2b 100644 --- a/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkSpanStreaming/index.py +++ b/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkSpanStreaming/index.py @@ -7,7 +7,6 @@ dsn=os.environ.get("SENTRY_DSN"), traces_sample_rate=1.0, integrations=[AwsLambdaIntegration()], - trace_lifecycle="stream", ) diff --git a/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkSpanStreamingDataCollection/index.py b/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkSpanStreamingDataCollection/index.py index b1ee2ec8a6..adf22d63c6 100644 --- a/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkSpanStreamingDataCollection/index.py +++ b/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkSpanStreamingDataCollection/index.py @@ -7,7 +7,6 @@ dsn=os.environ.get("SENTRY_DSN"), traces_sample_rate=1.0, integrations=[AwsLambdaIntegration()], - trace_lifecycle="stream", _experiments={ "data_collection": { "url_query_params": { diff --git a/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkSpanStreamingDataCollectionUserInfoOff/index.py b/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkSpanStreamingDataCollectionUserInfoOff/index.py index 941a5578a7..18c5450196 100644 --- a/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkSpanStreamingDataCollectionUserInfoOff/index.py +++ b/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkSpanStreamingDataCollectionUserInfoOff/index.py @@ -7,7 +7,6 @@ dsn=os.environ.get("SENTRY_DSN"), traces_sample_rate=1.0, integrations=[AwsLambdaIntegration()], - trace_lifecycle="stream", _experiments={ "data_collection": { "user_info": False, diff --git a/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkSpanStreamingDataCollectionUserInfoOn/index.py b/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkSpanStreamingDataCollectionUserInfoOn/index.py index d5e9590979..07527dad4a 100644 --- a/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkSpanStreamingDataCollectionUserInfoOn/index.py +++ b/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkSpanStreamingDataCollectionUserInfoOn/index.py @@ -7,7 +7,6 @@ dsn=os.environ.get("SENTRY_DSN"), traces_sample_rate=1.0, integrations=[AwsLambdaIntegration()], - trace_lifecycle="stream", _experiments={ "data_collection": { "user_info": True, diff --git a/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkSpanStreamingPii/index.py b/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkSpanStreamingPii/index.py index ae997c8dfb..502a6ae3ee 100644 --- a/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkSpanStreamingPii/index.py +++ b/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkSpanStreamingPii/index.py @@ -8,7 +8,6 @@ traces_sample_rate=1.0, send_default_pii=True, integrations=[AwsLambdaIntegration()], - trace_lifecycle="stream", ) diff --git a/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/RaiseErrorPerformanceDisabled/index.py b/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/RaiseErrorPerformanceDisabled/index.py index ae714a43df..7669fb8aaf 100644 --- a/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/RaiseErrorPerformanceDisabled/index.py +++ b/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/RaiseErrorPerformanceDisabled/index.py @@ -7,7 +7,6 @@ dsn=os.environ.get("SENTRY_DSN"), traces_sample_rate=None, # this is the default, just added for clarity integrations=[AwsLambdaIntegration()], - trace_lifecycle="stream", ) diff --git a/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/RaiseErrorPerformanceEnabled/index.py b/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/RaiseErrorPerformanceEnabled/index.py index 589265cbbe..9503f04966 100644 --- a/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/RaiseErrorPerformanceEnabled/index.py +++ b/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/RaiseErrorPerformanceEnabled/index.py @@ -7,7 +7,6 @@ dsn=os.environ.get("SENTRY_DSN"), traces_sample_rate=1.0, integrations=[AwsLambdaIntegration()], - trace_lifecycle="stream", ) diff --git a/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/RaiseErrorSpanStreaming/index.py b/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/RaiseErrorSpanStreaming/index.py index 589265cbbe..9503f04966 100644 --- a/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/RaiseErrorSpanStreaming/index.py +++ b/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/RaiseErrorSpanStreaming/index.py @@ -7,7 +7,6 @@ dsn=os.environ.get("SENTRY_DSN"), traces_sample_rate=1.0, integrations=[AwsLambdaIntegration()], - trace_lifecycle="stream", ) diff --git a/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/TimeoutErrorScopeModified/index.py b/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/TimeoutErrorScopeModified/index.py index e562221944..109245b90d 100644 --- a/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/TimeoutErrorScopeModified/index.py +++ b/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/TimeoutErrorScopeModified/index.py @@ -8,7 +8,6 @@ dsn=os.environ.get("SENTRY_DSN"), traces_sample_rate=1.0, integrations=[AwsLambdaIntegration(timeout_warning=True)], - trace_lifecycle="stream", ) diff --git a/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/TracesSampler/index.py b/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/TracesSampler/index.py index 9ed8e39c62..3e4d9b3c36 100644 --- a/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/TracesSampler/index.py +++ b/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/TracesSampler/index.py @@ -33,7 +33,6 @@ def trace_sampler(sampling_context): traces_sample_rate=1.0, traces_sampler=trace_sampler, integrations=[AwsLambdaIntegration()], - trace_lifecycle="stream", ) diff --git a/tests/integrations/boto3/test_aws_http_connection.py b/tests/integrations/boto3/test_aws_http_connection.py index cce6b53aaf..d66bf33660 100644 --- a/tests/integrations/boto3/test_aws_http_connection.py +++ b/tests/integrations/boto3/test_aws_http_connection.py @@ -52,7 +52,6 @@ def test_aws_http_connection_adds_missing_unsigned_propagation_headers( """Add missing unsigned `sentry-trace` and `baggage`.""" sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", default_integrations=False, integrations=[StdlibIntegration()], ) @@ -80,7 +79,6 @@ def test_aws_http_connection_appends_baggage_but_preserves_sentry_trace( """Append unsigned `baggage`; leave existing `sentry-trace` as-is.""" sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", default_integrations=False, integrations=[StdlibIntegration()], ) @@ -114,7 +112,6 @@ def test_aws_http_connection_preserves_signed_propagation_headers( """Leave signed `sentry-trace` and `baggage` as-is.""" sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", default_integrations=False, integrations=[StdlibIntegration()], ) @@ -159,7 +156,6 @@ def test_aws_http_connection_preserves_query_signed_baggage( """Leave query-signed `baggage` as-is; add unsigned `sentry-trace`.""" sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", default_integrations=False, integrations=[StdlibIntegration()], ) diff --git a/tests/integrations/boto3/test_s3.py b/tests/integrations/boto3/test_s3.py index 8d6c4b7777..e414e5a481 100644 --- a/tests/integrations/boto3/test_s3.py +++ b/tests/integrations/boto3/test_s3.py @@ -27,7 +27,6 @@ def test_basic( # disabled because session.resource() or s3.Bucket() result in a subprocess span for a # shell that runs "uname -p 2> /dev/null" on Python 3.7 with boto3 version 1.12.49. default_integrations=False, - trace_lifecycle="stream", ) s3 = session.resource("s3") @@ -62,7 +61,6 @@ def test_streaming( traces_sample_rate=1.0, integrations=[Boto3Integration()], send_default_pii=send_default_pii, - trace_lifecycle="stream", ) s3 = session.resource("s3") @@ -126,7 +124,6 @@ def test_streaming_close( sentry_init( traces_sample_rate=1.0, integrations=[Boto3Integration()], - trace_lifecycle="stream", ) s3 = session.resource("s3") @@ -161,7 +158,6 @@ def test_omit_url_data_if_parsing_fails( traces_sample_rate=1.0, integrations=[Boto3Integration()], send_default_pii=True, - trace_lifecycle="stream", ) s3 = session.resource("s3") @@ -214,7 +210,6 @@ def test_span_origin( sentry_init( traces_sample_rate=1.0, integrations=[Boto3Integration()], - trace_lifecycle="stream", ) s3 = session.resource("s3") @@ -238,7 +233,6 @@ def test_breadcrumb(sentry_init, capture_events, send_default_pii): sentry_init( integrations=[Boto3Integration()], default_integrations=False, - trace_lifecycle="stream", send_default_pii=send_default_pii, ) @@ -365,7 +359,6 @@ def test_url_query_data_collection( traces_sample_rate=1.0, integrations=[Boto3Integration()], default_integrations=False, - trace_lifecycle="stream", **init_kwargs, ) @@ -406,7 +399,6 @@ def test_url_query_data_collection_breadcrumb( sentry_init( integrations=[Boto3Integration()], default_integrations=False, - trace_lifecycle="stream", **init_kwargs, ) diff --git a/tests/integrations/boto3/test_trace_propagation.py b/tests/integrations/boto3/test_trace_propagation.py index 3f49e32dbd..7dc9ce4965 100644 --- a/tests/integrations/boto3/test_trace_propagation.py +++ b/tests/integrations/boto3/test_trace_propagation.py @@ -39,7 +39,6 @@ def test_botocore_merges_propagation_before_sigv4_signing( ): sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", default_integrations=False, integrations=[Boto3Integration(), StdlibIntegration()], ) @@ -125,7 +124,6 @@ def test_botocore_without_boto3_integration_preserves_signed_baggage( """Leave signed `baggage` as-is; add unsigned `sentry-trace`.""" sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", default_integrations=False, integrations=[StdlibIntegration()], ) @@ -176,7 +174,6 @@ def test_presigned_urls_do_not_require_sentry_headers(sentry_init): traces_sample_rate=1.0, default_integrations=False, integrations=[Boto3Integration(), StdlibIntegration()], - trace_lifecycle="stream", ) client = boto3.client( # type: ignore[attr-defined] "s3", diff --git a/tests/integrations/bottle/test_bottle.py b/tests/integrations/bottle/test_bottle.py index 8efc8f6c88..52b3545f00 100644 --- a/tests/integrations/bottle/test_bottle.py +++ b/tests/integrations/bottle/test_bottle.py @@ -410,7 +410,6 @@ def test_span_origin( sentry_init( integrations=[BottleIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -429,7 +428,6 @@ def test_basic(sentry_init, capture_items): sentry_init( integrations=[BottleIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -480,7 +478,6 @@ def test_transaction_style( sentry_init( integrations=[BottleIntegration(transaction_style=transaction_style)], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -521,7 +518,6 @@ def test_http_route( sentry_init( integrations=[BottleIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -546,7 +542,6 @@ def test_errors(sentry_init, capture_items, debug, catchall): sentry_init( integrations=[BottleIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) app = Bottle() @@ -610,7 +605,6 @@ def test_http_error_status( sentry_init( integrations=[BottleIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -658,7 +652,6 @@ def test_failed_request_status_codes( sentry_init( integrations=[BottleIntegration(**integration_kwargs)], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("event", "span") diff --git a/tests/integrations/celery/integration_tests/test_celery_beat_cron_monitoring.py b/tests/integrations/celery/integration_tests/test_celery_beat_cron_monitoring.py index 0f9f9fc18f..53d7bf2913 100644 --- a/tests/integrations/celery/integration_tests/test_celery_beat_cron_monitoring.py +++ b/tests/integrations/celery/integration_tests/test_celery_beat_cron_monitoring.py @@ -42,7 +42,6 @@ def inner(propagate_traces=True, monitor_beat_tasks=False, **kwargs): monitor_beat_tasks=monitor_beat_tasks, ) ], - trace_lifecycle="stream", **kwargs, ) app = Celery("tasks") diff --git a/tests/integrations/celery/test_celery.py b/tests/integrations/celery/test_celery.py index efc446f178..3ac3fe90e7 100644 --- a/tests/integrations/celery/test_celery.py +++ b/tests/integrations/celery/test_celery.py @@ -40,7 +40,6 @@ def inner( monitor_beat_tasks=monitor_beat_tasks, ) ], - trace_lifecycle="stream", **kwargs, ) celery = Celery(__name__) @@ -808,7 +807,6 @@ def publish(*args, **kwargs): sentry_init( integrations=[CeleryIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) celery = Celery(__name__, broker=f"{system}://example.com") # noqa: E231 @@ -879,7 +877,6 @@ def publish(*args, **kwargs): sentry_init( integrations=[CeleryIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) celery = Celery(__name__, broker="redis://example.com") # noqa: E231 @@ -914,7 +911,6 @@ def test_send_task_wrapped( sentry_init( integrations=[CeleryIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) celery = Celery(__name__, broker="redis://example.com") # noqa: E231 diff --git a/tests/integrations/celery/test_update_celery_task_headers.py b/tests/integrations/celery/test_update_celery_task_headers.py index d77b446caf..0b2dcc6937 100644 --- a/tests/integrations/celery/test_update_celery_task_headers.py +++ b/tests/integrations/celery/test_update_celery_task_headers.py @@ -70,7 +70,7 @@ def test_monitor_beat_tasks_with_headers(monitor_beat_tasks): def test_span_with_transaction(sentry_init): - sentry_init(traces_sample_rate=1.0, trace_lifecycle="stream") + sentry_init(traces_sample_rate=1.0) headers = {} monitor_beat_tasks = False @@ -90,7 +90,7 @@ def test_span_with_transaction(sentry_init): def test_span_with_transaction_custom_headers(sentry_init): - sentry_init(traces_sample_rate=1.0, trace_lifecycle="stream") + sentry_init(traces_sample_rate=1.0) headers = { "baggage": BAGGAGE_VALUE, "sentry-trace": SENTRY_TRACE_VALUE, @@ -169,7 +169,7 @@ def test_celery_trace_propagation_traces_sample_rate( The Celery integration has its own mechanism to propagate traces: https://docs.sentry.io/platforms/python/integrations/celery/#distributed-traces """ - sentry_init(traces_sample_rate=traces_sample_rate, trace_lifecycle="stream") + sentry_init(traces_sample_rate=traces_sample_rate) headers = {} span = None diff --git a/tests/integrations/chalice/test_chalice.py b/tests/integrations/chalice/test_chalice.py index 39b55913bd..c1664b302c 100644 --- a/tests/integrations/chalice/test_chalice.py +++ b/tests/integrations/chalice/test_chalice.py @@ -44,7 +44,6 @@ def app(sentry_init): sentry_init( integrations=[ChaliceIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) app = Chalice(app_name="sentry_chalice") diff --git a/tests/integrations/clickhouse_driver/test_clickhouse_driver.py b/tests/integrations/clickhouse_driver/test_clickhouse_driver.py index 6e301ab5fe..15a84e6580 100644 --- a/tests/integrations/clickhouse_driver/test_clickhouse_driver.py +++ b/tests/integrations/clickhouse_driver/test_clickhouse_driver.py @@ -23,7 +23,6 @@ def test_clickhouse_client_breadcrumbs(sentry_init, capture_events) -> None: sentry_init( integrations=[ClickhouseDriverIntegration()], - trace_lifecycle="stream", _experiments={"record_sql_params": True}, ) events = capture_events() @@ -128,7 +127,6 @@ def test_clickhouse_client_breadcrumbs_with_pii(sentry_init, capture_events) -> sentry_init( integrations=[ClickhouseDriverIntegration()], send_default_pii=True, - trace_lifecycle="stream", _experiments={"record_sql_params": True}, ) events = capture_events() @@ -231,7 +229,6 @@ def test_clickhouse_client_breadcrumbs_with_data_collection( ) -> None: sentry_init( integrations=[ClickhouseDriverIntegration()], - trace_lifecycle="stream", _experiments={"data_collection": {"database_query_data": True}}, ) events = capture_events() @@ -334,7 +331,6 @@ def test_clickhouse_client_breadcrumbs_with_data_collection_disabled( ) -> None: sentry_init( integrations=[ClickhouseDriverIntegration()], - trace_lifecycle="stream", _experiments={"data_collection": {"database_query_data": False}}, ) events = capture_events() @@ -435,7 +431,6 @@ def test_clickhouse_client_breadcrumbs_data_collection_overrides_pii( sentry_init( integrations=[ClickhouseDriverIntegration()], send_default_pii=True, - trace_lifecycle="stream", _experiments={"data_collection": {"database_query_data": False}}, ) events = capture_events() @@ -535,7 +530,6 @@ def test_clickhouse_client_breadcrumbs_with_data_collection_default( ) -> None: sentry_init( integrations=[ClickhouseDriverIntegration()], - trace_lifecycle="stream", _experiments={"data_collection": {}}, ) events = capture_events() @@ -639,7 +633,6 @@ def test_clickhouse_client_with_data_collection(sentry_init, capture_items) -> N sentry_init( integrations=[ClickhouseDriverIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", _experiments={ "data_collection": {"database_query_data": True}, }, @@ -675,7 +668,6 @@ def test_clickhouse_client_spans( ): sentry_init( integrations=[ClickhouseDriverIntegration()], - trace_lifecycle="stream", _experiments={ "record_sql_params": True, }, @@ -812,7 +804,6 @@ def test_clickhouse_client_spans_with_pii( ): sentry_init( integrations=[ClickhouseDriverIntegration()], - trace_lifecycle="stream", _experiments={ "record_sql_params": True, }, @@ -937,7 +928,6 @@ def test_clickhouse_client_spans_with_pii( def test_clickhouse_dbapi_breadcrumbs(sentry_init, capture_events) -> None: sentry_init( integrations=[ClickhouseDriverIntegration()], - trace_lifecycle="stream", ) events = capture_events() @@ -1037,7 +1027,6 @@ def test_clickhouse_dbapi_breadcrumbs_with_pii(sentry_init, capture_events) -> N sentry_init( integrations=[ClickhouseDriverIntegration()], send_default_pii=True, - trace_lifecycle="stream", ) events = capture_events() @@ -1143,7 +1132,6 @@ def test_clickhouse_dbapi_spans( ): sentry_init( integrations=[ClickhouseDriverIntegration()], - trace_lifecycle="stream", _experiments={ "record_sql_params": True, }, @@ -1277,7 +1265,6 @@ def test_clickhouse_dbapi_spans_with_pii( ): sentry_init( integrations=[ClickhouseDriverIntegration()], - trace_lifecycle="stream", _experiments={ "record_sql_params": True, }, @@ -1411,7 +1398,6 @@ def test_span_origin( sentry_init( integrations=[ClickhouseDriverIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") diff --git a/tests/integrations/cohere/test_cohere.py b/tests/integrations/cohere/test_cohere.py index e8eb94af0c..f2f96e859f 100644 --- a/tests/integrations/cohere/test_cohere.py +++ b/tests/integrations/cohere/test_cohere.py @@ -25,7 +25,6 @@ def test_nonstreaming_chat( integrations=[CohereIntegration(include_prompts=include_prompts)], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) client = Client(api_key="z") @@ -94,7 +93,6 @@ def test_streaming_chat( integrations=[CohereIntegration(include_prompts=include_prompts)], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) client = Client(api_key="z") @@ -167,7 +165,6 @@ def test_bad_chat(sentry_init, capture_items): sentry_init( integrations=[CohereIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("event", "span") @@ -191,7 +188,6 @@ def test_span_status_error(sentry_init, capture_items): sentry_init( integrations=[CohereIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -223,7 +219,6 @@ def test_embed( integrations=[CohereIntegration(include_prompts=include_prompts)], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) client = Client(api_key="z") @@ -267,7 +262,6 @@ def test_span_origin_chat(sentry_init, capture_items): sentry_init( integrations=[CohereIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -303,7 +297,6 @@ def test_span_origin_embed(sentry_init, capture_items): sentry_init( integrations=[CohereIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -404,7 +397,6 @@ def _init_with_data_collection( integrations=[CohereIntegration(include_prompts=include_prompts)], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) if data_collection is not None: kwargs["_experiments"] = {"data_collection": data_collection} diff --git a/tests/integrations/django/asgi/test_asgi.py b/tests/integrations/django/asgi/test_asgi.py index 5387c87840..f8f195022d 100644 --- a/tests/integrations/django/asgi/test_asgi.py +++ b/tests/integrations/django/asgi/test_asgi.py @@ -53,7 +53,6 @@ async def test_basic( sentry_init( integrations=[DjangoIntegration()], send_default_pii=True, - trace_lifecycle="stream", ) import channels # type: ignore[import-not-found] @@ -115,7 +114,6 @@ async def test_async_views( sentry_init( integrations=[DjangoIntegration()], send_default_pii=True, - trace_lifecycle="stream", ) comm = HttpCommunicator(application, "GET", "/async_message") @@ -151,7 +149,6 @@ async def test_http_route( sentry_init( integrations=[DjangoIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -263,7 +260,6 @@ async def test_async_middleware_spans( sentry_init( integrations=[DjangoIntegration(middleware_spans=True)], traces_sample_rate=1.0, - trace_lifecycle="stream", _experiments={ "record_sql_params": True, }, @@ -310,7 +306,6 @@ async def test_has_trace_if_performance_enabled( sentry_init( integrations=[DjangoIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) comm = HttpCommunicator(asgi_application, "GET", "/view-exc-with-msg") @@ -347,7 +342,6 @@ async def test_has_trace_if_performance_disabled( ): sentry_init( integrations=[DjangoIntegration()], - trace_lifecycle="stream", ) comm = HttpCommunicator(asgi_application, "GET", "/view-exc-with-msg") @@ -385,7 +379,6 @@ async def test_trace_from_headers_if_performance_enabled( sentry_init( integrations=[DjangoIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) trace_id = "582b43a4192642f0b136d5159a501701" @@ -429,7 +422,6 @@ async def test_trace_from_headers_if_performance_disabled( ): sentry_init( integrations=[DjangoIntegration()], - trace_lifecycle="stream", ) trace_id = "582b43a4192642f0b136d5159a501701" @@ -572,7 +564,6 @@ async def test_asgi_request_body_send_default_pii( sentry_init( integrations=[DjangoIntegration()], send_default_pii=send_default_pii, - trace_lifecycle="stream", ) comm = HttpCommunicator( @@ -806,7 +797,6 @@ async def test_async_view( sentry_init( integrations=[DjangoIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) comm = HttpCommunicator(application, "GET", "/simple_async_view") @@ -836,7 +826,6 @@ async def test_transaction_http_method_default( sentry_init( integrations=[DjangoIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -877,7 +866,6 @@ async def test_transaction_http_method_custom( ) ], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") diff --git a/tests/integrations/django/test_basic.py b/tests/integrations/django/test_basic.py index d736cbf804..3875707f18 100644 --- a/tests/integrations/django/test_basic.py +++ b/tests/integrations/django/test_basic.py @@ -57,7 +57,6 @@ def test_view_exceptions( sentry_init( integrations=[DjangoIntegration()], send_default_pii=True, - trace_lifecycle="stream", ) exceptions = capture_exceptions() items = capture_items("event") @@ -87,7 +86,6 @@ def test_ensures_x_forwarded_header_is_honored_in_sdk_when_enabled_in_django( sentry_init( integrations=[DjangoIntegration()], send_default_pii=True, - trace_lifecycle="stream", ) exceptions = capture_exceptions() items = capture_items("event") @@ -114,7 +112,6 @@ def test_ensures_x_forwarded_header_is_not_honored_when_unenabled_in_django( sentry_init( integrations=[DjangoIntegration()], send_default_pii=True, - trace_lifecycle="stream", ) exceptions = capture_exceptions() items = capture_items("event") @@ -144,7 +141,6 @@ def test_request_captured( sentry_init( integrations=[DjangoIntegration()], send_default_pii=True, - trace_lifecycle="stream", ) items = capture_items("event") content, status, headers = unpack_werkzeug_response(client.get(reverse("message"))) @@ -172,7 +168,6 @@ def test_transaction_with_class_view( sentry_init( integrations=[DjangoIntegration(transaction_style="function_name")], send_default_pii=True, - trace_lifecycle="stream", ) items = capture_items("event") content, status, headers = unpack_werkzeug_response( @@ -199,7 +194,6 @@ def test_has_trace_if_performance_enabled( ) ], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("event", "span") client.head(reverse("view_exc_with_msg")) @@ -234,7 +228,6 @@ def test_has_trace_if_performance_disabled( ): sentry_init( integrations=[DjangoIntegration()], - trace_lifecycle="stream", ) items = capture_items("event") client.head(reverse("view_exc_with_msg")) @@ -268,7 +261,6 @@ def test_trace_from_headers_if_performance_enabled( ) ], traces_sample_rate=1.0, - trace_lifecycle="stream", ) trace_id = "582b43a4192642f0b136d5159a501701" @@ -311,7 +303,6 @@ def test_trace_from_headers_if_performance_disabled( http_methods_to_capture=("HEAD",), ) ], - trace_lifecycle="stream", ) trace_id = "582b43a4192642f0b136d5159a501701" @@ -347,7 +338,6 @@ def test_user_captured( sentry_init( integrations=[DjangoIntegration()], send_default_pii=True, - trace_lifecycle="stream", ) items = capture_items("event") content, status, headers = unpack_werkzeug_response(client.get(reverse("mylogin"))) @@ -379,7 +369,6 @@ def test_materialized_user_captured( integrations=[DjangoIntegration()], send_default_pii=True, traces_sample_rate=1.0, - trace_lifecycle="stream", ) content, status, headers = unpack_werkzeug_response(client.get(reverse("mylogin"))) @@ -408,7 +397,6 @@ def test_queryset_repr( ): sentry_init( integrations=[DjangoIntegration()], - trace_lifecycle="stream", ) User.objects.create_user("john", "lennon@thebeatles.com", "johnpassword") @@ -438,7 +426,6 @@ def test_context_nested_queryset_repr( ): sentry_init( integrations=[DjangoIntegration()], - trace_lifecycle="stream", ) User.objects.create_user("john", "lennon@thebeatles.com", "johnpassword") items = capture_items("event") @@ -464,7 +451,6 @@ def test_custom_error_handler_request_context( ): sentry_init( integrations=[DjangoIntegration()], - trace_lifecycle="stream", ) items = capture_items("event") content, status, headers = unpack_werkzeug_response(client.post("/404")) @@ -590,7 +576,6 @@ def test_response_trace( sentry_init( integrations=[DjangoIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") content, status, headers = unpack_werkzeug_response( @@ -626,7 +611,6 @@ def test_sql_psycopg2_string_composition( sentry_init( integrations=[DjangoIntegration()], send_default_pii=True, - trace_lifecycle="stream", _experiments={ "record_sql_params": True, }, @@ -665,7 +649,6 @@ def test_sql_psycopg2_placeholders( sentry_init( integrations=[DjangoIntegration()], send_default_pii=True, - trace_lifecycle="stream", _experiments={ "record_sql_params": True, }, @@ -738,7 +721,6 @@ def test_django_connect_trace( integrations=[DjangoIntegration()], send_default_pii=True, traces_sample_rate=1.0, - trace_lifecycle="stream", ) from django.db import connections @@ -779,7 +761,6 @@ def test_django_connect_breadcrumbs( sentry_init( integrations=[DjangoIntegration()], send_default_pii=True, - trace_lifecycle="stream", ) from django.db import connections @@ -819,7 +800,6 @@ def test_db_connection_span_data( integrations=[DjangoIntegration()], send_default_pii=True, traces_sample_rate=1.0, - trace_lifecycle="stream", ) from django.db import connections @@ -906,7 +886,6 @@ def test_transaction_style( integrations=[DjangoIntegration(transaction_style=transaction_style)], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) items = capture_items("event", "span") @@ -951,7 +930,6 @@ def test_transaction_style_tracing_disabled( sentry_init( integrations=[DjangoIntegration(transaction_style=transaction_style)], send_default_pii=True, - trace_lifecycle="stream", ) items = capture_items("event") @@ -971,7 +949,6 @@ def test_http_route( sentry_init( integrations=[DjangoIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -990,7 +967,6 @@ def test_request_body( ): sentry_init( integrations=[DjangoIntegration()], - trace_lifecycle="stream", ) items = capture_items("event") content, status, headers = unpack_werkzeug_response( @@ -1132,7 +1108,6 @@ def test_read_request( ): sentry_init( integrations=[DjangoIntegration()], - trace_lifecycle="stream", ) items = capture_items("event") @@ -1158,7 +1133,6 @@ def test_request_body_already_read( ): sentry_init( integrations=[DjangoIntegration()], - trace_lifecycle="stream", ) class MockExtractor(DjangoRequestExtractor): @@ -1187,7 +1161,6 @@ def test_template_tracing_meta( ): sentry_init( integrations=[DjangoIntegration()], - trace_lifecycle="stream", ) items = capture_items("event") @@ -1221,7 +1194,6 @@ def test_template_exception( ): sentry_init( integrations=[DjangoIntegration()] + with_executing_integration, - trace_lifecycle="stream", ) items = capture_items("event") @@ -1292,7 +1264,6 @@ def test_rest_framework_basic( sentry_init( integrations=[DjangoIntegration()], send_default_pii=True, - trace_lifecycle="stream", ) exceptions = capture_exceptions() items = capture_items("event") @@ -1329,7 +1300,6 @@ def test_rest_framework_authentication_span( DjangoIntegration(middleware_spans=False, signals_spans=False), ], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -1358,7 +1328,6 @@ def test_rest_framework_authentication_span_without_authenticators( DjangoIntegration(middleware_spans=False, signals_spans=False), ], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -1385,7 +1354,6 @@ def test_does_not_capture_403( sentry_init( integrations=[DjangoIntegration()], - trace_lifecycle="stream", ) items = capture_items("event", "span") @@ -1495,7 +1463,6 @@ def test_render_spans( sentry_init( integrations=[DjangoIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) views_tests = [ ( @@ -1534,7 +1501,6 @@ def test_render_spans_queryset_in_data(sentry_init, client, capture_events): ) ], traces_sample_rate=1.0, - trace_lifecycle="stream", ) events = capture_events() @@ -1571,7 +1537,6 @@ def test_middleware_spans( DjangoIntegration(middleware_spans=True, signals_spans=False), ], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("event", "span") @@ -1619,7 +1584,6 @@ def test_middleware_spans_disabled( DjangoIntegration(signals_spans=False), ], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("event", "span") @@ -1645,7 +1609,6 @@ def test_signals_spans( DjangoIntegration(middleware_spans=False), ], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("event", "span") @@ -1683,7 +1646,6 @@ def test_signals_spans_disabled( DjangoIntegration(middleware_spans=False, signals_spans=False), ], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("event", "span") @@ -1715,7 +1677,6 @@ def test_signals_spans_filtering( ), ], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -1801,7 +1762,6 @@ def test_custom_urlconf_middleware( sentry_init( integrations=[DjangoIntegration(middleware_spans=middleware_spans)], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("event", "span") @@ -1873,7 +1833,6 @@ def test_span_origin( ) ], traces_sample_rate=1.0, - trace_lifecycle="stream", ) signal_span_found = False items = capture_items("span") @@ -1904,7 +1863,6 @@ def test_transaction_http_method_default( sentry_init( integrations=[DjangoIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -1933,7 +1891,6 @@ def test_transaction_http_method_custom( ) ], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") diff --git a/tests/integrations/django/test_cache_module.py b/tests/integrations/django/test_cache_module.py index b8db763e86..200a68c385 100644 --- a/tests/integrations/django/test_cache_module.py +++ b/tests/integrations/django/test_cache_module.py @@ -105,7 +105,6 @@ def test_cache_spans_disabled_middleware( ) ], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -134,7 +133,6 @@ def test_cache_spans_disabled_decorator( ) ], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -163,7 +161,6 @@ def test_cache_spans_disabled_templatetag( ) ], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -192,7 +189,6 @@ def test_cache_spans_middleware( ) ], traces_sample_rate=1.0, - trace_lifecycle="stream", ) client.application.load_middleware() @@ -262,7 +258,6 @@ def test_cache_spans_decorator( ) ], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -317,7 +312,6 @@ def test_cache_spans_templatetag( ) ], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -406,7 +400,6 @@ def test_cache_spans_location_with_port( ) ], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -443,7 +436,6 @@ def test_cache_spans_location_without_port( ) ], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -478,7 +470,6 @@ def test_cache_spans_location_with_cluster( ) ], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -511,7 +502,6 @@ def test_cache_spans_item_size( ) ], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -558,7 +548,6 @@ def test_cache_spans_get_custom_default( ) ], traces_sample_rate=1.0, - trace_lifecycle="stream", ) id = os.getpid() @@ -625,7 +614,6 @@ def test_cache_spans_get_many( ) ], traces_sample_rate=1.0, - trace_lifecycle="stream", ) id = os.getpid() @@ -687,7 +675,6 @@ def test_cache_spans_set_many( ) ], traces_sample_rate=1.0, - trace_lifecycle="stream", ) id = os.getpid() @@ -734,7 +721,6 @@ def test_span_origin_cache( ) ], traces_sample_rate=1.0, - trace_lifecycle="stream", ) cache_span_found = False items = capture_items("span") diff --git a/tests/integrations/django/test_data_scrubbing.py b/tests/integrations/django/test_data_scrubbing.py index bbf2be23f1..815fc026f0 100644 --- a/tests/integrations/django/test_data_scrubbing.py +++ b/tests/integrations/django/test_data_scrubbing.py @@ -30,7 +30,6 @@ def test_scrub_django_session_cookies_removed( sentry_init( integrations=[DjangoIntegration()], send_default_pii=False, - trace_lifecycle="stream", ) items = capture_items("event") werkzeug_set_cookie(client, "localhost", "sessionid", "123") @@ -52,7 +51,6 @@ def test_scrub_django_session_cookies_filtered( sentry_init( integrations=[DjangoIntegration()], send_default_pii=True, - trace_lifecycle="stream", ) items = capture_items("event") werkzeug_set_cookie(client, "localhost", "sessionid", "123") @@ -82,7 +80,6 @@ def test_scrub_django_custom_session_cookies_filtered( sentry_init( integrations=[DjangoIntegration()], send_default_pii=True, - trace_lifecycle="stream", ) items = capture_items("event") werkzeug_set_cookie(client, "localhost", "my_sess", "123") @@ -332,7 +329,6 @@ def test_span_http_query_data_collection( sentry_init( integrations=[DjangoIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", **init_kwargs, ) @@ -396,7 +392,6 @@ def test_user_info_span_attributes_data_collection( sentry_init( integrations=[DjangoIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", _experiments=experiments, **init_kwargs, ) @@ -432,7 +427,6 @@ def test_user_identity_span_attributes_data_collection( sentry_init( integrations=[DjangoIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", _experiments=experiments, **init_kwargs, ) diff --git a/tests/integrations/django/test_db_query_data.py b/tests/integrations/django/test_db_query_data.py index d7a2bdda34..aca27c16fc 100644 --- a/tests/integrations/django/test_db_query_data.py +++ b/tests/integrations/django/test_db_query_data.py @@ -42,7 +42,6 @@ def test_query_source_disabled( "traces_sample_rate": 1.0, "enable_db_query_source": False, "db_query_source_threshold_ms": 0, - "trace_lifecycle": "stream", } sentry_init(**sentry_options) @@ -90,7 +89,6 @@ def test_query_source_enabled( "send_default_pii": True, "traces_sample_rate": 1.0, "db_query_source_threshold_ms": 0, - "trace_lifecycle": "stream", } if enable_db_query_source is not None: @@ -140,7 +138,6 @@ def test_query_source( traces_sample_rate=1.0, enable_db_query_source=True, db_query_source_threshold_ms=0, - trace_lifecycle="stream", ) if "postgres" not in connections: @@ -206,7 +203,6 @@ def test_query_source_with_module_in_search_path( traces_sample_rate=1.0, enable_db_query_source=True, db_query_source_threshold_ms=0, - trace_lifecycle="stream", ) if "postgres" not in connections: @@ -264,7 +260,6 @@ def test_query_source_with_in_app_exclude( enable_db_query_source=True, db_query_source_threshold_ms=0, in_app_exclude=["tests.integrations.django.myapp.views"], - trace_lifecycle="stream", ) if "postgres" not in connections: @@ -335,7 +330,6 @@ def test_query_source_with_in_app_include( enable_db_query_source=True, db_query_source_threshold_ms=0, in_app_include=["django"], - trace_lifecycle="stream", ) if "postgres" not in connections: @@ -392,7 +386,6 @@ def test_no_query_source_if_duration_too_short( traces_sample_rate=1.0, enable_db_query_source=True, db_query_source_threshold_ms=100, - trace_lifecycle="stream", ) if "postgres" not in connections: @@ -462,7 +455,6 @@ def test_query_source_if_duration_over_threshold( traces_sample_rate=1.0, enable_db_query_source=True, db_query_source_threshold_ms=100, - trace_lifecycle="stream", ) if "postgres" not in connections: @@ -545,7 +537,6 @@ def test_db_span_origin_execute( sentry_init( integrations=[DjangoIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) if "postgres" not in connections: @@ -579,7 +570,6 @@ def test_db_span_origin_executemany( sentry_init( integrations=[DjangoIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) if "postgres" not in connections: diff --git a/tests/integrations/django/test_db_transactions.py b/tests/integrations/django/test_db_transactions.py index 0e51043906..f3a5041d56 100644 --- a/tests/integrations/django/test_db_transactions.py +++ b/tests/integrations/django/test_db_transactions.py @@ -34,7 +34,6 @@ def test_db_transaction_spans_disabled_no_autocommit( sentry_init( integrations=[DjangoIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) if "postgres" not in connections: @@ -167,7 +166,6 @@ def test_db_transaction_spans_disabled_atomic( sentry_init( integrations=[DjangoIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) if "postgres" not in connections: @@ -287,7 +285,6 @@ def test_db_no_autocommit_execute( sentry_init( integrations=[DjangoIntegration(db_transaction_spans=True)], traces_sample_rate=1.0, - trace_lifecycle="stream", ) if "postgres" not in connections: @@ -350,7 +347,6 @@ def test_db_no_autocommit_executemany( sentry_init( integrations=[DjangoIntegration(db_transaction_spans=True)], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -439,7 +435,6 @@ def test_db_no_autocommit_rollback_execute( sentry_init( integrations=[DjangoIntegration(db_transaction_spans=True)], traces_sample_rate=1.0, - trace_lifecycle="stream", ) if "postgres" not in connections: @@ -502,7 +497,6 @@ def test_db_no_autocommit_rollback_executemany( sentry_init( integrations=[DjangoIntegration(db_transaction_spans=True)], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -590,7 +584,6 @@ def test_db_atomic_execute( sentry_init( integrations=[DjangoIntegration(db_transaction_spans=True)], traces_sample_rate=1.0, - trace_lifecycle="stream", ) if "postgres" not in connections: @@ -654,7 +647,6 @@ def test_db_atomic_executemany( integrations=[DjangoIntegration(db_transaction_spans=True)], send_default_pii=True, traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -739,7 +731,6 @@ def test_db_atomic_rollback_execute( integrations=[DjangoIntegration(db_transaction_spans=True)], send_default_pii=True, traces_sample_rate=1.0, - trace_lifecycle="stream", ) if "postgres" not in connections: @@ -804,7 +795,6 @@ def test_db_atomic_rollback_executemany( integrations=[DjangoIntegration(db_transaction_spans=True)], send_default_pii=True, traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -891,7 +881,6 @@ def test_db_atomic_execute_exception( integrations=[DjangoIntegration(db_transaction_spans=True)], send_default_pii=True, traces_sample_rate=1.0, - trace_lifecycle="stream", ) if "postgres" not in connections: @@ -955,7 +944,6 @@ def test_db_atomic_executemany_exception( integrations=[DjangoIntegration(db_transaction_spans=True)], send_default_pii=True, traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") diff --git a/tests/integrations/django/test_tasks.py b/tests/integrations/django/test_tasks.py index ffbaf1a250..1e58de3164 100644 --- a/tests/integrations/django/test_tasks.py +++ b/tests/integrations/django/test_tasks.py @@ -63,7 +63,6 @@ def test_task_span_is_created( sentry_init( integrations=[DjangoIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -95,7 +94,6 @@ def test_task_enqueue_returns_result(sentry_init, immediate_backend): sentry_init( integrations=[DjangoIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) result = add_numbers.enqueue(3, 5) @@ -117,7 +115,6 @@ def test_task_enqueue_with_kwargs( sentry_init( integrations=[DjangoIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -154,7 +151,6 @@ def test_task_error_reporting( LoggingIntegration(event_level=logging.ERROR), ], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -193,7 +189,6 @@ def test_multiple_task_enqueues_create_multiple_spans( sentry_init( integrations=[DjangoIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") diff --git a/tests/integrations/dramatiq/test_dramatiq.py b/tests/integrations/dramatiq/test_dramatiq.py index 1bab8d1dfe..b3c50bbb46 100644 --- a/tests/integrations/dramatiq/test_dramatiq.py +++ b/tests/integrations/dramatiq/test_dramatiq.py @@ -22,7 +22,6 @@ def broker(request, sentry_init): sentry_init( integrations=[DramatiqIntegration()], traces_sample_rate=param, - trace_lifecycle="stream", ) broker = StubBroker() broker.emit_after("process_boot") @@ -74,7 +73,6 @@ def dummy_actor(x, y): ( { "traces_sample_rate": 1.0, - "trace_lifecycle": "stream", }, SPANSTATUS.INTERNAL_ERROR, False, @@ -82,7 +80,6 @@ def dummy_actor(x, y): ( { "traces_sample_rate": 1.0, - "trace_lifecycle": "stream", }, SPANSTATUS.OK, False, @@ -90,7 +87,6 @@ def dummy_actor(x, y): ( { "traces_sample_rate": 1.0, - "trace_lifecycle": "stream", }, SPANSTATUS.INTERNAL_ERROR, True, @@ -98,7 +94,6 @@ def dummy_actor(x, y): ( { "traces_sample_rate": 1.0, - "trace_lifecycle": "stream", }, SPANSTATUS.OK, True, @@ -166,7 +161,6 @@ def dummy_actor(x, y): [ { "traces_sample_rate": 1.0, - "trace_lifecycle": "stream", }, ], indirect=["broker"], @@ -528,7 +522,6 @@ def dummy_actor(): [ { "traces_sample_rate": 1.0, - "trace_lifecycle": "stream", }, ], indirect=["broker"], diff --git a/tests/integrations/falcon/test_falcon.py b/tests/integrations/falcon/test_falcon.py index 14dbd5467a..027684b181 100644 --- a/tests/integrations/falcon/test_falcon.py +++ b/tests/integrations/falcon/test_falcon.py @@ -68,7 +68,6 @@ def test_has_context( ): sentry_init( integrations=[FalconIntegration()], - trace_lifecycle="stream", ) client = make_client() @@ -106,7 +105,6 @@ def test_transaction_style( sentry_init( integrations=[integration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) client = make_client() @@ -136,7 +134,6 @@ def test_http_route( sentry_init( integrations=[FalconIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) client = make_client() @@ -156,7 +153,6 @@ def test_unhandled_errors( ): sentry_init( integrations=[FalconIntegration()], - trace_lifecycle="stream", ) class Resource: @@ -192,7 +188,6 @@ def test_raised_5xx_errors( ): sentry_init( integrations=[FalconIntegration()], - trace_lifecycle="stream", ) class Resource: @@ -225,7 +220,6 @@ def test_raised_4xx_errors( ): sentry_init( integrations=[FalconIntegration()], - trace_lifecycle="stream", ) class Resource: @@ -256,7 +250,6 @@ def test_http_status( """ sentry_init( integrations=[FalconIntegration()], - trace_lifecycle="stream", ) class Resource: @@ -287,7 +280,6 @@ def test_falcon_large_json_request( integrations=[FalconIntegration()], max_request_body_size="always", max_value_length=max_value_length, - trace_lifecycle="stream", ) data = {"foo": {"bar": "a" * (1034)}} @@ -329,7 +321,6 @@ def test_falcon_empty_json_request( ): sentry_init( integrations=[FalconIntegration()], - trace_lifecycle="stream", ) class Resource: @@ -358,7 +349,6 @@ def test_falcon_raw_data_request( ): sentry_init( integrations=[FalconIntegration()], - trace_lifecycle="stream", ) class Resource: @@ -387,7 +377,6 @@ def test_logging( ): sentry_init( integrations=[FalconIntegration(), LoggingIntegration(event_level="ERROR")], - trace_lifecycle="stream", ) logger = logging.getLogger() @@ -440,7 +429,6 @@ def test_error_in_errorhandler( ): sentry_init( integrations=[FalconIntegration()], - trace_lifecycle="stream", ) app = falcon.API() @@ -475,7 +463,6 @@ def test_bad_request_not_captured( ): sentry_init( integrations=[FalconIntegration()], - trace_lifecycle="stream", ) app = falcon.API() @@ -501,7 +488,6 @@ def test_does_not_leak_scope( ): sentry_init( integrations=[FalconIntegration()], - trace_lifecycle="stream", ) app = falcon.API() @@ -544,7 +530,6 @@ def test_falcon_not_breaking_asgi(sentry_init): """ sentry_init( integrations=[FalconIntegration()], - trace_lifecycle="stream", ) asgi_app = falcon.asgi.App() @@ -566,7 +551,6 @@ def test_falcon_custom_error_handler( """ sentry_init( integrations=[FalconIntegration()], - trace_lifecycle="stream", ) app = make_app() @@ -587,7 +571,6 @@ def test_span_origin( sentry_init( integrations=[FalconIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) client = make_client() @@ -630,7 +613,6 @@ def on_post(self, req, _): sentry_init( integrations=[FalconIntegration()], - trace_lifecycle="stream", ) try: diff --git a/tests/integrations/fastapi/test_fastapi.py b/tests/integrations/fastapi/test_fastapi.py index 7668f543b0..5037a24706 100644 --- a/tests/integrations/fastapi/test_fastapi.py +++ b/tests/integrations/fastapi/test_fastapi.py @@ -130,7 +130,6 @@ async def test_request_info_json_body(sentry_init, capture_items): traces_sample_rate=1.0, send_default_pii=True, integrations=[StarletteIntegration()], - trace_lifecycle="stream", ) app = fastapi_app_factory() @@ -173,7 +172,6 @@ async def test_formdata_request_body(sentry_init, capture_items): send_default_pii=True, max_request_body_size="always", integrations=[StarletteIntegration()], - trace_lifecycle="stream", ) app = fastapi_app_factory() @@ -218,7 +216,6 @@ async def test_request_body_too_big(sentry_init, capture_items): traces_sample_rate=1.0, send_default_pii=True, integrations=[StarletteIntegration()], - trace_lifecycle="stream", ) app = fastapi_app_factory() @@ -264,7 +261,6 @@ async def test_formdata_request_body_data_collection_http_bodies_empty( traces_sample_rate=1.0, max_request_body_size="always", integrations=[StarletteIntegration()], - trace_lifecycle="stream", _experiments={"data_collection": {"http_bodies": []}}, ) @@ -313,7 +309,6 @@ async def test_request_body_data_collection( sentry_init( traces_sample_rate=1.0, integrations=[StarletteIntegration()], - trace_lifecycle="stream", _experiments=( {} if data_collection is None else {"data_collection": data_collection} ), @@ -351,7 +346,6 @@ async def test_response(sentry_init, capture_events): integrations=[StarletteIntegration(), FastApiIntegration()], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) app = fastapi_app_factory() @@ -459,7 +453,6 @@ def test_active_thread_id(sentry_init, capture_items, endpoint): auto_enabling_integrations=False, # Ensure httpx is not auto-enabled; its legacy start_span interferes with streaming mode integrations=[StarletteIntegration(), FastApiIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) app = fastapi_app_factory() @@ -488,7 +481,6 @@ async def test_original_request_not_scrubbed(sentry_init, capture_events): LoggingIntegration(event_level=logging.ERROR), ], traces_sample_rate=1.0, - trace_lifecycle="stream", ) app = FastAPI() @@ -555,7 +547,6 @@ def test_transaction_name( FastApiIntegration(transaction_style=transaction_style), ], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -587,7 +578,6 @@ def test_http_route_with_prefix( FastApiIntegration(transaction_style="url"), ], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -624,7 +614,6 @@ def test_route_endpoint_equal_dependant_call(sentry_init): FastApiIntegration(), ], traces_sample_rate=1.0, - trace_lifecycle="stream", ) app = fastapi_app_factory() @@ -678,7 +667,6 @@ def dummy_traces_sampler(sampling_context): integrations=[StarletteIntegration(transaction_style=transaction_style)], traces_sampler=dummy_traces_sampler, traces_sample_rate=1.0, - trace_lifecycle="stream", ) app = fastapi_app_factory() @@ -728,7 +716,6 @@ def test_transaction_name_in_middleware( ), ], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -771,7 +758,6 @@ def test_transaction_http_method_default(sentry_init, capture_items): StarletteIntegration(), FastApiIntegration(), ], - trace_lifecycle="stream", ) app = fastapi_app_factory() @@ -811,7 +797,6 @@ def test_transaction_http_method_custom(sentry_init, capture_items): ), # capitalization does not matter ), ], - trace_lifecycle="stream", ) app = fastapi_app_factory() @@ -838,7 +823,6 @@ def test_request_url(sentry_init, capture_items): integrations=[ StarletteIntegration(), ], - trace_lifecycle="stream", ) starlette_app = fastapi_app_factory() @@ -901,7 +885,6 @@ def test_app_host(sentry_init, capture_items, transaction_style): StarletteIntegration(transaction_style=transaction_style), FastApiIntegration(transaction_style=transaction_style), ], - trace_lifecycle="stream", ) app = FastAPI() @@ -934,7 +917,6 @@ async def test_feature_flags(sentry_init, capture_events): sentry_init( traces_sample_rate=1.0, integrations=[StarletteIntegration(), FastApiIntegration()], - trace_lifecycle="stream", ) events = capture_events() diff --git a/tests/integrations/fastmcp/test_fastmcp.py b/tests/integrations/fastmcp/test_fastmcp.py index da5debf1f8..454c85d076 100644 --- a/tests/integrations/fastmcp/test_fastmcp.py +++ b/tests/integrations/fastmcp/test_fastmcp.py @@ -296,7 +296,6 @@ async def test_fastmcp_tool_sync( integrations=[MCPIntegration(include_prompts=include_prompts)], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) mcp = FastMCP("Test Server") @@ -354,7 +353,6 @@ async def test_fastmcp_tool_async( integrations=[MCPIntegration(include_prompts=include_prompts)], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) mcp = FastMCP("Test Server") @@ -433,7 +431,6 @@ async def test_fastmcp_tool_with_error( sentry_init( integrations=[MCPIntegration(), LoggingIntegration(event_level=logging.ERROR)], traces_sample_rate=1.0, - trace_lifecycle="stream", ) mcp = FastMCP("Test Server") @@ -483,7 +480,6 @@ async def test_fastmcp_tool_with_complex_return( integrations=[MCPIntegration(include_prompts=True)], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) mcp = FastMCP("Test Server") @@ -544,7 +540,6 @@ async def test_fastmcp_prompt_sync( integrations=[MCPIntegration(include_prompts=include_prompts)], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) mcp = FastMCP("Test Server") @@ -620,7 +615,6 @@ async def test_fastmcp_resource_sync( sentry_init( integrations=[MCPIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) mcp = FastMCP("Test Server") @@ -673,7 +667,6 @@ async def test_fastmcp_resource_async(sentry_init, capture_items, FastMCP, json_ sentry_init( integrations=[MCPIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) mcp = FastMCP("Test Server") @@ -747,7 +740,6 @@ async def test_fastmcp_span_origin( sentry_init( integrations=[MCPIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) mcp = FastMCP("Test Server") @@ -799,7 +791,6 @@ async def test_fastmcp_sse_transport( sentry_init( integrations=[MCPIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) mcp = FastMCP("Test Server") @@ -875,7 +866,6 @@ def test_fastmcp_http_transport(sentry_init, capture_items, FastMCP, json_rpc): sentry_init( integrations=[MCPIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) mcp = FastMCP("Test Server") @@ -939,7 +929,6 @@ async def test_fastmcp_stdio_transport( sentry_init( integrations=[MCPIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) mcp = FastMCP("Test Server") diff --git a/tests/integrations/flask/test_flask.py b/tests/integrations/flask/test_flask.py index 2c9d38e3ac..63b6c5b213 100644 --- a/tests/integrations/flask/test_flask.py +++ b/tests/integrations/flask/test_flask.py @@ -114,7 +114,6 @@ def test_transaction_or_segment_style( flask_sentry.FlaskIntegration(transaction_style=transaction_style) ], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -140,7 +139,6 @@ def test_http_route( sentry_init( integrations=[flask_sentry.FlaskIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -253,7 +251,6 @@ def test_flask_login_configured( integrations=[flask_sentry.FlaskIntegration()], send_default_pii=send_default_pii, traces_sample_rate=1.0, - trace_lifecycle="stream", ) class User: @@ -787,7 +784,6 @@ def test_tracing_success( sentry_init( traces_sample_rate=1.0, integrations=[flask_sentry.FlaskIntegration()], - trace_lifecycle="stream", ) @app.before_request @@ -830,7 +826,6 @@ def test_tracing_error(sentry_init, capture_events, capture_items, app): sentry_init( traces_sample_rate=1.0, integrations=[flask_sentry.FlaskIntegration()], - trace_lifecycle="stream", ) items = capture_items("event", "span") @@ -988,7 +983,6 @@ def test_span_origin(sentry_init, app, capture_events, capture_items): sentry_init( integrations=[flask_sentry.FlaskIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -1016,7 +1010,6 @@ def test_segment_http_method_default( sentry_init( traces_sample_rate=1.0, integrations=[flask_sentry.FlaskIntegration()], - trace_lifecycle="stream", ) items = capture_items("span") @@ -1058,7 +1051,6 @@ def test_segment_http_method_custom( ) # capitalization does not matter ) # case does not matter ], - trace_lifecycle="stream", ) items = capture_items("span") @@ -1204,7 +1196,6 @@ def test_span_http_query_data_collection( sentry_init( integrations=[flask_sentry.FlaskIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", **init_kwargs, ) monkeypatch.setattr(flask_sentry, "flask_login", None) @@ -1265,7 +1256,6 @@ def test_user_info_span_attributes_data_collection( sentry_init( integrations=[flask_sentry.FlaskIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", _experiments=experiments, **init_kwargs, ) @@ -1400,7 +1390,6 @@ def test_flask_login_user_identity_span_attributes_data_collection( sentry_init( integrations=[flask_sentry.FlaskIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", _experiments=experiments, **init_kwargs, ) diff --git a/tests/integrations/gcp/test_gcp.py b/tests/integrations/gcp/test_gcp.py index c533eddb24..6f47eff07b 100644 --- a/tests/integrations/gcp/test_gcp.py +++ b/tests/integrations/gcp/test_gcp.py @@ -308,7 +308,6 @@ def _safe_is_equal(x, y): init_sdk( traces_sampler=traces_sampler, - trace_lifecycle="stream", ) gcp_functions.worker_v1.FunctionHandler.invoke_user_function(functionhandler, event) @@ -337,7 +336,7 @@ def cloud_function(functionhandler, event): + FUNCTIONS_PRELUDE + dedent( """ - init_sdk(traces_sample_rate=1.0, trace_lifecycle="stream") + init_sdk(traces_sample_rate=1.0) gcp_functions.worker_v1.FunctionHandler.invoke_user_function(functionhandler, event) """ ) @@ -460,7 +459,7 @@ def cloud_function(functionhandler, event): + FUNCTIONS_PRELUDE + dedent( """ - init_sdk(traces_sample_rate=1.0, trace_lifecycle="stream") + init_sdk(traces_sample_rate=1.0) gcp_functions.worker_v1.FunctionHandler.invoke_user_function(functionhandler, event) """ ) @@ -483,7 +482,7 @@ def cloud_function(functionhandler, event): + FUNCTIONS_PRELUDE + dedent( """ - init_sdk(traces_sample_rate=1.0, trace_lifecycle="stream") + init_sdk(traces_sample_rate=1.0) gcp_functions.worker_v1.FunctionHandler.invoke_user_function(functionhandler, event) """ ) @@ -517,7 +516,7 @@ def cloud_function(functionhandler, event): + FUNCTIONS_PRELUDE + dedent( """ - init_sdk(traces_sample_rate=1.0, trace_lifecycle="stream") + init_sdk(traces_sample_rate=1.0) gcp_functions.worker_v1.FunctionHandler.invoke_user_function(functionhandler, event) """ ) @@ -569,7 +568,7 @@ def cloud_function(functionhandler, event): + FUNCTIONS_PRELUDE + dedent( """ - init_sdk(traces_sample_rate=1.0, trace_lifecycle="stream") + init_sdk(traces_sample_rate=1.0) gcp_functions.worker_v1.FunctionHandler.invoke_user_function(functionhandler, event) """ ) @@ -614,7 +613,7 @@ def cloud_function(functionhandler, event): + FUNCTIONS_PRELUDE + dedent( """ - init_sdk(traces_sample_rate=1.0, send_default_pii=True, trace_lifecycle="stream") + init_sdk(traces_sample_rate=1.0, send_default_pii=True) gcp_functions.worker_v1.FunctionHandler.invoke_user_function(functionhandler, event) """ ) @@ -655,7 +654,7 @@ def cloud_function(functionhandler, event): + FUNCTIONS_PRELUDE + dedent( """ - init_sdk(traces_sample_rate=1.0, send_default_pii=False, trace_lifecycle="stream") + init_sdk(traces_sample_rate=1.0, send_default_pii=False) gcp_functions.worker_v1.FunctionHandler.invoke_user_function(functionhandler, event) """ ) @@ -779,7 +778,7 @@ def cloud_function(functionhandler, event): + FUNCTIONS_PRELUDE + dedent( """ - init_sdk(traces_sample_rate=1.0, trace_lifecycle="stream", %s) + init_sdk(traces_sample_rate=1.0, %s) gcp_functions.worker_v1.FunctionHandler.invoke_user_function(functionhandler, event) """ % init_kwargs diff --git a/tests/integrations/google_genai/test_google_genai.py b/tests/integrations/google_genai/test_google_genai.py index 4b5ca20670..80abbfc4f1 100644 --- a/tests/integrations/google_genai/test_google_genai.py +++ b/tests/integrations/google_genai/test_google_genai.py @@ -134,7 +134,6 @@ def test_nonstreaming_generate_content( integrations=[GoogleGenAIIntegration(include_prompts=include_prompts)], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) # Mock the HTTP response at the _api_client.request() level @@ -245,7 +244,6 @@ def test_generate_content_with_system_instruction( integrations=[GoogleGenAIIntegration(include_prompts=True)], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) mock_http_response = create_mock_http_response(EXAMPLE_API_RESPONSE_JSON) @@ -293,7 +291,6 @@ def test_generate_content_with_tools( sentry_init( integrations=[GoogleGenAIIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) # Create a mock tool function @@ -379,7 +376,6 @@ def test_tool_execution( integrations=[GoogleGenAIIntegration(include_prompts=True)], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) # Create a mock tool function @@ -421,7 +417,6 @@ def test_error_handling( sentry_init( integrations=[GoogleGenAIIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("event") @@ -453,7 +448,6 @@ def test_streaming_generate_content( integrations=[GoogleGenAIIntegration(include_prompts=True)], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) # Create streaming chunks - simulating a multi-chunk response @@ -597,7 +591,6 @@ def test_span_origin( sentry_init( integrations=[GoogleGenAIIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) mock_http_response = create_mock_http_response(EXAMPLE_API_RESPONSE_JSON) @@ -626,7 +619,6 @@ def test_response_without_usage_metadata( sentry_init( integrations=[GoogleGenAIIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) # Response without usage metadata @@ -672,7 +664,6 @@ def test_multiple_candidates( integrations=[GoogleGenAIIntegration(include_prompts=True)], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) # Response with multiple candidates @@ -742,7 +733,6 @@ def test_all_configuration_parameters( sentry_init( integrations=[GoogleGenAIIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) mock_http_response = create_mock_http_response(EXAMPLE_API_RESPONSE_JSON) @@ -786,7 +776,6 @@ def test_empty_response( sentry_init( integrations=[GoogleGenAIIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) # Minimal response with empty candidates array @@ -820,7 +809,6 @@ def test_response_with_different_id_fields( sentry_init( integrations=[GoogleGenAIIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) # Response with response_id and model_version @@ -863,7 +851,6 @@ def test_tool_with_async_function(sentry_init): sentry_init( integrations=[GoogleGenAIIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) # Create an async tool function @@ -890,7 +877,6 @@ def test_contents_as_none( integrations=[GoogleGenAIIntegration(include_prompts=True)], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) mock_http_response = create_mock_http_response(EXAMPLE_API_RESPONSE_JSON) @@ -922,7 +908,6 @@ def test_tool_calls_extraction( sentry_init( integrations=[GoogleGenAIIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) # Response with function calls @@ -1045,7 +1030,6 @@ def test_embed_content( integrations=[GoogleGenAIIntegration(include_prompts=include_prompts)], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) # Mock the HTTP response at the _api_client.request() level @@ -1108,7 +1092,6 @@ def test_embed_content_string_input( integrations=[GoogleGenAIIntegration(include_prompts=True)], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) # Mock response with single embedding @@ -1160,7 +1143,6 @@ def test_embed_content_error_handling( sentry_init( integrations=[GoogleGenAIIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("event") @@ -1192,7 +1174,6 @@ def test_embed_content_without_statistics( sentry_init( integrations=[GoogleGenAIIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) # Response without statistics (typical for older google-genai versions) @@ -1236,7 +1217,6 @@ def test_embed_content_span_origin( sentry_init( integrations=[GoogleGenAIIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) mock_http_response = create_mock_http_response(EXAMPLE_EMBED_RESPONSE_JSON) @@ -1277,7 +1257,6 @@ async def test_async_embed_content( integrations=[GoogleGenAIIntegration(include_prompts=include_prompts)], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) # Mock the async HTTP response @@ -1341,7 +1320,6 @@ async def test_async_embed_content_string_input( integrations=[GoogleGenAIIntegration(include_prompts=True)], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) # Mock response with single embedding @@ -1395,7 +1373,6 @@ async def test_async_embed_content_error_handling( sentry_init( integrations=[GoogleGenAIIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("event") @@ -1428,7 +1405,6 @@ async def test_async_embed_content_without_statistics( sentry_init( integrations=[GoogleGenAIIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) # Response without statistics (typical for older google-genai versions) @@ -1475,7 +1451,6 @@ async def test_async_embed_content_span_origin( sentry_init( integrations=[GoogleGenAIIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) mock_http_response = create_mock_http_response(EXAMPLE_EMBED_RESPONSE_JSON) @@ -1508,7 +1483,6 @@ def test_generate_content_with_content_object( integrations=[GoogleGenAIIntegration(include_prompts=True)], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) mock_http_response = create_mock_http_response(EXAMPLE_API_RESPONSE_JSON) @@ -1548,7 +1522,6 @@ def test_generate_content_with_dict_format( integrations=[GoogleGenAIIntegration(include_prompts=True)], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) mock_http_response = create_mock_http_response(EXAMPLE_API_RESPONSE_JSON) @@ -1586,7 +1559,6 @@ def test_generate_content_with_file_data( integrations=[GoogleGenAIIntegration(include_prompts=True)], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) mock_http_response = create_mock_http_response(EXAMPLE_API_RESPONSE_JSON) @@ -1639,7 +1611,6 @@ def test_generate_content_with_inline_data( integrations=[GoogleGenAIIntegration(include_prompts=True)], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) mock_http_response = create_mock_http_response(EXAMPLE_API_RESPONSE_JSON) @@ -1686,7 +1657,6 @@ def test_generate_content_with_function_response( integrations=[GoogleGenAIIntegration(include_prompts=True)], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) mock_http_response = create_mock_http_response(EXAMPLE_API_RESPONSE_JSON) @@ -1745,7 +1715,6 @@ def test_generate_content_with_mixed_string_and_content( integrations=[GoogleGenAIIntegration(include_prompts=True)], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) mock_http_response = create_mock_http_response(EXAMPLE_API_RESPONSE_JSON) @@ -1793,7 +1762,6 @@ def test_generate_content_with_part_object_directly( integrations=[GoogleGenAIIntegration(include_prompts=True)], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) mock_http_response = create_mock_http_response(EXAMPLE_API_RESPONSE_JSON) @@ -1833,7 +1801,6 @@ def test_generate_content_with_list_of_dicts( integrations=[GoogleGenAIIntegration(include_prompts=True)], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) mock_http_response = create_mock_http_response(EXAMPLE_API_RESPONSE_JSON) @@ -1874,7 +1841,6 @@ def test_generate_content_with_dict_inline_data( integrations=[GoogleGenAIIntegration(include_prompts=True)], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) mock_http_response = create_mock_http_response(EXAMPLE_API_RESPONSE_JSON) @@ -1922,7 +1888,6 @@ def test_generate_content_without_parts_property_inline_data( integrations=[GoogleGenAIIntegration(include_prompts=True)], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) mock_http_response = create_mock_http_response(EXAMPLE_API_RESPONSE_JSON) @@ -1968,7 +1933,6 @@ def test_generate_content_without_parts_property_inline_data_and_binary_data_wit integrations=[GoogleGenAIIntegration(include_prompts=True)], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) mock_http_response = create_mock_http_response(EXAMPLE_API_RESPONSE_JSON) @@ -2452,7 +2416,6 @@ def test_generate_content_data_collection( integrations=[GoogleGenAIIntegration(include_prompts=include_prompts)], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) if data_collection is not None: sentry_init_kwargs["_experiments"] = {"data_collection": data_collection} @@ -2565,7 +2528,6 @@ def test_generate_content_data_collection_tools( integrations=[GoogleGenAIIntegration(include_prompts=False)], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) if data_collection is not None: sentry_init_kwargs["_experiments"] = {"data_collection": data_collection} @@ -2747,7 +2709,6 @@ def test_streaming_generate_content_data_collection( integrations=[GoogleGenAIIntegration(include_prompts=include_prompts)], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) if data_collection is not None: sentry_init_kwargs["_experiments"] = {"data_collection": data_collection} @@ -2891,7 +2852,6 @@ def test_streaming_generate_content_data_collection_tools( integrations=[GoogleGenAIIntegration(include_prompts=False)], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) if data_collection is not None: sentry_init_kwargs["_experiments"] = {"data_collection": data_collection} @@ -3062,7 +3022,6 @@ def test_embed_content_data_collection( integrations=[GoogleGenAIIntegration(include_prompts=include_prompts)], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) if data_collection is not None: sentry_init_kwargs["_experiments"] = {"data_collection": data_collection} @@ -3204,7 +3163,6 @@ async def test_async_generate_content_data_collection( integrations=[GoogleGenAIIntegration(include_prompts=include_prompts)], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) if data_collection is not None: sentry_init_kwargs["_experiments"] = {"data_collection": data_collection} @@ -3331,7 +3289,6 @@ async def test_async_embed_content_data_collection( integrations=[GoogleGenAIIntegration(include_prompts=include_prompts)], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) if data_collection is not None: sentry_init_kwargs["_experiments"] = {"data_collection": data_collection} diff --git a/tests/integrations/graphene/test_graphene.py b/tests/integrations/graphene/test_graphene.py index 93504a8c30..70ecce1695 100644 --- a/tests/integrations/graphene/test_graphene.py +++ b/tests/integrations/graphene/test_graphene.py @@ -336,7 +336,6 @@ def test_graphql_span_holds_query_information( traces_sample_rate=1.0, default_integrations=False, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) items = capture_items("span") @@ -392,7 +391,6 @@ def test_graphql_span_data_collection( "integrations": [GrapheneIntegration(), FlaskIntegration()], "traces_sample_rate": 1.0, "default_integrations": False, - "trace_lifecycle": "stream", "_experiments": {"data_collection": data_collection}, } if send_default_pii is not None: @@ -447,7 +445,6 @@ def test_breadcrumbs_hold_query_information_on_error(sentry_init, capture_items) GrapheneIntegration(), ], default_integrations=False, - trace_lifecycle="stream", ) items = capture_items("span", "event") diff --git a/tests/integrations/grpc/test_grpc.py b/tests/integrations/grpc/test_grpc.py index edd7b96646..18f3d859b6 100644 --- a/tests/integrations/grpc/test_grpc.py +++ b/tests/integrations/grpc/test_grpc.py @@ -59,7 +59,6 @@ def test_grpc_server_starts_transaction( sentry_init( traces_sample_rate=1.0, integrations=[GRPCIntegration()], - trace_lifecycle="stream", ) server, channel = _set_up() @@ -92,7 +91,6 @@ def test_grpc_server_other_interceptors( sentry_init( traces_sample_rate=1.0, integrations=[GRPCIntegration()], - trace_lifecycle="stream", ) mock_intercept = lambda continuation, handler_call_details: continuation( @@ -132,7 +130,6 @@ def test_grpc_server_continues_transaction( sentry_init( traces_sample_rate=1.0, integrations=[GRPCIntegration()], - trace_lifecycle="stream", ) server, channel = _set_up() @@ -184,7 +181,6 @@ def test_grpc_client_starts_span( sentry_init( traces_sample_rate=1.0, integrations=[GRPCIntegration()], - trace_lifecycle="stream", ) server, channel = _set_up() @@ -237,7 +233,6 @@ def test_grpc_client_unary_stream_starts_span( sentry_init( traces_sample_rate=1.0, integrations=[GRPCIntegration()], - trace_lifecycle="stream", ) server, channel = _set_up() @@ -300,7 +295,6 @@ def test_grpc_client_other_interceptor( sentry_init( traces_sample_rate=1.0, integrations=[GRPCIntegration()], - trace_lifecycle="stream", ) server, channel = _set_up() @@ -356,7 +350,6 @@ def test_prevent_dual_client_interceptor( sentry_init( traces_sample_rate=1.0, integrations=[GRPCIntegration()], - trace_lifecycle="stream", ) server, channel = _set_up() @@ -399,7 +392,6 @@ def test_grpc_client_and_servers_interceptors_integration( sentry_init( traces_sample_rate=1.0, integrations=[GRPCIntegration()], - trace_lifecycle="stream", ) server, channel = _set_up() @@ -429,7 +421,6 @@ def test_stream_stream(sentry_init): sentry_init( traces_sample_rate=1.0, integrations=[GRPCIntegration()], - trace_lifecycle="stream", ) server, channel = _set_up() @@ -451,7 +442,6 @@ def test_stream_unary(sentry_init): sentry_init( traces_sample_rate=1.0, integrations=[GRPCIntegration()], - trace_lifecycle="stream", ) server, channel = _set_up() @@ -471,7 +461,6 @@ def test_span_origin( sentry_init( traces_sample_rate=1.0, integrations=[GRPCIntegration()], - trace_lifecycle="stream", ) server, channel = _set_up() diff --git a/tests/integrations/grpc/test_grpc_aio.py b/tests/integrations/grpc/test_grpc_aio.py index 1170ad81b9..104bfbd096 100644 --- a/tests/integrations/grpc/test_grpc_aio.py +++ b/tests/integrations/grpc/test_grpc_aio.py @@ -33,7 +33,6 @@ async def inner(): sentry_init( traces_sample_rate=1.0, integrations=[GRPCIntegration()], - trace_lifecycle="stream", ) # Create server @@ -71,7 +70,6 @@ async def test_noop_for_unimplemented_method( sentry_init( traces_sample_rate=1.0, integrations=[GRPCIntegration()], - trace_lifecycle="stream", ) # Create empty server with no services diff --git a/tests/integrations/httpx/test_httpx.py b/tests/integrations/httpx/test_httpx.py index 210dcbb95b..02b15865ec 100644 --- a/tests/integrations/httpx/test_httpx.py +++ b/tests/integrations/httpx/test_httpx.py @@ -32,7 +32,6 @@ def before_breadcrumb(crumb, hint): sentry_init( integrations=[HttpxIntegration()], before_breadcrumb=before_breadcrumb, - trace_lifecycle="stream", send_default_pii=send_default_pii, ) @@ -89,7 +88,6 @@ def before_breadcrumb(crumb, hint): sentry_init( integrations=[HttpxIntegration()], before_breadcrumb=before_breadcrumb, - trace_lifecycle="stream", send_default_pii=send_default_pii, ) @@ -136,7 +134,6 @@ def test_crumb_capture_without_span_sync(sentry_init, capture_events, httpx_mock sentry_init( integrations=[HttpxIntegration()], - trace_lifecycle="stream", ) url = "http://example.com/" @@ -172,7 +169,6 @@ async def test_crumb_capture_without_span_async( sentry_init( integrations=[HttpxIntegration()], - trace_lifecycle="stream", ) url = "http://example.com/" @@ -218,7 +214,6 @@ def test_crumb_capture_client_error_sync( sentry_init( integrations=[HttpxIntegration()], - trace_lifecycle="stream", send_default_pii=send_default_pii, ) @@ -281,7 +276,6 @@ async def test_crumb_capture_client_error_async( sentry_init( integrations=[HttpxIntegration()], - trace_lifecycle="stream", send_default_pii=send_default_pii, ) @@ -388,7 +382,6 @@ def test_option_trace_propagation_targets_sync( release="test", trace_propagation_targets=trace_propagation_targets, traces_sample_rate=1.0, - trace_lifecycle="stream", integrations=[HttpxIntegration()], ) @@ -466,7 +459,6 @@ async def test_option_trace_propagation_targets_async( release="test", trace_propagation_targets=trace_propagation_targets, traces_sample_rate=1.0, - trace_lifecycle="stream", integrations=[HttpxIntegration()], ) @@ -486,7 +478,6 @@ def test_outgoing_trace_headers_sync(sentry_init, capture_items, httpx_mock): sentry_init( traces_sample_rate=1.0, integrations=[HttpxIntegration()], - trace_lifecycle="stream", ) url = "http://example.com/" @@ -516,7 +507,6 @@ async def test_outgoing_trace_headers_async(sentry_init, capture_items, httpx_mo sentry_init( traces_sample_rate=1.0, integrations=[HttpxIntegration()], - trace_lifecycle="stream", ) url = "http://example.com/" @@ -550,7 +540,6 @@ def test_outgoing_trace_headers_append_to_baggage_sync( traces_sample_rate=1.0, integrations=[HttpxIntegration()], release="d08ebdb9309e1b004c6f52202de58a09c2268e42", - trace_lifecycle="stream", ) url = "http://example.com/" @@ -584,7 +573,6 @@ async def test_outgoing_trace_headers_append_to_baggage_async( traces_sample_rate=1.0, integrations=[HttpxIntegration()], release="d08ebdb9309e1b004c6f52202de58a09c2268e42", - trace_lifecycle="stream", ) url = "http://example.com/" @@ -625,7 +613,6 @@ def test_outgoing_trace_headers_no_current_span(sentry_init, httpx_mock): traces_sample_rate=1.0, trace_propagation_targets=[MATCH_ALL], integrations=[HttpxIntegration()], - trace_lifecycle="stream", ) url = "http://example.com/" @@ -662,7 +649,6 @@ async def test_outgoing_trace_headers_no_current_span_async(sentry_init, httpx_m traces_sample_rate=1.0, trace_propagation_targets=[MATCH_ALL], integrations=[HttpxIntegration()], - trace_lifecycle="stream", ) url = "http://example.com/" @@ -694,7 +680,6 @@ def test_request_source_disabled_sync(sentry_init, capture_items, httpx_mock): traces_sample_rate=1.0, enable_http_request_source=False, http_request_source_threshold_ms=0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -723,7 +708,6 @@ async def test_request_source_disabled_async(sentry_init, capture_items, httpx_m traces_sample_rate=1.0, enable_http_request_source=False, http_request_source_threshold_ms=0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -756,7 +740,6 @@ def test_request_source_enabled_sync( "integrations": [HttpxIntegration()], "traces_sample_rate": 1.0, "http_request_source_threshold_ms": 0, - "trace_lifecycle": "stream", } if enable_http_request_source is not None: sentry_options["enable_http_request_source"] = enable_http_request_source @@ -794,7 +777,6 @@ async def test_request_source_enabled_async( "integrations": [HttpxIntegration()], "traces_sample_rate": 1.0, "http_request_source_threshold_ms": 0, - "trace_lifecycle": "stream", } if enable_http_request_source is not None: sentry_options["enable_http_request_source"] = enable_http_request_source @@ -826,7 +808,6 @@ def test_request_source_sync(sentry_init, capture_items, httpx_mock): traces_sample_rate=1.0, enable_http_request_source=True, http_request_source_threshold_ms=0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -870,7 +851,6 @@ async def test_request_source_async(sentry_init, capture_items, httpx_mock): traces_sample_rate=1.0, enable_http_request_source=True, http_request_source_threshold_ms=0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -920,7 +900,6 @@ def test_request_source_with_module_in_search_path_sync( traces_sample_rate=1.0, enable_http_request_source=True, http_request_source_threshold_ms=0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -966,7 +945,6 @@ async def test_request_source_with_module_in_search_path_async( traces_sample_rate=1.0, enable_http_request_source=True, http_request_source_threshold_ms=0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -1012,7 +990,6 @@ def test_no_request_source_if_duration_too_short_sync( enable_http_request_source=True, # Threshold so high no real request will ever exceed it http_request_source_threshold_ms=9999999, - trace_lifecycle="stream", ) items = capture_items("span") @@ -1044,7 +1021,6 @@ async def test_no_request_source_if_duration_too_short_async( enable_http_request_source=True, # Threshold so high no real request will ever exceed it http_request_source_threshold_ms=9999999, - trace_lifecycle="stream", ) items = capture_items("span") @@ -1075,7 +1051,6 @@ def test_request_source_if_duration_over_threshold_sync( enable_http_request_source=True, # Threshold of 0 means any non-zero duration qualifies http_request_source_threshold_ms=0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -1125,7 +1100,6 @@ async def test_request_source_if_duration_over_threshold_async( enable_http_request_source=True, # Threshold of 0 means any non-zero duration qualifies http_request_source_threshold_ms=0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -1169,7 +1143,6 @@ def test_span_origin_sync(sentry_init, capture_items, httpx_mock): sentry_init( integrations=[HttpxIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -1193,7 +1166,6 @@ async def test_span_origin_async(sentry_init, capture_items, httpx_mock): sentry_init( integrations=[HttpxIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -1220,7 +1192,6 @@ def test_http_url_attributes_sync( integrations=[HttpxIntegration()], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) items = capture_items("span") @@ -1258,7 +1229,6 @@ async def test_http_url_attributes_async( integrations=[HttpxIntegration()], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) items = capture_items("span") @@ -1295,7 +1265,6 @@ def test_http_url_attributes_no_query_or_fragment_sync( integrations=[HttpxIntegration()], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) items = capture_items("span") @@ -1331,7 +1300,6 @@ async def test_http_url_attributes_no_query_or_fragment_async( integrations=[HttpxIntegration()], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) items = capture_items("span") @@ -1441,7 +1409,6 @@ def test_url_query_data_collection_sync( sentry_init( integrations=[HttpxIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", **init_kwargs, ) @@ -1548,7 +1515,6 @@ async def test_url_query_data_collection_async( sentry_init( integrations=[HttpxIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", **init_kwargs, ) @@ -1598,7 +1564,6 @@ def test_url_full_reassembly_sync( sentry_init( integrations=[HttpxIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", **init_kwargs, ) @@ -1646,7 +1611,6 @@ async def test_url_full_reassembly_async( sentry_init( integrations=[HttpxIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", **init_kwargs, ) @@ -1701,7 +1665,6 @@ def test_url_query_params_off_keeps_bare_url_sync( sentry_init( integrations=[HttpxIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", **init_kwargs, ) @@ -1764,7 +1727,6 @@ async def test_url_query_params_off_keeps_bare_url_async( sentry_init( integrations=[HttpxIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", **init_kwargs, ) @@ -1845,7 +1807,6 @@ def test_crumb_url_query_data_collection_sync( sentry_init( integrations=[HttpxIntegration()], - trace_lifecycle="stream", **init_kwargs, ) @@ -1928,7 +1889,6 @@ async def test_crumb_url_query_data_collection_async( sentry_init( integrations=[HttpxIntegration()], - trace_lifecycle="stream", **init_kwargs, ) @@ -1963,7 +1923,6 @@ def test_omit_url_data_if_parsing_fails( sentry_init( integrations=[HttpxIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", _experiments={"data_collection": {}}, ) diff --git a/tests/integrations/httpx2/test_httpx2.py b/tests/integrations/httpx2/test_httpx2.py index a22c40039d..09c87113da 100644 --- a/tests/integrations/httpx2/test_httpx2.py +++ b/tests/integrations/httpx2/test_httpx2.py @@ -32,7 +32,6 @@ def before_breadcrumb(crumb, hint): sentry_init( integrations=[Httpx2Integration()], before_breadcrumb=before_breadcrumb, - trace_lifecycle="stream", send_default_pii=send_default_pii, ) @@ -89,7 +88,6 @@ def before_breadcrumb(crumb, hint): sentry_init( integrations=[Httpx2Integration()], before_breadcrumb=before_breadcrumb, - trace_lifecycle="stream", send_default_pii=send_default_pii, ) @@ -136,7 +134,6 @@ def test_crumb_capture_without_span_sync(sentry_init, capture_events, httpx2_moc sentry_init( integrations=[Httpx2Integration()], - trace_lifecycle="stream", ) url = "http://example.com/" @@ -172,7 +169,6 @@ async def test_crumb_capture_without_span_async( sentry_init( integrations=[Httpx2Integration()], - trace_lifecycle="stream", ) url = "http://example.com/" @@ -218,7 +214,6 @@ def test_crumb_capture_client_error_sync( sentry_init( integrations=[Httpx2Integration()], - trace_lifecycle="stream", send_default_pii=send_default_pii, ) @@ -281,7 +276,6 @@ async def test_crumb_capture_client_error_async( sentry_init( integrations=[Httpx2Integration()], - trace_lifecycle="stream", send_default_pii=send_default_pii, ) @@ -388,7 +382,6 @@ def test_option_trace_propagation_targets_sync( release="test", trace_propagation_targets=trace_propagation_targets, traces_sample_rate=1.0, - trace_lifecycle="stream", integrations=[Httpx2Integration()], ) @@ -466,7 +459,6 @@ async def test_option_trace_propagation_targets_async( release="test", trace_propagation_targets=trace_propagation_targets, traces_sample_rate=1.0, - trace_lifecycle="stream", integrations=[Httpx2Integration()], ) @@ -486,7 +478,6 @@ def test_outgoing_trace_headers_sync(sentry_init, capture_items, httpx2_mock): sentry_init( traces_sample_rate=1.0, integrations=[Httpx2Integration()], - trace_lifecycle="stream", ) url = "http://example.com/" @@ -516,7 +507,6 @@ async def test_outgoing_trace_headers_async(sentry_init, capture_items, httpx2_m sentry_init( traces_sample_rate=1.0, integrations=[Httpx2Integration()], - trace_lifecycle="stream", ) url = "http://example.com/" @@ -550,7 +540,6 @@ def test_outgoing_trace_headers_append_to_baggage_sync( traces_sample_rate=1.0, integrations=[Httpx2Integration()], release="d08ebdb9309e1b004c6f52202de58a09c2268e42", - trace_lifecycle="stream", ) url = "http://example.com/" @@ -584,7 +573,6 @@ async def test_outgoing_trace_headers_append_to_baggage_async( traces_sample_rate=1.0, integrations=[Httpx2Integration()], release="d08ebdb9309e1b004c6f52202de58a09c2268e42", - trace_lifecycle="stream", ) url = "http://example.com/" @@ -625,7 +613,6 @@ def test_outgoing_trace_headers_no_current_span(sentry_init, httpx2_mock): traces_sample_rate=1.0, trace_propagation_targets=[MATCH_ALL], integrations=[Httpx2Integration()], - trace_lifecycle="stream", ) url = "http://example.com/" @@ -662,7 +649,6 @@ async def test_outgoing_trace_headers_no_current_span_async(sentry_init, httpx2_ traces_sample_rate=1.0, trace_propagation_targets=[MATCH_ALL], integrations=[Httpx2Integration()], - trace_lifecycle="stream", ) url = "http://example.com/" @@ -694,7 +680,6 @@ def test_request_source_disabled_sync(sentry_init, capture_items, httpx2_mock): traces_sample_rate=1.0, enable_http_request_source=False, http_request_source_threshold_ms=0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -723,7 +708,6 @@ async def test_request_source_disabled_async(sentry_init, capture_items, httpx2_ traces_sample_rate=1.0, enable_http_request_source=False, http_request_source_threshold_ms=0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -756,7 +740,6 @@ def test_request_source_enabled_sync( "integrations": [Httpx2Integration()], "traces_sample_rate": 1.0, "http_request_source_threshold_ms": 0, - "trace_lifecycle": "stream", } if enable_http_request_source is not None: sentry_options["enable_http_request_source"] = enable_http_request_source @@ -794,7 +777,6 @@ async def test_request_source_enabled_async( "integrations": [Httpx2Integration()], "traces_sample_rate": 1.0, "http_request_source_threshold_ms": 0, - "trace_lifecycle": "stream", } if enable_http_request_source is not None: sentry_options["enable_http_request_source"] = enable_http_request_source @@ -826,7 +808,6 @@ def test_request_source_sync(sentry_init, capture_items, httpx2_mock): traces_sample_rate=1.0, enable_http_request_source=True, http_request_source_threshold_ms=0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -870,7 +851,6 @@ async def test_request_source_async(sentry_init, capture_items, httpx2_mock): traces_sample_rate=1.0, enable_http_request_source=True, http_request_source_threshold_ms=0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -920,7 +900,6 @@ def test_request_source_with_module_in_search_path_sync( traces_sample_rate=1.0, enable_http_request_source=True, http_request_source_threshold_ms=0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -966,7 +945,6 @@ async def test_request_source_with_module_in_search_path_async( traces_sample_rate=1.0, enable_http_request_source=True, http_request_source_threshold_ms=0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -1012,7 +990,6 @@ def test_no_request_source_if_duration_too_short_sync( enable_http_request_source=True, # Threshold so high no real request will ever exceed it http_request_source_threshold_ms=9999999, - trace_lifecycle="stream", ) items = capture_items("span") @@ -1044,7 +1021,6 @@ async def test_no_request_source_if_duration_too_short_async( enable_http_request_source=True, # Threshold so high no real request will ever exceed it http_request_source_threshold_ms=9999999, - trace_lifecycle="stream", ) items = capture_items("span") @@ -1075,7 +1051,6 @@ def test_request_source_if_duration_over_threshold_sync( enable_http_request_source=True, # Threshold of 0 means any non-zero duration qualifies http_request_source_threshold_ms=0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -1125,7 +1100,6 @@ async def test_request_source_if_duration_over_threshold_async( enable_http_request_source=True, # Threshold of 0 means any non-zero duration qualifies http_request_source_threshold_ms=0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -1169,7 +1143,6 @@ def test_span_origin_sync(sentry_init, capture_items, httpx2_mock): sentry_init( integrations=[Httpx2Integration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -1193,7 +1166,6 @@ async def test_span_origin_async(sentry_init, capture_items, httpx2_mock): sentry_init( integrations=[Httpx2Integration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -1217,7 +1189,6 @@ def test_http_url_attributes_sync(sentry_init, capture_items, httpx2_mock): integrations=[Httpx2Integration()], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) items = capture_items("span") @@ -1246,7 +1217,6 @@ async def test_http_url_attributes_async(sentry_init, capture_items, httpx2_mock integrations=[Httpx2Integration()], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) items = capture_items("span") @@ -1276,7 +1246,6 @@ def test_http_url_attributes_no_query_or_fragment_sync( integrations=[Httpx2Integration()], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) items = capture_items("span") @@ -1307,7 +1276,6 @@ async def test_http_url_attributes_no_query_or_fragment_async( integrations=[Httpx2Integration()], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) items = capture_items("span") @@ -1334,7 +1302,6 @@ def test_http_url_attributes_pii_disabled_sync(sentry_init, capture_items, httpx sentry_init( integrations=[Httpx2Integration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -1364,7 +1331,6 @@ async def test_http_url_attributes_pii_disabled_async( sentry_init( integrations=[Httpx2Integration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -1470,7 +1436,6 @@ def test_url_query_data_collection_sync( sentry_init( integrations=[Httpx2Integration()], traces_sample_rate=1.0, - trace_lifecycle="stream", **init_kwargs, ) @@ -1577,7 +1542,6 @@ async def test_url_query_data_collection_async( sentry_init( integrations=[Httpx2Integration()], traces_sample_rate=1.0, - trace_lifecycle="stream", **init_kwargs, ) @@ -1627,7 +1591,6 @@ def test_url_full_reassembly_sync( sentry_init( integrations=[Httpx2Integration()], traces_sample_rate=1.0, - trace_lifecycle="stream", **init_kwargs, ) @@ -1675,7 +1638,6 @@ async def test_url_full_reassembly_async( sentry_init( integrations=[Httpx2Integration()], traces_sample_rate=1.0, - trace_lifecycle="stream", **init_kwargs, ) @@ -1730,7 +1692,6 @@ def test_url_query_params_off_keeps_bare_url_sync( sentry_init( integrations=[Httpx2Integration()], traces_sample_rate=1.0, - trace_lifecycle="stream", **init_kwargs, ) @@ -1793,7 +1754,6 @@ async def test_url_query_params_off_keeps_bare_url_async( sentry_init( integrations=[Httpx2Integration()], traces_sample_rate=1.0, - trace_lifecycle="stream", **init_kwargs, ) @@ -1874,7 +1834,6 @@ def test_crumb_url_query_data_collection_sync( sentry_init( integrations=[Httpx2Integration()], - trace_lifecycle="stream", **init_kwargs, ) @@ -1957,7 +1916,6 @@ async def test_crumb_url_query_data_collection_async( sentry_init( integrations=[Httpx2Integration()], - trace_lifecycle="stream", **init_kwargs, ) @@ -1992,7 +1950,6 @@ def test_omit_url_data_if_parsing_fails( sentry_init( integrations=[Httpx2Integration()], traces_sample_rate=1.0, - trace_lifecycle="stream", _experiments={"data_collection": {}}, ) diff --git a/tests/integrations/huey/test_huey.py b/tests/integrations/huey/test_huey.py index 0f6e7b5a29..516266cc9e 100644 --- a/tests/integrations/huey/test_huey.py +++ b/tests/integrations/huey/test_huey.py @@ -28,7 +28,6 @@ def inner(init_kwargs=None): "integrations": [HueyIntegration()], "traces_sample_rate": 1.0, "send_default_pii": True, - "trace_lifecycle": "stream", } sentry_init_kwargs.update(init_kwargs or {}) sentry_init(**sentry_init_kwargs) diff --git a/tests/integrations/huggingface_hub/test_huggingface_hub.py b/tests/integrations/huggingface_hub/test_huggingface_hub.py index e03f91a1c1..5f39d3ff88 100644 --- a/tests/integrations/huggingface_hub/test_huggingface_hub.py +++ b/tests/integrations/huggingface_hub/test_huggingface_hub.py @@ -481,7 +481,6 @@ def test_text_generation( traces_sample_rate=1.0, send_default_pii=send_default_pii, integrations=[HuggingfaceHubIntegration(include_prompts=include_prompts)], - trace_lifecycle="stream", ) client = InferenceClient(model="test-model") @@ -551,7 +550,6 @@ def test_text_generation_streaming( traces_sample_rate=1.0, send_default_pii=send_default_pii, integrations=[HuggingfaceHubIntegration(include_prompts=include_prompts)], - trace_lifecycle="stream", ) client = InferenceClient(model="test-model") @@ -623,7 +621,6 @@ def test_chat_completion( traces_sample_rate=1.0, send_default_pii=send_default_pii, integrations=[HuggingfaceHubIntegration(include_prompts=include_prompts)], - trace_lifecycle="stream", ) client = get_hf_provider_inference_client() @@ -709,7 +706,6 @@ def test_chat_completion_streaming( traces_sample_rate=1.0, send_default_pii=send_default_pii, integrations=[HuggingfaceHubIntegration(include_prompts=include_prompts)], - trace_lifecycle="stream", ) client = get_hf_provider_inference_client() @@ -791,7 +787,6 @@ def test_chat_completion_api_error( ) -> None: sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", ) client = get_hf_provider_inference_client() @@ -849,7 +844,6 @@ def test_span_status_error( sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("event", "span") @@ -893,7 +887,6 @@ def test_chat_completion_with_tools( traces_sample_rate=1.0, send_default_pii=send_default_pii, integrations=[HuggingfaceHubIntegration(include_prompts=include_prompts)], - trace_lifecycle="stream", ) client = get_hf_provider_inference_client() @@ -984,7 +977,6 @@ def test_chat_completion_streaming_with_tools( traces_sample_rate=1.0, send_default_pii=send_default_pii, integrations=[HuggingfaceHubIntegration(include_prompts=include_prompts)], - trace_lifecycle="stream", ) client = get_hf_provider_inference_client() @@ -1183,7 +1175,6 @@ def test_text_generation_data_collection( traces_sample_rate=1.0, send_default_pii=send_default_pii, integrations=[HuggingfaceHubIntegration(include_prompts=include_prompts)], - trace_lifecycle="stream", ) if data_collection is not None: sentry_init_kwargs["_experiments"] = {"data_collection": data_collection} @@ -1318,7 +1309,6 @@ def test_text_generation_streaming_data_collection( traces_sample_rate=1.0, send_default_pii=send_default_pii, integrations=[HuggingfaceHubIntegration(include_prompts=include_prompts)], - trace_lifecycle="stream", ) if data_collection is not None: sentry_init_kwargs["_experiments"] = {"data_collection": data_collection} @@ -1463,7 +1453,6 @@ def test_chat_completion_data_collection_tools( traces_sample_rate=1.0, send_default_pii=send_default_pii, integrations=[HuggingfaceHubIntegration(include_prompts=include_prompts)], - trace_lifecycle="stream", ) if data_collection is not None: sentry_init_kwargs["_experiments"] = {"data_collection": data_collection} @@ -1624,7 +1613,6 @@ def test_chat_completion_streaming_data_collection_tools( traces_sample_rate=1.0, send_default_pii=send_default_pii, integrations=[HuggingfaceHubIntegration(include_prompts=include_prompts)], - trace_lifecycle="stream", ) if data_collection is not None: sentry_init_kwargs["_experiments"] = {"data_collection": data_collection} diff --git a/tests/integrations/langchain/test_langchain.py b/tests/integrations/langchain/test_langchain.py index 0faca35740..ce29d213d2 100644 --- a/tests/integrations/langchain/test_langchain.py +++ b/tests/integrations/langchain/test_langchain.py @@ -296,7 +296,6 @@ def test_langchain_text_completion( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) model_response = get_model_response( @@ -375,7 +374,6 @@ def test_langchain_chat_with_run_name( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) request_headers = {} @@ -444,7 +442,6 @@ def test_langchain_multi_choice_response( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) model_response = get_model_response( @@ -495,7 +492,6 @@ def test_langchain_tool_call_with_run_name( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) items = capture_items("span") @@ -577,7 +573,6 @@ def test_langchain_create_agent( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) model_response = get_model_response( @@ -710,7 +705,6 @@ def test_tool_execution_span( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) responses = nonstreaming_responses_tool_call_model_responses( @@ -922,7 +916,6 @@ def test_langchain_openai_tools_agent_no_prompts( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) prompt = ChatPromptTemplate.from_messages( @@ -1128,7 +1121,6 @@ def test_langchain_openai_tools_agent( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) prompt = ChatPromptTemplate.from_messages( @@ -1297,7 +1289,6 @@ def test_langchain_openai_tools_agent_with_config( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) prompt = ChatPromptTemplate.from_messages( @@ -1384,7 +1375,6 @@ def test_langchain_openai_tools_agent_stream_no_prompts( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) prompt = ChatPromptTemplate.from_messages( @@ -1594,7 +1584,6 @@ def test_langchain_openai_tools_agent_stream( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) prompt = ChatPromptTemplate.from_messages( @@ -1766,7 +1755,6 @@ def test_langchain_openai_tools_agent_stream_with_config( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) prompt = ChatPromptTemplate.from_messages( @@ -1853,7 +1841,6 @@ def _llm_type(self) -> str: disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) prompt = ChatPromptTemplate.from_messages( @@ -1910,7 +1897,6 @@ def _llm_type(self) -> str: integrations=[LangchainIntegration(include_prompts=True)], disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("event", "span") @@ -1965,7 +1951,6 @@ def test_langchain_tool_error( integrations=[LangchainIntegration(include_prompts=True)], disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) responses = nonstreaming_responses_tool_call_model_responses( @@ -2109,7 +2094,6 @@ def test_langchain_callback_manager(sentry_init): integrations=[LangchainIntegration()], disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) local_manager = BaseCallbackManager(handlers=[]) @@ -2143,7 +2127,6 @@ def test_langchain_callback_manager_with_sentry_callback(sentry_init): integrations=[LangchainIntegration()], disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) sentry_callback = SentryLangchainCallback(False) local_manager = BaseCallbackManager(handlers=[sentry_callback]) @@ -2177,7 +2160,6 @@ def test_langchain_callback_list(sentry_init): integrations=[LangchainIntegration()], disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) local_callbacks = [] @@ -2211,7 +2193,6 @@ def test_langchain_callback_list_existing_callback(sentry_init): integrations=[LangchainIntegration()], disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) sentry_callback = SentryLangchainCallback(False) local_callbacks = [sentry_callback] @@ -2277,7 +2258,6 @@ def _llm_type(self) -> str: disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) prompt = ChatPromptTemplate.from_messages( @@ -2422,7 +2402,6 @@ def test_langchain_embeddings_sync( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) items = capture_items("span") @@ -2506,7 +2485,6 @@ def test_langchain_embeddings_embed_query( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) items = capture_items("span") @@ -2586,7 +2564,6 @@ async def test_langchain_embeddings_async( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) async def mock_aembed_documents(self, texts): @@ -2665,7 +2642,6 @@ async def test_langchain_embeddings_aembed_query( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) async def mock_aembed_query(self, text): @@ -2733,7 +2709,6 @@ def test_langchain_embeddings_no_model_name( integrations=[LangchainIntegration(include_prompts=False)], disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -2787,7 +2762,6 @@ def test_langchain_embeddings_integration_disabled( sentry_init( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -2829,7 +2803,6 @@ def test_langchain_embeddings_multiple_providers( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) items = capture_items("span") @@ -2891,7 +2864,6 @@ def test_langchain_embeddings_with_list_and_string_inputs( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) items = capture_items("span") @@ -3204,7 +3176,6 @@ def test_langchain_ai_system_detection( integrations=[LangchainIntegration()], disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) callback = SentryLangchainCallback(include_prompts=True) @@ -3478,7 +3449,6 @@ def test_langchain_chat_data_collection( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) if data_collection is not None: sentry_init_kwargs["_experiments"] = {"data_collection": data_collection} @@ -3673,7 +3643,6 @@ def test_langchain_text_completion_data_collection( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) if data_collection is not None: sentry_init_kwargs["_experiments"] = {"data_collection": data_collection} @@ -3844,7 +3813,6 @@ def test_langchain_data_collection_tools( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) if data_collection is not None: sentry_init_kwargs["_experiments"] = {"data_collection": data_collection} @@ -3960,7 +3928,6 @@ def test_langchain_data_collection_request_tool_call_params( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) if data_collection is not None: sentry_init_kwargs["_experiments"] = {"data_collection": data_collection} @@ -4090,7 +4057,6 @@ def test_langchain_tool_execution_data_collection( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) if data_collection is not None: sentry_init_kwargs["_experiments"] = {"data_collection": data_collection} @@ -4253,7 +4219,6 @@ def test_langchain_agent_executor_data_collection( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) if data_collection is not None: sentry_init_kwargs["_experiments"] = {"data_collection": data_collection} @@ -4402,7 +4367,6 @@ async def test_langchain_embeddings_data_collection( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) if data_collection is not None: sentry_init_kwargs["_experiments"] = {"data_collection": data_collection} diff --git a/tests/integrations/langgraph/test_langgraph.py b/tests/integrations/langgraph/test_langgraph.py index 224edcf7b5..c0d6c182ca 100644 --- a/tests/integrations/langgraph/test_langgraph.py +++ b/tests/integrations/langgraph/test_langgraph.py @@ -170,7 +170,6 @@ def test_pregel_invoke( integrations=[LanggraphIntegration(include_prompts=include_prompts)], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) test_state = { @@ -277,7 +276,6 @@ def test_pregel_ainvoke( integrations=[LanggraphIntegration(include_prompts=include_prompts)], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) test_state = {"messages": [MockMessage("What's the weather like?", name="user")]} @@ -362,7 +360,6 @@ def test_pregel_invoke_error( integrations=[LanggraphIntegration(include_prompts=True)], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) test_state = {"messages": [MockMessage("This will fail")]} @@ -399,7 +396,6 @@ def test_pregel_ainvoke_error( integrations=[LanggraphIntegration(include_prompts=True)], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) test_state = {"messages": [MockMessage("This will fail async")]} @@ -441,7 +437,6 @@ def test_pregel_invoke_with_different_graph_names( integrations=[LanggraphIntegration()], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) pregel = MockPregelInstance(graph_name) if graph_name else MockPregelInstance() @@ -489,7 +484,6 @@ def test_pregel_invoke_span_includes_usage_data( sentry_init( integrations=[LanggraphIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) test_state = { @@ -570,7 +564,6 @@ def test_pregel_ainvoke_span_includes_usage_data( sentry_init( integrations=[LanggraphIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) test_state = { @@ -654,7 +647,6 @@ def test_pregel_invoke_multiple_llm_calls_aggregate_usage( sentry_init( integrations=[LanggraphIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) test_state = { @@ -740,7 +732,6 @@ def test_pregel_ainvoke_multiple_llm_calls_aggregate_usage( sentry_init( integrations=[LanggraphIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) test_state = { @@ -829,7 +820,6 @@ def test_pregel_invoke_span_includes_response_model( sentry_init( integrations=[LanggraphIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) test_state = { @@ -906,7 +896,6 @@ def test_pregel_ainvoke_span_includes_response_model( sentry_init( integrations=[LanggraphIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) test_state = { @@ -986,7 +975,6 @@ def test_pregel_invoke_span_uses_last_response_model( sentry_init( integrations=[LanggraphIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) test_state = { @@ -1075,7 +1063,6 @@ def test_pregel_ainvoke_span_uses_last_response_model( sentry_init( integrations=[LanggraphIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) test_state = { @@ -1212,7 +1199,6 @@ def test_extraction_functions_complex_scenario( integrations=[LanggraphIntegration(include_prompts=True)], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) pregel = MockPregelInstance("complex_graph") @@ -1292,7 +1278,6 @@ def test_langgraph_message_role_mapping( integrations=[LanggraphIntegration(include_prompts=True)], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) # Mock a langgraph message with mixed roles @@ -1433,7 +1418,6 @@ def test_pregel_invoke_gates_request_messages_on_inputs_setting( "integrations": [LanggraphIntegration()], "traces_sample_rate": 1.0, "send_default_pii": send_default_pii, - "trace_lifecycle": "stream", } if data_collection is not None: init_kwargs["_experiments"] = {"data_collection": data_collection} @@ -1519,7 +1503,6 @@ def test_pregel_invoke_gates_response_text_and_tool_calls_on_outputs_setting( "integrations": [LanggraphIntegration()], "traces_sample_rate": 1.0, "send_default_pii": send_default_pii, - "trace_lifecycle": "stream", } if data_collection is not None: init_kwargs["_experiments"] = {"data_collection": data_collection} @@ -1611,7 +1594,6 @@ def test_pregel_ainvoke_gates_inputs_and_outputs_independently( "integrations": [LanggraphIntegration()], "traces_sample_rate": 1.0, "send_default_pii": send_default_pii, - "trace_lifecycle": "stream", } if data_collection is not None: init_kwargs["_experiments"] = {"data_collection": data_collection} @@ -1673,7 +1655,6 @@ def test_pregel_invoke_message_delta_ignores_gen_ai_inputs_setting( sentry_init( integrations=[LanggraphIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", _experiments={ "data_collection": {"gen_ai": {"inputs": False, "outputs": True}} }, @@ -1742,7 +1723,6 @@ def test_pregel_ainvoke_message_delta_ignores_gen_ai_inputs_setting( sentry_init( integrations=[LanggraphIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", _experiments={ "data_collection": {"gen_ai": {"inputs": False, "outputs": True}} }, diff --git a/tests/integrations/launchdarkly/test_launchdarkly.py b/tests/integrations/launchdarkly/test_launchdarkly.py index ceb8451a8d..f456f7c99d 100644 --- a/tests/integrations/launchdarkly/test_launchdarkly.py +++ b/tests/integrations/launchdarkly/test_launchdarkly.py @@ -203,7 +203,6 @@ def test_launchdarkly_span_integration( sentry_init( traces_sample_rate=1.0, integrations=[LaunchDarklyIntegration()], - trace_lifecycle="stream", ) client = ldclient.get() diff --git a/tests/integrations/litellm/test_litellm.py b/tests/integrations/litellm/test_litellm.py index 920122d546..f054b84497 100644 --- a/tests/integrations/litellm/test_litellm.py +++ b/tests/integrations/litellm/test_litellm.py @@ -157,7 +157,6 @@ def test_nonstreaming_chat_completion( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) messages = [ @@ -256,7 +255,6 @@ async def test_async_nonstreaming_chat_completion( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) messages = [ @@ -357,7 +355,6 @@ def test_streaming_chat_completion( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) messages = [ @@ -432,7 +429,6 @@ async def test_async_streaming_chat_completion( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) messages = [ @@ -503,7 +499,6 @@ def test_embeddings_create( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) client = OpenAI(api_key="test-key") @@ -574,7 +569,6 @@ async def test_async_embeddings_create( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) client = AsyncOpenAI(api_key="test-key") @@ -640,7 +634,6 @@ def test_embeddings_create_with_list_input( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) client = OpenAI(api_key="test-key") @@ -705,7 +698,6 @@ async def test_async_embeddings_create_with_list_input( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) client = AsyncOpenAI(api_key="test-key") @@ -769,7 +761,6 @@ def test_embeddings_no_pii( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=False, # PII disabled - trace_lifecycle="stream", ) client = OpenAI(api_key="test-key") @@ -826,7 +817,6 @@ async def test_async_embeddings_no_pii( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=False, # PII disabled - trace_lifecycle="stream", ) client = AsyncOpenAI(api_key="test-key") @@ -880,7 +870,6 @@ def test_exception_handling( integrations=[LiteLLMIntegration()], disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) messages = [{"role": "user", "content": "Hello!"}] @@ -916,7 +905,6 @@ async def test_async_exception_handling( integrations=[LiteLLMIntegration()], disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) messages = [{"role": "user", "content": "Hello!"}] @@ -953,7 +941,6 @@ def test_span_origin( integrations=[LiteLLMIntegration()], disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) messages = [{"role": "user", "content": "Hello!"}] @@ -1009,7 +996,6 @@ def test_multiple_providers( integrations=[LiteLLMIntegration()], disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) messages = [{"role": "user", "content": "Hello!"}] @@ -1111,7 +1097,6 @@ async def test_async_multiple_providers( integrations=[LiteLLMIntegration()], disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) messages = [{"role": "user", "content": "Hello!"}] @@ -1214,7 +1199,6 @@ def test_additional_parameters( integrations=[LiteLLMIntegration()], disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) messages = [{"role": "user", "content": "Hello!"}] @@ -1285,7 +1269,6 @@ async def test_async_additional_parameters( integrations=[LiteLLMIntegration()], disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) messages = [{"role": "user", "content": "Hello!"}] @@ -1356,7 +1339,6 @@ def test_no_integration( sentry_init( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) messages = [{"role": "user", "content": "Hello!"}] @@ -1414,7 +1396,6 @@ async def test_async_no_integration( sentry_init( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) messages = [{"role": "user", "content": "Hello!"}] @@ -1471,7 +1452,6 @@ def test_response_without_usage( integrations=[LiteLLMIntegration()], disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) messages = [{"role": "user", "content": "Hello!"}] @@ -1514,7 +1494,6 @@ def test_integration_setup(sentry_init): integrations=[LiteLLMIntegration()], disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) # Check that callbacks are registered @@ -1540,7 +1519,6 @@ def test_binary_content_encoding_image_url( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) messages = [ @@ -1631,7 +1609,6 @@ async def test_async_binary_content_encoding_image_url( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) messages = [ @@ -1723,7 +1700,6 @@ def test_binary_content_encoding_mixed_content( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) messages = [ @@ -1803,7 +1779,6 @@ async def test_async_binary_content_encoding_mixed_content( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) messages = [ @@ -1884,7 +1859,6 @@ def test_binary_content_encoding_uri_type( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) messages = [ @@ -1968,7 +1942,6 @@ async def test_async_binary_content_encoding_uri_type( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) messages = [ @@ -2220,7 +2193,6 @@ def test_chat_completion_data_collection( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) if data_collection is not None: sentry_init_kwargs["_experiments"] = {"data_collection": data_collection} @@ -2348,7 +2320,6 @@ def test_embeddings_data_collection( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) if data_collection is not None: sentry_init_kwargs["_experiments"] = {"data_collection": data_collection} diff --git a/tests/integrations/litestar/test_litestar.py b/tests/integrations/litestar/test_litestar.py index 1c0fc83582..4f1f956782 100644 --- a/tests/integrations/litestar/test_litestar.py +++ b/tests/integrations/litestar/test_litestar.py @@ -107,7 +107,6 @@ def test_catch_exceptions( ): sentry_init( integrations=[LitestarIntegration()], - trace_lifecycle="stream", ) litestar_app = litestar_app_factory() client = TestClient(litestar_app) @@ -154,7 +153,6 @@ def test_segment_name_and_source( sentry_init( traces_sample_rate=1.0, integrations=[LitestarIntegration()], - trace_lifecycle="stream", ) litestar_app = litestar_app_factory() client = TestClient(litestar_app) @@ -180,7 +178,6 @@ def test_middleware_spans( sentry_init( traces_sample_rate=1.0, integrations=[LitestarIntegration()], - trace_lifecycle="stream", ) logging_config = LoggingMiddlewareConfig() @@ -237,7 +234,6 @@ async def do_stuff(message): sentry_init( traces_sample_rate=1.0, integrations=[LitestarIntegration()], - trace_lifecycle="stream", ) litestar_app = litestar_app_factory(middleware=[SampleMiddleware]) @@ -318,7 +314,6 @@ async def __call__(self, scope, receive, send): sentry_init( traces_sample_rate=1.0, integrations=[LitestarIntegration()], - trace_lifecycle="stream", ) litestar_app = litestar_app_factory(middleware=[SampleReceiveSendMiddleware]) @@ -354,7 +349,6 @@ async def my_send(*args, **kwargs): sentry_init( traces_sample_rate=1.0, integrations=[LitestarIntegration()], - trace_lifecycle="stream", ) litestar_app = litestar_app_factory(middleware=[SamplePartialReceiveSendMiddleware]) @@ -424,7 +418,6 @@ def test_span_origin( sentry_init( integrations=[LitestarIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) logging_config = LoggingMiddlewareConfig() @@ -473,7 +466,6 @@ async def __call__(self, scope, receive, send): sentry_init( integrations=[LitestarIntegration()], - trace_lifecycle="stream", **init_kwargs, ) @@ -520,7 +512,6 @@ def test_configurable_status_codes_handler( ) sentry_init( integrations=[LitestarIntegration(**integration_kwargs)], - trace_lifecycle="stream", ) @get("/error") @@ -554,7 +545,6 @@ def test_configurable_status_codes_middleware( sentry_init( integrations=[LitestarIntegration(**integration_kwargs)], - trace_lifecycle="stream", ) def create_raising_middleware(app): @@ -583,7 +573,6 @@ def test_catch_non_http_exceptions_in_middleware( ): sentry_init( integrations=[LitestarIntegration()], - trace_lifecycle="stream", ) def create_raising_middleware(app): diff --git a/tests/integrations/mcp/test_mcp.py b/tests/integrations/mcp/test_mcp.py index 8e0c9ca3e7..48305fa04a 100644 --- a/tests/integrations/mcp/test_mcp.py +++ b/tests/integrations/mcp/test_mcp.py @@ -151,7 +151,6 @@ def test_integration_patches_server(sentry_init): sentry_init( integrations=[MCPIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) assert Server.call_tool is not original_call_tool @@ -172,7 +171,6 @@ async def test_tool_handler_constructor_registration(sentry_init, capture_items, sentry_init( integrations=[MCPIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) async def test_tool(ctx, params): @@ -217,7 +215,6 @@ async def test_mcpserver_high_level_tool_instrumented( sentry_init( integrations=[MCPIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) mcp_server = MCPServer("test-server") @@ -252,7 +249,6 @@ async def test_wrapping_handler_is_idempotent(sentry_init, capture_items, stdio) sentry_init( integrations=[MCPIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) async def test_tool(ctx, params): @@ -299,7 +295,6 @@ async def test_tool_handler_stdio( integrations=[MCPIntegration(include_prompts=include_prompts)], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) server = Server("test-server") @@ -390,7 +385,6 @@ async def test_tool_handler_streamable_http( integrations=[MCPIntegration(include_prompts=include_prompts)], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) server = Server("test-server") @@ -485,7 +479,6 @@ async def test_tool_handler_stateless_streamable_http( sentry_init( integrations=[MCPIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) server = Server("test-server") @@ -540,7 +533,6 @@ async def test_tool_handler_with_error(sentry_init, capture_items, stdio): sentry_init( integrations=[MCPIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) server = Server("test-server") @@ -605,7 +597,6 @@ async def test_prompt_handler_stdio( integrations=[MCPIntegration(include_prompts=include_prompts)], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) server = Server("test-server") @@ -690,7 +681,6 @@ async def test_prompt_handler_streamable_http( integrations=[MCPIntegration(include_prompts=include_prompts)], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) server = Server("test-server") @@ -766,7 +756,6 @@ async def test_prompt_handler_with_error(sentry_init, capture_items, stdio): sentry_init( integrations=[MCPIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) server = Server("test-server") @@ -816,7 +805,6 @@ async def test_resource_handler_stdio(sentry_init, capture_items, stdio): sentry_init( integrations=[MCPIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) server = Server("test-server") @@ -885,7 +873,6 @@ async def test_resource_handler_streamable_http(sentry_init, capture_items, json sentry_init( integrations=[MCPIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) server = Server("test-server") @@ -960,7 +947,6 @@ async def test_resource_handler_with_error(sentry_init, capture_items, stdio): sentry_init( integrations=[MCPIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) server = Server("test-server") @@ -1018,7 +1004,6 @@ async def test_tool_result_extraction_tuple( integrations=[MCPIntegration(include_prompts=include_prompts)], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) server = Server("test-server") @@ -1086,7 +1071,6 @@ async def test_tool_result_extraction_unstructured( integrations=[MCPIntegration(include_prompts=include_prompts)], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) server = Server("test-server") @@ -1142,7 +1126,6 @@ async def test_multiple_handlers(sentry_init, capture_items, stdio): sentry_init( integrations=[MCPIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) server = Server("test-server") @@ -1261,7 +1244,6 @@ async def test_prompt_with_dict_result( integrations=[MCPIntegration(include_prompts=include_prompts)], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) server = Server("test-server") @@ -1325,7 +1307,6 @@ async def test_tool_with_complex_arguments(sentry_init, capture_items, stdio): sentry_init( integrations=[MCPIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) server = Server("test-server") @@ -1380,7 +1361,6 @@ async def test_sse_transport_detection(sentry_init, capture_items, json_rpc_sse) sentry_init( integrations=[MCPIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) server = Server("test-server") @@ -1471,7 +1451,6 @@ async def test_sse_transport_detection_v2(sentry_init, capture_items, json_rpc_s sentry_init( integrations=[MCPIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) server = Server("test-server") @@ -1549,7 +1528,6 @@ async def test_streamable_http_scope_propagation(sentry_init, capture_items, jso sentry_init( integrations=[MCPIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) server = Server("test-server") @@ -1655,7 +1633,6 @@ async def test_tool_data_collection_inputs( "integrations": [MCPIntegration()], "traces_sample_rate": 1.0, "send_default_pii": send_default_pii, - "trace_lifecycle": "stream", } if data_collection is not None: init_kwargs["_experiments"] = {"data_collection": data_collection} @@ -1761,7 +1738,6 @@ async def test_tool_data_collection_outputs( "integrations": [MCPIntegration()], "traces_sample_rate": 1.0, "send_default_pii": send_default_pii, - "trace_lifecycle": "stream", } if data_collection is not None: init_kwargs["_experiments"] = {"data_collection": data_collection} @@ -1870,7 +1846,6 @@ async def test_prompt_data_collection_inputs( "integrations": [MCPIntegration()], "traces_sample_rate": 1.0, "send_default_pii": send_default_pii, - "trace_lifecycle": "stream", } if data_collection is not None: init_kwargs["_experiments"] = {"data_collection": data_collection} @@ -1942,7 +1917,6 @@ async def test_include_prompts_ignored_when_data_collection_set( integrations=[MCPIntegration(include_prompts=False)], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", _experiments={"data_collection": {"gen_ai": {"outputs": True}}}, ) diff --git a/tests/integrations/openai/test_openai.py b/tests/integrations/openai/test_openai.py index 851671ecf8..ca62898288 100644 --- a/tests/integrations/openai/test_openai.py +++ b/tests/integrations/openai/test_openai.py @@ -176,7 +176,6 @@ def test_chat_completion_tool_definitions( integrations=[OpenAIIntegration()], disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) client = OpenAI(api_key="z") @@ -275,7 +274,6 @@ def test_nonstreaming_chat_completion_no_prompts( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) client = OpenAI(api_key="z") @@ -424,7 +422,6 @@ def test_nonstreaming_chat_completion( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) client = OpenAI(api_key="z") @@ -548,7 +545,6 @@ def test_completions_api_data_collection( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, _experiments={"data_collection": data_collection}, - trace_lifecycle="stream", ) client = OpenAI(api_key="z") @@ -657,7 +653,6 @@ def test_completions_api_data_collection_outputs( "disabled_integrations": [StdlibIntegration], "traces_sample_rate": 1.0, "send_default_pii": send_default_pii, - "trace_lifecycle": "stream", } if data_collection is not None: init_kwargs["_experiments"] = {"data_collection": data_collection} @@ -752,7 +747,6 @@ async def test_completions_api_data_collection_outputs_async( "disabled_integrations": [StdlibIntegration], "traces_sample_rate": 1.0, "send_default_pii": send_default_pii, - "trace_lifecycle": "stream", } if data_collection is not None: init_kwargs["_experiments"] = {"data_collection": data_collection} @@ -801,7 +795,6 @@ def test_completions_api_data_collection_outputs_empty_choices( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, _experiments={"data_collection": {"gen_ai": {"outputs": True}}}, - trace_lifecycle="stream", ) client = OpenAI(api_key="z") @@ -868,7 +861,6 @@ def test_streaming_chat_completion_data_collection_outputs( traces_sample_rate=1.0, send_default_pii=False, _experiments={"data_collection": data_collection}, - trace_lifecycle="stream", ) client = OpenAI(api_key="z") @@ -953,7 +945,6 @@ async def test_streaming_chat_completion_data_collection_outputs_async( traces_sample_rate=1.0, send_default_pii=False, _experiments={"data_collection": data_collection}, - trace_lifecycle="stream", ) client = AsyncOpenAI(api_key="z") @@ -1027,7 +1018,6 @@ async def test_nonstreaming_chat_completion_async_no_prompts( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) client = AsyncOpenAI(api_key="z") @@ -1174,7 +1164,6 @@ async def test_nonstreaming_chat_completion_async( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) client = AsyncOpenAI(api_key="z") @@ -1271,7 +1260,6 @@ def test_streaming_chat_completion_no_prompts( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) client = OpenAI(api_key="z") @@ -1391,7 +1379,6 @@ def test_streaming_chat_completion_with_usage_in_stream( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=False, - trace_lifecycle="stream", ) client = OpenAI(api_key="z") @@ -1473,7 +1460,6 @@ def test_streaming_chat_completion_empty_content_preserves_token_usage( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=False, - trace_lifecycle="stream", ) client = OpenAI(api_key="z") @@ -1538,7 +1524,6 @@ async def test_streaming_chat_completion_empty_content_preserves_token_usage_asy disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=False, - trace_lifecycle="stream", ) client = AsyncOpenAI(api_key="z") @@ -1605,7 +1590,6 @@ async def test_streaming_chat_completion_async_with_usage_in_stream( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=False, - trace_lifecycle="stream", ) client = AsyncOpenAI(api_key="z") @@ -1778,7 +1762,6 @@ def test_streaming_chat_completion( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) client = OpenAI(api_key="z") @@ -1921,7 +1904,6 @@ async def test_streaming_chat_completion_async_no_prompts( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) client = AsyncOpenAI(api_key="z") @@ -2136,7 +2118,6 @@ async def test_streaming_chat_completion_async( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) client = AsyncOpenAI(api_key="z") @@ -2263,7 +2244,6 @@ def test_bad_chat_completion( integrations=[OpenAIIntegration()], disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("event", "span") @@ -2292,7 +2272,6 @@ def test_span_status_error( integrations=[OpenAIIntegration()], disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("event", "span") @@ -2323,7 +2302,6 @@ async def test_bad_chat_completion_async( integrations=[OpenAIIntegration()], disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) client = AsyncOpenAI(api_key="z") @@ -2363,7 +2341,6 @@ def test_embeddings_create_no_pii( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) client = OpenAI(api_key="z") @@ -2477,7 +2454,6 @@ def test_embeddings_create( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) client = OpenAI(api_key="z") @@ -2576,7 +2552,6 @@ def test_embeddings_create_data_collection( "disabled_integrations": [StdlibIntegration], "traces_sample_rate": 1.0, "send_default_pii": send_default_pii, - "trace_lifecycle": "stream", } sentry_init_kwargs = dict(init_kwargs) @@ -2638,7 +2613,6 @@ def test_embeddings_create_data_collection_inputs_disabled_input_shapes( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", _experiments={"data_collection": {"gen_ai": {"inputs": False}}}, ) @@ -2688,7 +2662,6 @@ async def test_embeddings_create_async_no_pii( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) client = AsyncOpenAI(api_key="z") @@ -2805,7 +2778,6 @@ async def test_embeddings_create_async( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) client = AsyncOpenAI(api_key="z") @@ -2886,7 +2858,6 @@ async def test_embeddings_create_async_data_collection( "disabled_integrations": [StdlibIntegration], "traces_sample_rate": 1.0, "send_default_pii": send_default_pii, - "trace_lifecycle": "stream", } sentry_init_kwargs = dict(init_kwargs) @@ -2949,7 +2920,6 @@ def test_embeddings_create_raises_error( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) client = OpenAI(api_key="z") @@ -2985,7 +2955,6 @@ async def test_embeddings_create_raises_error_async( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) client = AsyncOpenAI(api_key="z") @@ -3013,7 +2982,6 @@ def test_span_origin_nonstreaming_chat( sentry_init( integrations=[OpenAIIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) client = OpenAI(api_key="z") @@ -3051,7 +3019,6 @@ async def test_span_origin_nonstreaming_chat_async( integrations=[OpenAIIntegration()], disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) client = AsyncOpenAI(api_key="z") @@ -3087,7 +3054,6 @@ def test_span_origin_streaming_chat( integrations=[OpenAIIntegration()], disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) client = OpenAI(api_key="z") @@ -3151,7 +3117,6 @@ async def test_span_origin_streaming_chat_async( integrations=[OpenAIIntegration()], disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) client = AsyncOpenAI(api_key="z") @@ -3220,7 +3185,6 @@ def test_span_origin_embeddings( integrations=[OpenAIIntegration()], disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) client = OpenAI(api_key="z") @@ -3254,7 +3218,6 @@ async def test_span_origin_embeddings_async( integrations=[OpenAIIntegration()], disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) client = AsyncOpenAI(api_key="z") @@ -3650,7 +3613,6 @@ def test_ai_client_span_responses_api_no_pii( integrations=[OpenAIIntegration()], disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) client = OpenAI(api_key="z") @@ -3707,7 +3669,6 @@ def test_ai_client_span_responses_tool_definitions( integrations=[OpenAIIntegration()], disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) client = OpenAI(api_key="z") @@ -3923,7 +3884,6 @@ def test_ai_client_span_responses_api( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) client = OpenAI(api_key="z") @@ -4113,7 +4073,6 @@ def test_responses_api_data_collection( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, _experiments={"data_collection": data_collection}, - trace_lifecycle="stream", ) client = OpenAI(api_key="z") @@ -4256,7 +4215,6 @@ def test_responses_api_data_collection_outputs( "disabled_integrations": [StdlibIntegration], "traces_sample_rate": 1.0, "send_default_pii": send_default_pii, - "trace_lifecycle": "stream", } if data_collection is not None: init_kwargs["_experiments"] = {"data_collection": data_collection} @@ -4351,7 +4309,6 @@ def test_responses_api_data_collection_outputs_shapes( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, _experiments={"data_collection": {"gen_ai": {"outputs": True}}}, - trace_lifecycle="stream", ) client = OpenAI(api_key="z") @@ -4410,7 +4367,6 @@ def test_streaming_responses_api_data_collection_outputs( traces_sample_rate=1.0, send_default_pii=False, _experiments={"data_collection": data_collection}, - trace_lifecycle="stream", ) client = OpenAI(api_key="z") @@ -4467,7 +4423,6 @@ def test_responses_api_conversation_id( integrations=[OpenAIIntegration()], disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) client = OpenAI(api_key="z") @@ -4509,7 +4464,6 @@ def test_responses_api_reasoning_level( integrations=[OpenAIIntegration()], disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) client = OpenAI(api_key="z") @@ -4544,7 +4498,6 @@ def test_error_in_responses_api( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) client = OpenAI(api_key="z") @@ -4731,7 +4684,6 @@ async def test_ai_client_span_responses_async_api( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) client = AsyncOpenAI(api_key="z") @@ -4944,7 +4896,6 @@ async def test_ai_client_span_streaming_responses_async_api( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) client = AsyncOpenAI(api_key="z") @@ -5024,7 +4975,6 @@ async def test_error_in_responses_async_api( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) client = AsyncOpenAI(api_key="z") @@ -5149,7 +5099,6 @@ def test_streaming_responses_api( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) client = OpenAI(api_key="z") @@ -5229,7 +5178,6 @@ async def test_streaming_responses_api_async( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) client = AsyncOpenAI(api_key="z") @@ -5308,7 +5256,6 @@ def test_chat_completion_reasoning_level( integrations=[OpenAIIntegration()], disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) client = OpenAI(api_key="z") @@ -5374,7 +5321,6 @@ def test_openai_message_role_mapping( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) client = OpenAI(api_key="z") @@ -5423,7 +5369,6 @@ def test_streaming_chat_completion_ttft( integrations=[OpenAIIntegration()], disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) client = OpenAI(api_key="z") @@ -5504,7 +5449,6 @@ async def test_streaming_chat_completion_ttft_async( integrations=[OpenAIIntegration()], disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) client = AsyncOpenAI(api_key="z") @@ -5586,7 +5530,6 @@ def test_streaming_responses_api_ttft( integrations=[OpenAIIntegration()], disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) client = OpenAI(api_key="z") @@ -5638,7 +5581,6 @@ async def test_streaming_responses_api_ttft_async( integrations=[OpenAIIntegration()], disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) client = AsyncOpenAI(api_key="z") diff --git a/tests/integrations/openai_agents/test_openai_agents.py b/tests/integrations/openai_agents/test_openai_agents.py index 47e2b3d332..6d525ba7ac 100644 --- a/tests/integrations/openai_agents/test_openai_agents.py +++ b/tests/integrations/openai_agents/test_openai_agents.py @@ -393,7 +393,6 @@ def some_function(a: str, b: list[int]) -> str: disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=False, - trace_lifecycle="stream", ) items = capture_items("span") @@ -444,7 +443,6 @@ async def test_agent_invocation_span_no_pii( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=False, - trace_lifecycle="stream", ) items = capture_items("span") @@ -576,7 +574,6 @@ async def test_invoke_agent_span_data_collection_inputs( integrations=[OpenAIAgentsIntegration()], disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", **init_kwargs, ) @@ -677,7 +674,6 @@ async def test_invoke_agent_span_data_collection_outputs( integrations=[OpenAIAgentsIntegration()], disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", **init_kwargs, ) @@ -777,7 +773,6 @@ async def test_data_collection_inputs( "send_default_pii": send_default_pii, } init_kwargs["disabled_integrations"] = [StdlibIntegration] - init_kwargs["trace_lifecycle"] = "stream" if data_collection is not None: init_kwargs["_experiments"] = {"data_collection": data_collection} @@ -914,7 +909,6 @@ async def test_data_collection_outputs( "send_default_pii": send_default_pii, } init_kwargs["disabled_integrations"] = [StdlibIntegration] - init_kwargs["trace_lifecycle"] = "stream" if data_collection is not None: init_kwargs["_experiments"] = {"data_collection": data_collection} @@ -1184,7 +1178,6 @@ async def test_agent_invocation_span( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) items = capture_items("span") @@ -1270,7 +1263,6 @@ async def test_client_span_custom_model( integrations=[OpenAIAgentsIntegration()], disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -1320,7 +1312,6 @@ def test_agent_invocation_span_sync_no_pii( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=False, - trace_lifecycle="stream", ) items = capture_items("span") @@ -1588,7 +1579,6 @@ def test_agent_invocation_span_sync( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) items = capture_items("span") @@ -1748,7 +1738,6 @@ async def test_handoff_span( integrations=[OpenAIAgentsIntegration()], disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -1883,7 +1872,6 @@ async def test_max_turns_before_handoff_span( integrations=[OpenAIAgentsIntegration()], disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -1983,7 +1971,6 @@ async def test_tool_execution_span( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) items = capture_items("span") @@ -2254,7 +2241,6 @@ async def test_run_streamed_tool_execution_span( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) items = capture_items("span") @@ -2375,7 +2361,6 @@ async def inner(tool, run_kwargs=None, **init_kwargs): integrations=[OpenAIAgentsIntegration()], disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", **init_kwargs, ) @@ -2585,7 +2570,6 @@ async def test_hosted_mcp_tool_propagation_header_streamed( integrations=[OpenAIAgentsIntegration()], traces_sample_rate=1.0, release="d08ebdb9309e1b004c6f52202de58a09c2268e42", - trace_lifecycle="stream", ) request_headers = {"X-Stainless-Raw-Response": "stream"} @@ -2753,7 +2737,6 @@ async def test_hosted_mcp_tool_propagation_headers( integrations=[OpenAIAgentsIntegration()], traces_sample_rate=1.0, release="d08ebdb9309e1b004c6f52202de58a09c2268e42", - trace_lifecycle="stream", ) response = get_model_response(EXAMPLE_RESPONSE, serialize_pydantic=True) @@ -2858,7 +2841,6 @@ async def test_model_behavior_error( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) items = capture_items("span") @@ -2909,7 +2891,6 @@ async def test_run_error_handling( ], disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("event", "span") @@ -2961,7 +2942,6 @@ async def test_run_streamed_error_handling( ], disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("event", "span") @@ -3025,7 +3005,6 @@ async def test_error_captures_input_data( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) items = capture_items("event", "span") @@ -3074,7 +3053,6 @@ async def test_span_status_error( ], disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("event", "span") @@ -3123,7 +3101,6 @@ async def test_multiple_agents_asyncio( integrations=[OpenAIAgentsIntegration()], disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -3165,7 +3142,6 @@ def test_openai_agents_message_role_mapping(sentry_init, test_message, expected_ sentry_init( integrations=[OpenAIAgentsIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", send_default_pii=True, ) @@ -3265,7 +3241,6 @@ def failing_tool(message: str) -> str: disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) items = capture_items("span") @@ -3364,7 +3339,6 @@ async def test_invoke_agent_span_includes_usage_data( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) items = capture_items("span") @@ -3465,7 +3439,6 @@ async def test_ai_client_span_includes_response_model( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) items = capture_items("span") @@ -3555,7 +3528,6 @@ async def test_ai_client_span_response_model_with_chat_completions( integrations=[OpenAIAgentsIntegration()], disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -3684,7 +3656,6 @@ def calculator(a: int, b: int) -> int: disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) items = capture_items("span") @@ -3782,7 +3753,6 @@ async def test_invoke_agent_span_includes_response_model( disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) items = capture_items("span") @@ -3908,7 +3878,6 @@ def calculator(a: int, b: int) -> int: disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) items = capture_items("span") @@ -3951,7 +3920,6 @@ async def test_streaming_span_update_captures_response_data( integrations=[OpenAIAgentsIntegration()], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) # Create a mock streaming response object (similar to what we'd get from ResponseCompletedEvent) @@ -4020,7 +3988,6 @@ async def test_streaming_ttft_on_chat_span( sentry_init( integrations=[OpenAIAgentsIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) request_headers = {"X-Stainless-Raw-Response": "stream"} @@ -4163,7 +4130,6 @@ async def test_conversation_id_on_all_spans( integrations=[OpenAIAgentsIntegration()], disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -4299,7 +4265,6 @@ def simple_tool(message: str) -> str: integrations=[OpenAIAgentsIntegration()], disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -4360,7 +4325,6 @@ async def test_no_conversation_id_when_not_provided( integrations=[OpenAIAgentsIntegration()], disabled_integrations=[StdlibIntegration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -4421,7 +4385,6 @@ async def test_runner_run_with_starting_agent_kwarg( sentry_init( integrations=[OpenAIAgentsIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -4531,7 +4494,6 @@ async def test_runner_run_streamed_with_starting_agent_kwarg( sentry_init( integrations=[OpenAIAgentsIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") diff --git a/tests/integrations/openfeature/test_openfeature.py b/tests/integrations/openfeature/test_openfeature.py index 81a4f8b610..73fc7c8f3a 100644 --- a/tests/integrations/openfeature/test_openfeature.py +++ b/tests/integrations/openfeature/test_openfeature.py @@ -162,7 +162,6 @@ def test_openfeature_span_integration( sentry_init( traces_sample_rate=1.0, integrations=[OpenFeatureIntegration()], - trace_lifecycle="stream", ) api.set_provider( diff --git a/tests/integrations/pydantic_ai/test_pydantic_ai.py b/tests/integrations/pydantic_ai/test_pydantic_ai.py index c17d34bb13..d11ce8076b 100644 --- a/tests/integrations/pydantic_ai/test_pydantic_ai.py +++ b/tests/integrations/pydantic_ai/test_pydantic_ai.py @@ -91,7 +91,6 @@ async def test_agent_run_async( integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) test_agent = get_test_agent() @@ -148,7 +147,6 @@ async def test_agent_run_async_model_error( sentry_init( integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) def failing_model(messages, info): @@ -186,7 +184,6 @@ def test_agent_run_sync( integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) test_agent = get_test_agent() @@ -219,7 +216,6 @@ def test_agent_run_sync_model_error( sentry_init( integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) def failing_model(messages, info): @@ -257,7 +253,6 @@ async def test_agent_run_stream( integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) test_agent = get_test_agent() @@ -319,7 +314,6 @@ async def test_agent_run_stream_events( integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) # Consume all events @@ -362,7 +356,6 @@ async def test_agent_with_tools( integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) test_agent = get_test_agent() @@ -432,7 +425,6 @@ async def test_agent_with_tool_model_retry( ], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) retries = 0 @@ -521,7 +513,6 @@ async def test_agent_with_tool_validation_error( ], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) test_agent = get_test_agent() @@ -573,7 +564,6 @@ async def test_agent_with_tools_streaming( integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) test_agent = get_test_agent() @@ -620,7 +610,6 @@ async def test_model_settings( sentry_init( integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) test_agent_with_settings = get_test_agent_with_settings() @@ -673,7 +662,6 @@ async def test_system_prompt_attribute( integrations=[PydanticAIIntegration(include_prompts=include_prompts)], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) items = capture_items("span") @@ -722,7 +710,6 @@ async def test_error_handling( sentry_init( integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -749,7 +736,6 @@ async def test_without_pii( integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, send_default_pii=False, - trace_lifecycle="stream", ) items = capture_items("span") @@ -783,7 +769,6 @@ async def test_without_pii_tools( integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, send_default_pii=False, - trace_lifecycle="stream", ) test_agent = get_test_agent() @@ -825,7 +810,6 @@ async def test_multiple_agents_concurrent( sentry_init( integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) test_agent = get_test_agent() @@ -865,7 +849,6 @@ async def test_message_history( integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) # Second message with history @@ -913,7 +896,6 @@ async def test_gen_ai_system( sentry_init( integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) test_agent = get_test_agent() @@ -949,7 +931,6 @@ async def test_include_prompts_false( integrations=[PydanticAIIntegration(include_prompts=False)], traces_sample_rate=1.0, send_default_pii=True, # Even with PII enabled, prompts should not be captured - trace_lifecycle="stream", ) test_agent = get_test_agent() @@ -984,7 +965,6 @@ async def test_include_prompts_true( integrations=[PydanticAIIntegration(include_prompts=True)], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) test_agent = get_test_agent() @@ -1018,7 +998,6 @@ async def test_include_prompts_false_with_tools( integrations=[PydanticAIIntegration(include_prompts=False)], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) test_agent = get_test_agent() @@ -1061,7 +1040,6 @@ async def test_include_prompts_requires_pii( integrations=[PydanticAIIntegration(include_prompts=True)], traces_sample_rate=1.0, send_default_pii=False, # PII disabled - trace_lifecycle="stream", ) test_agent = get_test_agent() @@ -1093,7 +1071,6 @@ async def test_context_cleanup_after_run(sentry_init, get_test_agent): sentry_init( integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) # Verify context is not set before run @@ -1117,7 +1094,6 @@ def test_context_cleanup_after_run_sync(sentry_init, get_test_agent, sync_event_ sentry_init( integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) # Verify context is not set before run @@ -1142,7 +1118,6 @@ async def test_context_cleanup_after_streaming(sentry_init, get_test_agent): sentry_init( integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) # Verify context is not set before run @@ -1169,7 +1144,6 @@ async def test_context_cleanup_on_error(sentry_init, get_test_agent): sentry_init( integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) test_agent = get_test_agent() @@ -1204,7 +1178,6 @@ async def test_context_isolation_concurrent_agents(sentry_init, get_test_agent): sentry_init( integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) # Create a second agent @@ -1263,7 +1236,6 @@ async def test_invoke_agent_with_list_user_prompt( integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) items = capture_items("span") @@ -1314,7 +1286,6 @@ async def test_invoke_agent_with_instructions( integrations=[PydanticAIIntegration(include_prompts=include_prompts)], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) items = capture_items("span") @@ -1360,7 +1331,6 @@ async def test_model_name_extraction_with_callable( sentry_init( integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) # Test the utility function directly @@ -1390,7 +1360,6 @@ async def test_model_name_extraction_fallback_to_str( sentry_init( integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) # Test the utility function directly @@ -1423,7 +1392,6 @@ async def test_usage_data_partial( sentry_init( integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -1461,7 +1429,6 @@ async def test_agent_data_from_scope( sentry_init( integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -1486,7 +1453,6 @@ async def test_available_tools_without_description( sentry_init( integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) test_agent = get_test_agent() @@ -1526,7 +1492,6 @@ async def test_output_with_tool_calls( integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) test_agent = get_test_agent() @@ -1575,7 +1540,6 @@ async def test_message_formatting_with_different_parts( integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) # Create message history with different part types @@ -1624,7 +1588,6 @@ async def test_update_invoke_agent_span_with_none_output( sentry_init( integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", send_default_pii=True, ) @@ -1651,7 +1614,6 @@ async def test_update_ai_client_span_with_none_response( sentry_init( integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) span = sentry_sdk.traces.start_span(name="test_span") @@ -1676,7 +1638,6 @@ async def test_agent_without_name( sentry_init( integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -1700,7 +1661,6 @@ async def test_input_messages_error_handling( sentry_init( integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", send_default_pii=True, ) @@ -1730,7 +1690,6 @@ async def test_available_tools_error_handling( sentry_init( integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) span = sentry_sdk.traces.start_span(name="test_span") @@ -1758,7 +1717,6 @@ async def test_set_usage_data_with_none_usage( sentry_init( integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) span = sentry_sdk.traces.start_span(name="test_span") @@ -1784,7 +1742,6 @@ async def test_set_usage_data_with_partial_fields( sentry_init( integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) span = sentry_sdk.traces.start_span(name="test_span") @@ -1825,7 +1782,6 @@ def test_tool(x: int) -> int: integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) items = capture_items("span") @@ -1857,7 +1813,6 @@ async def test_message_parts_with_list_content( sentry_init( integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", send_default_pii=True, ) @@ -1890,7 +1845,6 @@ async def test_output_data_transformations( integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) def response_model(messages, info): @@ -1970,7 +1924,6 @@ async def test_output_data_error_handling( sentry_init( integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", send_default_pii=True, ) @@ -2003,7 +1956,6 @@ async def test_message_with_system_prompt_part( sentry_init( integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", send_default_pii=True, ) @@ -2038,7 +1990,6 @@ async def test_message_with_instructions( sentry_init( integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", send_default_pii=True, ) @@ -2071,7 +2022,6 @@ async def test_set_input_messages_without_prompts( sentry_init( integrations=[PydanticAIIntegration(include_prompts=False)], traces_sample_rate=1.0, - trace_lifecycle="stream", send_default_pii=True, ) @@ -2098,7 +2048,6 @@ async def test_get_model_name_with_exception_in_callable( sentry_init( integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) # Create model with callable name that raises exception @@ -2124,7 +2073,6 @@ async def test_get_model_name_with_string_model( sentry_init( integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) # Pass a string as model @@ -2146,7 +2094,6 @@ async def test_get_model_name_with_none( sentry_init( integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) # Pass None @@ -2171,7 +2118,6 @@ async def test_should_send_prompts_without_pii( sentry_init( integrations=[PydanticAIIntegration(include_prompts=True)], traces_sample_rate=1.0, - trace_lifecycle="stream", send_default_pii=False, # PII disabled, ) @@ -2195,7 +2141,6 @@ async def test_set_available_tools_without_toolset( sentry_init( integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) span = sentry_sdk.traces.start_span(name="test_span") @@ -2225,7 +2170,6 @@ async def test_set_available_tools_with_schema( sentry_init( integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) span = sentry_sdk.traces.start_span(name="test_span") @@ -2261,7 +2205,6 @@ async def test_execute_tool_span_creation( sentry_init( integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", send_default_pii=True, ) @@ -2285,7 +2228,6 @@ async def test_execute_tool_span_with_mcp_type( sentry_init( integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", send_default_pii=True, ) @@ -2310,7 +2252,6 @@ async def test_execute_tool_span_without_prompts( sentry_init( integrations=[PydanticAIIntegration(include_prompts=False)], traces_sample_rate=1.0, - trace_lifecycle="stream", send_default_pii=True, ) @@ -2332,7 +2273,6 @@ async def test_execute_tool_span_with_none_args( sentry_init( integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", send_default_pii=True, ) @@ -2355,7 +2295,6 @@ async def test_update_execute_tool_span_with_none_span( sentry_init( integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) # Update with None span - should not raise @@ -2380,7 +2319,6 @@ async def test_update_execute_tool_span_with_none_result( sentry_init( integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", send_default_pii=True, ) @@ -2403,7 +2341,6 @@ async def test_tool_execution_without_span_context( sentry_init( integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) # Create a simple agent with no tools (won't have function_toolset) @@ -2436,7 +2373,6 @@ async def test_invoke_agent_span_with_callable_instruction( sentry_init( integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", send_default_pii=True, ) @@ -2468,7 +2404,6 @@ async def test_invoke_agent_span_with_string_instructions( sentry_init( integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", send_default_pii=True, ) @@ -2496,7 +2431,6 @@ async def test_ai_client_span_with_streaming_flag( sentry_init( integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) # Set streaming flag in scope @@ -2523,7 +2457,6 @@ async def test_ai_client_span_gets_agent_from_scope( sentry_init( integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) # Set agent in scope @@ -2571,7 +2504,6 @@ async def test_binary_content_encoding_image( integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) items = capture_items("span") @@ -2607,7 +2539,6 @@ async def test_binary_content_encoding_mixed_content( integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) items = capture_items("span") @@ -2654,7 +2585,6 @@ async def test_binary_content_in_agent_run( integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) binary_content = BinaryContent( @@ -2687,7 +2617,6 @@ async def test_set_usage_data_with_cache_tokens( sentry_init( integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -2766,7 +2695,6 @@ def test_image_url_base64_content_in_span( integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) found_image = False @@ -2841,7 +2769,6 @@ async def test_invoke_agent_image_url( integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) agent = Agent("test", name="test_image_url_agent") @@ -2893,7 +2820,6 @@ def multiply_numbers(a: int, b: int) -> int: integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) items = capture_items("span") @@ -3014,7 +2940,6 @@ async def test_data_collection_gen_ai_inputs_gates_request_messages_tool_inputs_ "integrations": [PydanticAIIntegration(include_prompts=include_prompts)], "traces_sample_rate": 1.0, "send_default_pii": send_default_pii, - "trace_lifecycle": "stream", } if data_collection is not None: init_kwargs["_experiments"] = {"data_collection": data_collection} @@ -3142,7 +3067,6 @@ async def test_data_collection_gen_ai_outputs_gates_response_text_and_tool_outpu "integrations": [PydanticAIIntegration(include_prompts=include_prompts)], "traces_sample_rate": 1.0, "send_default_pii": send_default_pii, - "trace_lifecycle": "stream", } if data_collection is not None: init_kwargs["_experiments"] = {"data_collection": data_collection} @@ -3240,7 +3164,6 @@ async def test_data_collection_gen_ai_output_message_parts_follow_outputs_gate( sentry_init( integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", _experiments={"data_collection": {"gen_ai": gen_ai}}, ) @@ -3303,7 +3226,6 @@ async def test_data_collection_gen_ai_request_messages_keep_tool_returns_when_ou sentry_init( integrations=[PydanticAIIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", _experiments={ "data_collection": {"gen_ai": {"inputs": True, "outputs": False}} }, diff --git a/tests/integrations/pymongo/test_pymongo.py b/tests/integrations/pymongo/test_pymongo.py index d65251cb8d..ee5a4a1f85 100644 --- a/tests/integrations/pymongo/test_pymongo.py +++ b/tests/integrations/pymongo/test_pymongo.py @@ -66,7 +66,6 @@ def test_segment(sentry_init, capture_items, mongo_server, with_pii): integrations=[PyMongoIntegration()], traces_sample_rate=1.0, send_default_pii=with_pii, - trace_lifecycle="stream", ) items = capture_items("span") @@ -139,7 +138,6 @@ def test_segment_with_data_collection( sentry_init( integrations=[PyMongoIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", **init_kwargs, ) items = capture_items("span") @@ -187,7 +185,6 @@ def test_breadcrumbs(sentry_init, capture_items, mongo_server, with_pii): integrations=[PyMongoIntegration()], traces_sample_rate=1.0, send_default_pii=with_pii, - trace_lifecycle="stream", ) items = capture_items("event") @@ -231,7 +228,6 @@ def test_breadcrumbs_with_data_collection( sentry_init( integrations=[PyMongoIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", **init_kwargs, ) items = capture_items("event") @@ -556,7 +552,6 @@ def test_span_origin(sentry_init, capture_items, mongo_server): sentry_init( integrations=[PyMongoIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -579,7 +574,6 @@ def test_status_on_success(sentry_init, capture_items, mongo_server): sentry_init( integrations=[PyMongoIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -600,7 +594,6 @@ def test_status_on_failure(sentry_init, capture_items, mongo_server): sentry_init( integrations=[PyMongoIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") diff --git a/tests/integrations/pyramid/test_pyramid.py b/tests/integrations/pyramid/test_pyramid.py index 8c6f6d0ed3..54d28c24ac 100644 --- a/tests/integrations/pyramid/test_pyramid.py +++ b/tests/integrations/pyramid/test_pyramid.py @@ -137,7 +137,6 @@ def test_transaction_style( sentry_init( integrations=[PyramidIntegration(transaction_style=transaction_style)], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("event", "span") @@ -162,7 +161,6 @@ def test_http_route( sentry_init( integrations=[PyramidIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -479,7 +477,6 @@ def test_tracing_error( sentry_init( integrations=[PyramidIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("event", "span") @@ -519,7 +516,6 @@ def test_span_origin( sentry_init( integrations=[PyramidIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("event", "span") @@ -547,7 +543,6 @@ def test_span_sets_user_id_on_segment( sentry_init( integrations=[PyramidIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", **init_kwargs, ) diff --git a/tests/integrations/pyreqwest/test_pyreqwest.py b/tests/integrations/pyreqwest/test_pyreqwest.py index 48fed1f09f..42b778a5c4 100644 --- a/tests/integrations/pyreqwest/test_pyreqwest.py +++ b/tests/integrations/pyreqwest/test_pyreqwest.py @@ -70,7 +70,6 @@ def test_sync_client_spans( integrations=[PyreqwestIntegration()], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) url = f"http://localhost:{server_port}/hello?q=test#frag" @@ -116,7 +115,6 @@ async def test_async_client_spans( integrations=[PyreqwestIntegration()], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) url = f"http://localhost:{server_port}/hello" @@ -154,7 +152,6 @@ def test_sync_simple_request_spans( integrations=[PyreqwestIntegration()], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) url = f"http://localhost:{server_port}/hello-simple" @@ -192,7 +189,6 @@ async def test_async_simple_request_spans( integrations=[PyreqwestIntegration()], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) url = f"http://localhost:{server_port}/hello-simple-async" @@ -226,7 +222,6 @@ def test_span_origin( sentry_init( integrations=[PyreqwestIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) url = f"http://localhost:{server_port}/origin" @@ -250,7 +245,6 @@ def test_outgoing_trace_headers( integrations=[PyreqwestIntegration()], traces_sample_rate=1.0, trace_propagation_targets=["localhost"], - trace_lifecycle="stream", ) url = f"http://localhost:{server_port}/trace" @@ -288,7 +282,6 @@ def test_outgoing_trace_headers_append_to_baggage( traces_sample_rate=1.0, trace_propagation_targets=["localhost"], release="d08ebdb9309e1b004c6f52202de58a09c2268e42", - trace_lifecycle="stream", ) url = f"http://localhost:{server_port}/baggage" @@ -345,7 +338,6 @@ def test_trace_propagation_targets( integrations=[PyreqwestIntegration()], trace_propagation_targets=trace_propagation_targets, traces_sample_rate=1.0, - trace_lifecycle="stream", ) url = f"http://localhost:{server_port}/propagation" @@ -371,7 +363,6 @@ def test_omit_url_data_if_parsing_fails( sentry_init( integrations=[PyreqwestIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) url = f"http://localhost:{server_port}/parse-fail" @@ -407,7 +398,6 @@ def test_request_source_disabled( traces_sample_rate=1.0, enable_http_request_source=False, http_request_source_threshold_ms=0, - trace_lifecycle="stream", ) url = f"http://localhost:{server_port}/hello" @@ -439,7 +429,6 @@ def test_request_source_enabled( "integrations": [PyreqwestIntegration()], "traces_sample_rate": 1.0, "http_request_source_threshold_ms": 0, - "trace_lifecycle": "stream", } if enable_http_request_source is not None: sentry_options["enable_http_request_source"] = enable_http_request_source @@ -474,7 +463,6 @@ def test_request_source( traces_sample_rate=1.0, enable_http_request_source=True, http_request_source_threshold_ms=0, - trace_lifecycle="stream", ) url = f"http://localhost:{server_port}/hello" @@ -515,7 +503,6 @@ def test_request_source_with_module_in_search_path( traces_sample_rate=1.0, enable_http_request_source=True, http_request_source_threshold_ms=0, - trace_lifecycle="stream", ) url = f"http://localhost:{server_port}/hello" @@ -553,7 +540,6 @@ def test_no_request_source_if_duration_too_short( traces_sample_rate=1.0, enable_http_request_source=True, http_request_source_threshold_ms=100, - trace_lifecycle="stream", ) url = f"http://localhost:{server_port}/hello" @@ -600,7 +586,6 @@ def test_request_source_if_duration_over_threshold( traces_sample_rate=1.0, enable_http_request_source=True, http_request_source_threshold_ms=100, - trace_lifecycle="stream", ) url = f"http://localhost:{server_port}/hello" @@ -652,7 +637,6 @@ def before_breadcrumb(crumb, hint): integrations=[PyreqwestIntegration()], before_breadcrumb=before_breadcrumb, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) url = f"http://localhost:{server_port}/hello?q=test#frag" @@ -695,7 +679,6 @@ async def test_async_crumb_capture( sentry_init( integrations=[PyreqwestIntegration()], send_default_pii=send_default_pii, - trace_lifecycle="stream", ) url = f"http://localhost:{server_port}/hello?q=test#frag" @@ -865,7 +848,6 @@ def test_url_query_data_collection_sync( sentry_init( integrations=[PyreqwestIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", **init_kwargs, ) @@ -976,7 +958,6 @@ async def test_url_query_data_collection_async( sentry_init( integrations=[PyreqwestIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", **init_kwargs, ) @@ -1035,7 +1016,6 @@ def test_url_full_reassembly_sync( sentry_init( integrations=[PyreqwestIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", **init_kwargs, ) @@ -1093,7 +1073,6 @@ async def test_url_full_reassembly_async( sentry_init( integrations=[PyreqwestIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", **init_kwargs, ) @@ -1153,7 +1132,6 @@ def test_url_query_params_off_keeps_bare_url_sync( sentry_init( integrations=[PyreqwestIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", **init_kwargs, ) @@ -1221,7 +1199,6 @@ async def test_url_query_params_off_keeps_bare_url_async( sentry_init( integrations=[PyreqwestIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", **init_kwargs, ) @@ -1288,7 +1265,6 @@ def test_crumb_url_query_data_collection_sync( ): sentry_init( integrations=[PyreqwestIntegration()], - trace_lifecycle="stream", **init_kwargs, ) @@ -1358,7 +1334,6 @@ async def test_crumb_url_query_data_collection_async( ): sentry_init( integrations=[PyreqwestIntegration()], - trace_lifecycle="stream", **init_kwargs, ) @@ -1398,7 +1373,6 @@ def test_omit_url_data_if_parsing_fails_data_collection( sentry_init( integrations=[PyreqwestIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", _experiments={"data_collection": {}}, ) diff --git a/tests/integrations/quart/test_quart.py b/tests/integrations/quart/test_quart.py index fbf230dba4..a4e4f00427 100644 --- a/tests/integrations/quart/test_quart.py +++ b/tests/integrations/quart/test_quart.py @@ -149,7 +149,6 @@ async def test_http_route( sentry_init( integrations=[quart_sentry.QuartIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) app = quart_app_factory() @@ -540,7 +539,6 @@ async def test_tracing_success(sentry_init, capture_items): sentry_init( traces_sample_rate=1.0, integrations=[quart_sentry.QuartIntegration()], - trace_lifecycle="stream", ) app = quart_app_factory() @@ -577,7 +575,6 @@ async def test_tracing_error(sentry_init, capture_items): sentry_init( traces_sample_rate=1.0, integrations=[quart_sentry.QuartIntegration()], - trace_lifecycle="stream", ) app = quart_app_factory() @@ -635,7 +632,6 @@ async def test_span_origin(sentry_init, capture_items): sentry_init( integrations=[quart_sentry.QuartIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) app = quart_app_factory() items = capture_items("span") @@ -655,7 +651,6 @@ async def test_basic(sentry_init, capture_items): sentry_init( integrations=[quart_sentry.QuartIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -702,7 +697,6 @@ async def test_transaction_style( quart_sentry.QuartIntegration(transaction_style=transaction_style) ], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -727,7 +721,6 @@ async def test_with_error(sentry_init, capture_items): sentry_init( integrations=[quart_sentry.QuartIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("event", "span") @@ -771,7 +764,6 @@ async def test_request_attributes_no_pii(sentry_init, capture_items): integrations=[quart_sentry.QuartIntegration()], traces_sample_rate=1.0, send_default_pii=False, - trace_lifecycle="stream", ) items = capture_items("span") @@ -802,7 +794,6 @@ async def test_request_attributes_with_pii(sentry_init, capture_items): integrations=[quart_sentry.QuartIntegration()], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) items = capture_items("span") @@ -950,7 +941,6 @@ async def test_sensitive_header_scrubbing( integrations=[quart_sentry.QuartIntegration()], traces_sample_rate=1.0, send_default_pii=options["send_default_pii"], - trace_lifecycle="stream", _experiments={ "data_collection": options["data_collection"], }, @@ -996,7 +986,6 @@ async def test_sensitive_header_without_data_collection(sentry_init, capture_ite integrations=[quart_sentry.QuartIntegration()], traces_sample_rate=1.0, send_default_pii=False, - trace_lifecycle="stream", ) items = capture_items("span") @@ -1039,7 +1028,6 @@ async def test_quart_auth_user_id( integrations=[quart_sentry.QuartIntegration()], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) items = capture_items("span") @@ -1144,7 +1132,6 @@ async def test_quart_auth_user_id_data_collection( sentry_init( integrations=[quart_sentry.QuartIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", _experiments=kwargs.pop("_experiments", {}), **kwargs, ) @@ -1184,7 +1171,6 @@ async def test_request_attributes_data_collection( sentry_init( integrations=[quart_sentry.QuartIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", _experiments=kwargs.pop("_experiments", {}), **kwargs, ) @@ -1217,7 +1203,6 @@ async def test_sensitive_header_passthrough_with_pii_and_no_data_collection( integrations=[quart_sentry.QuartIntegration()], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) items = capture_items("span") @@ -1323,7 +1308,6 @@ async def test_url_query_data_collection( sentry_init( integrations=[quart_sentry.QuartIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", _experiments=experiments, **kwargs, ) @@ -1366,7 +1350,6 @@ async def test_url_query_multi_and_blank_values(sentry_init, capture_items): sentry_init( integrations=[quart_sentry.QuartIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", _experiments={"data_collection": {}}, ) items = capture_items("span") diff --git a/tests/integrations/ray/test_ray.py b/tests/integrations/ray/test_ray.py index 05a1e39d8c..924cc3b908 100644 --- a/tests/integrations/ray/test_ray.py +++ b/tests/integrations/ray/test_ray.py @@ -46,7 +46,6 @@ def setup_sentry(transport=None): integrations=[RayIntegration()], transport=RayTestTransport() if transport is None else transport, traces_sample_rate=1.0, - trace_lifecycle="stream", ) @@ -170,7 +169,6 @@ def test_tracing_in_ray_tasks( disabled_integrations=[StdlibIntegration], transport=RayTestTransport(), traces_sample_rate=1.0, - trace_lifecycle="stream", ) # Setup ray task, calling decorator directly instead of @, @@ -245,7 +243,6 @@ def test_errors_in_ray_tasks(): disabled_integrations=[StdlibIntegration], transport=RayTestTransport(), traces_sample_rate=1.0, - trace_lifecycle="stream", ) ray_temp_dir = os.path.join("/tmp", f"ray_test_{uuid.uuid4().hex[:8]}") @@ -298,7 +295,6 @@ def test_tracing_in_ray_actors( disabled_integrations=[StdlibIntegration], transport=RayTestTransport(), traces_sample_rate=1.0, - trace_lifecycle="stream", ) # Setup ray actor @@ -373,7 +369,6 @@ def test_errors_in_ray_actors(): disabled_integrations=[StdlibIntegration], transport=RayLoggingTransport(), traces_sample_rate=1.0, - trace_lifecycle="stream", ) ray_temp_dir = os.path.join("/tmp", f"ray_test_{uuid.uuid4().hex[:8]}") diff --git a/tests/integrations/redis/asyncio/test_redis_asyncio.py b/tests/integrations/redis/asyncio/test_redis_asyncio.py index 1716bad85c..72d0ae262c 100644 --- a/tests/integrations/redis/asyncio/test_redis_asyncio.py +++ b/tests/integrations/redis/asyncio/test_redis_asyncio.py @@ -54,7 +54,6 @@ async def test_async_redis_pipeline( integrations=[RedisIntegration()], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) connection = FakeRedis() @@ -91,7 +90,6 @@ async def test_async_span_origin(sentry_init, capture_events, capture_items): sentry_init( integrations=[RedisIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) connection = FakeRedis() diff --git a/tests/integrations/redis/cluster/test_redis_cluster.py b/tests/integrations/redis/cluster/test_redis_cluster.py index dadfe7cd41..81d3b6a8e2 100644 --- a/tests/integrations/redis/cluster/test_redis_cluster.py +++ b/tests/integrations/redis/cluster/test_redis_cluster.py @@ -74,7 +74,6 @@ def test_rediscluster_basic( integrations=[RedisIntegration()], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) items = capture_items("span") @@ -124,7 +123,6 @@ def test_rediscluster_pipeline( integrations=[RedisIntegration()], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) rc = redis.RedisCluster(host="localhost", port=6379) @@ -165,7 +163,6 @@ def test_rediscluster_span_origin( sentry_init( integrations=[RedisIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) rc = redis.RedisCluster(host="localhost", port=6379) diff --git a/tests/integrations/redis/cluster_asyncio/test_redis_cluster_asyncio.py b/tests/integrations/redis/cluster_asyncio/test_redis_cluster_asyncio.py index 97abfa617e..83c2dca022 100644 --- a/tests/integrations/redis/cluster_asyncio/test_redis_cluster_asyncio.py +++ b/tests/integrations/redis/cluster_asyncio/test_redis_cluster_asyncio.py @@ -80,7 +80,6 @@ async def test_async_basic( integrations=[RedisIntegration()], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) connection = cluster.RedisCluster(host="localhost", port=6379) @@ -125,7 +124,6 @@ async def test_async_redis_pipeline( integrations=[RedisIntegration()], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) connection = cluster.RedisCluster(host="localhost", port=6379) @@ -159,7 +157,6 @@ async def test_async_span_origin(sentry_init, capture_items): sentry_init( integrations=[RedisIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) connection = cluster.RedisCluster(host="localhost", port=6379) diff --git a/tests/integrations/redis/test_redis.py b/tests/integrations/redis/test_redis.py index abc6a0d86e..c3a7cce69f 100644 --- a/tests/integrations/redis/test_redis.py +++ b/tests/integrations/redis/test_redis.py @@ -61,7 +61,6 @@ def test_redis_pipeline( integrations=[RedisIntegration()], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) connection = FakeRedis() @@ -112,7 +111,6 @@ def test_redis_pipeline_data_collection( sentry_init( integrations=[RedisIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", _experiments={"data_collection": data_collection}, ) @@ -151,7 +149,6 @@ def test_sensitive_data( integrations=[RedisIntegration()], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) connection = FakeRedis() @@ -178,7 +175,6 @@ def test_pii_data_redacted( sentry_init( integrations=[RedisIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) connection = FakeRedis() @@ -229,7 +225,6 @@ def test_data_collection_database_query_data( sentry_init( integrations=[RedisIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", _experiments={"data_collection": data_collection}, ) @@ -275,7 +270,6 @@ def test_database_query_data_takes_precedence_over_send_default_pii( integrations=[RedisIntegration()], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", _experiments={"data_collection": data_collection}, ) @@ -302,7 +296,6 @@ def test_pii_data_sent(sentry_init, capture_items): integrations=[RedisIntegration()], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) connection = FakeRedis() @@ -341,7 +334,6 @@ def test_no_data_truncation_by_default(sentry_init, capture_items): integrations=[RedisIntegration()], traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) connection = FakeRedis() @@ -420,7 +412,6 @@ def test_db_connection_attributes_client(sentry_init, capture_items): sentry_init( traces_sample_rate=1.0, integrations=[RedisIntegration()], - trace_lifecycle="stream", ) items = capture_items("span") @@ -450,7 +441,6 @@ def test_db_connection_attributes_pipeline(sentry_init, capture_items): sentry_init( traces_sample_rate=1.0, integrations=[RedisIntegration()], - trace_lifecycle="stream", ) items = capture_items("span") @@ -483,7 +473,6 @@ def test_span_origin(sentry_init, capture_items): sentry_init( integrations=[RedisIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) connection = FakeRedis() diff --git a/tests/integrations/redis/test_redis_cache_module.py b/tests/integrations/redis/test_redis_cache_module.py index f8beae5da5..92f7421841 100644 --- a/tests/integrations/redis/test_redis_cache_module.py +++ b/tests/integrations/redis/test_redis_cache_module.py @@ -19,7 +19,6 @@ def test_no_cache_basic(sentry_init, capture_events, capture_items): RedisIntegration(), ], traces_sample_rate=1.0, - trace_lifecycle="stream", ) connection = FakeRedis() @@ -45,7 +44,6 @@ def test_cache_basic(sentry_init, capture_events, capture_items): ), ], traces_sample_rate=1.0, - trace_lifecycle="stream", ) connection = FakeRedis() @@ -114,7 +112,6 @@ def test_cache_keys(sentry_init, capture_events, capture_items): ), ], traces_sample_rate=1.0, - trace_lifecycle="stream", ) connection = FakeRedis() @@ -165,7 +162,6 @@ def test_cache_data(sentry_init, capture_events, capture_items): ), ], traces_sample_rate=1.0, - trace_lifecycle="stream", ) # Use a unique host per parametrized run so fakeredis (which shares state @@ -247,7 +243,6 @@ def test_cache_prefixes(sentry_init, capture_events, capture_items): ), ], traces_sample_rate=1.0, - trace_lifecycle="stream", ) connection = FakeRedis() diff --git a/tests/integrations/redis/test_redis_cache_module_async.py b/tests/integrations/redis/test_redis_cache_module_async.py index b56eb9478d..5fc89b432b 100644 --- a/tests/integrations/redis/test_redis_cache_module_async.py +++ b/tests/integrations/redis/test_redis_cache_module_async.py @@ -29,7 +29,6 @@ async def test_no_cache_basic(sentry_init, capture_events, capture_items): RedisIntegration(), ], traces_sample_rate=1.0, - trace_lifecycle="stream", ) connection = FakeRedisAsync() @@ -54,7 +53,6 @@ async def test_cache_basic(sentry_init, capture_events, capture_items): ), ], traces_sample_rate=1.0, - trace_lifecycle="stream", ) connection = FakeRedisAsync() @@ -81,7 +79,6 @@ async def test_cache_keys(sentry_init, capture_events, capture_items): ), ], traces_sample_rate=1.0, - trace_lifecycle="stream", ) connection = FakeRedisAsync() @@ -131,7 +128,6 @@ async def test_cache_data(sentry_init, capture_events, capture_items): ), ], traces_sample_rate=1.0, - trace_lifecycle="stream", ) # Use a unique host per parametrized run so fakeredis (which shares state diff --git a/tests/integrations/requests/test_requests.py b/tests/integrations/requests/test_requests.py index 6a3da970b6..427494202a 100644 --- a/tests/integrations/requests/test_requests.py +++ b/tests/integrations/requests/test_requests.py @@ -16,7 +16,6 @@ def test_crumb_capture(sentry_init, capture_events, send_default_pii): sentry_init( integrations=[StdlibIntegration()], send_default_pii=send_default_pii, - trace_lifecycle="stream", ) events = capture_events() @@ -63,7 +62,6 @@ def test_crumb_capture_client_error( sentry_init( integrations=[StdlibIntegration()], send_default_pii=send_default_pii, - trace_lifecycle="stream", ) events = capture_events() @@ -106,7 +104,6 @@ def test_crumb_capture_client_error( def test_omit_url_data_if_parsing_fails(sentry_init, capture_events): sentry_init( integrations=[StdlibIntegration()], - trace_lifecycle="stream", send_default_pii=True, ) diff --git a/tests/integrations/rq/test_rq.py b/tests/integrations/rq/test_rq.py index e4582de0bc..de95bffb3e 100644 --- a/tests/integrations/rq/test_rq.py +++ b/tests/integrations/rq/test_rq.py @@ -56,7 +56,6 @@ def test_basic( sentry_init( integrations=[RqIntegration()], send_default_pii=send_default_pii, - trace_lifecycle="stream", ) queue = rq.Queue(connection=FakeRedis()) @@ -103,7 +102,6 @@ def test_job_args_kwargs_data_collection( ): sentry_init( integrations=[RqIntegration()], - trace_lifecycle="stream", **init_kwargs, ) @@ -132,7 +130,6 @@ def test_transport_shutdown( ): sentry_init( integrations=[RqIntegration()], - trace_lifecycle="stream", ) queue = rq.Queue(connection=FakeRedis()) @@ -160,7 +157,6 @@ def test_worker_span_with_error( integrations=[RqIntegration()], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) queue = rq.Queue(connection=FakeRedis()) @@ -205,7 +201,6 @@ def test_error_has_trace_context_if_tracing_disabled( ): sentry_init( integrations=[RqIntegration()], - trace_lifecycle="stream", ) queue = rq.Queue(connection=FakeRedis()) @@ -227,7 +222,6 @@ def test_tracing_enabled( sentry_init( integrations=[RqIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) queue = rq.Queue(connection=FakeRedis()) @@ -268,7 +262,6 @@ def test_tracing_disabled( ): sentry_init( integrations=[RqIntegration()], - trace_lifecycle="stream", ) queue = rq.Queue(connection=FakeRedis()) @@ -293,7 +286,6 @@ def test_worker_span_no_error( integrations=[RqIntegration()], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) queue = rq.Queue(connection=FakeRedis()) @@ -323,7 +315,6 @@ def test_traces_sampler_gets_correct_values_in_sampling_context( sentry_init( integrations=[RqIntegration()], traces_sampler=traces_sampler, - trace_lifecycle="stream", ) queue = rq.Queue(connection=FakeRedis()) @@ -359,7 +350,6 @@ def test_job_with_retries( ): sentry_init( integrations=[RqIntegration()], - trace_lifecycle="stream", ) queue = rq.Queue(connection=FakeRedis()) @@ -380,7 +370,6 @@ def test_span_origin( sentry_init( integrations=[RqIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) queue = rq.Queue(connection=FakeRedis()) diff --git a/tests/integrations/rust_tracing/test_rust_tracing.py b/tests/integrations/rust_tracing/test_rust_tracing.py index 06354519da..f8c76d6f30 100644 --- a/tests/integrations/rust_tracing/test_rust_tracing.py +++ b/tests/integrations/rust_tracing/test_rust_tracing.py @@ -76,7 +76,6 @@ def test_on_new_span_on_close( sentry_init( integrations=[integration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") with sentry_sdk.traces.start_span(name="custom parent"): @@ -127,7 +126,6 @@ def test_nested_on_new_span_on_close( sentry_init( integrations=[integration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") with sentry_sdk.traces.start_span(name="custom parent"): @@ -201,7 +199,6 @@ def test_on_new_span_without_active_span(sentry_init): sentry_init( integrations=[integration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) assert sentry_sdk.traces.get_current_span() is None @@ -225,7 +222,6 @@ def test_on_event_exception( sentry_init( integrations=[integration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("event") sentry_sdk.get_isolation_scope().clear_breadcrumbs() @@ -267,7 +263,6 @@ def test_on_event_breadcrumb( sentry_init( integrations=[integration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("event") sentry_sdk.get_isolation_scope().clear_breadcrumbs() @@ -303,7 +298,6 @@ def test_on_event_event( sentry_init( integrations=[integration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("event") sentry_sdk.get_isolation_scope().clear_breadcrumbs() @@ -345,7 +339,6 @@ def test_on_event_ignored( sentry_init( integrations=[integration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") sentry_sdk.get_isolation_scope().clear_breadcrumbs() @@ -385,7 +378,6 @@ def span_filter(metadata: Dict[str, object]) -> bool: sentry_init( integrations=[integration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") with sentry_sdk.traces.start_span(name="custom parent"): @@ -425,7 +417,6 @@ def test_record( sentry_init( integrations=[integration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) with sentry_sdk.traces.start_span(name="custom parent"): rust_tracing.new_span(RustTracingLevel.Info, 3) @@ -456,7 +447,6 @@ def span_filter(metadata: Dict[str, object]) -> bool: sentry_init( integrations=[integration], traces_sample_rate=1.0, - trace_lifecycle="stream", ) with sentry_sdk.traces.start_span(name="custom parent"): rust_tracing.new_span(RustTracingLevel.Info, 3) @@ -500,7 +490,6 @@ def test_include_tracing_fields( integrations=[integration], traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) with sentry_sdk.traces.start_span(name="custom parent"): rust_tracing.new_span(RustTracingLevel.Info, 3) diff --git a/tests/integrations/sanic/test_sanic.py b/tests/integrations/sanic/test_sanic.py index 8a278dcffe..7a3ef06fa6 100644 --- a/tests/integrations/sanic/test_sanic.py +++ b/tests/integrations/sanic/test_sanic.py @@ -414,7 +414,6 @@ def test_transactions( integrations=[SanicIntegration()], traces_sample_rate=1.0, send_default_pii=send_pii, - trace_lifecycle="stream", ) items = capture_items("span") @@ -475,7 +474,6 @@ def test_span_origin(sentry_init, app, capture_items): sentry_init( integrations=[SanicIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -510,7 +508,6 @@ def child_span_handler(request): integrations=[SanicIntegration()], default_integrations=False, traces_sample_rate=1.0, - trace_lifecycle="stream", **init_kwargs, ) @@ -545,7 +542,6 @@ def test_client_address_span_attribute_data_collection( integrations=[SanicIntegration()], default_integrations=False, traces_sample_rate=1.0, - trace_lifecycle="stream", **init_kwargs, ) @@ -652,7 +648,6 @@ def test_url_query_data_collection( sentry_init( integrations=[SanicIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", **init_kwargs, ) diff --git a/tests/integrations/socket/test_socket.py b/tests/integrations/socket/test_socket.py index 8484ebac61..cc7016cf9c 100644 --- a/tests/integrations/socket/test_socket.py +++ b/tests/integrations/socket/test_socket.py @@ -11,7 +11,6 @@ def test_getaddrinfo_trace(sentry_init, capture_items): sentry_init( integrations=[SocketIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -37,7 +36,6 @@ def test_create_connection_trace(sentry_init, capture_items): sentry_init( integrations=[SocketIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -67,7 +65,6 @@ def test_span_origin(sentry_init, capture_items): sentry_init( integrations=[SocketIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") diff --git a/tests/integrations/sqlalchemy/test_sqlalchemy.py b/tests/integrations/sqlalchemy/test_sqlalchemy.py index a8e809c71f..0a19ece92f 100644 --- a/tests/integrations/sqlalchemy/test_sqlalchemy.py +++ b/tests/integrations/sqlalchemy/test_sqlalchemy.py @@ -21,7 +21,6 @@ def test_orm_queries( ): sentry_init( integrations=[SqlalchemyIntegration()], - trace_lifecycle="stream", _experiments={ "record_sql_params": True, }, @@ -88,7 +87,6 @@ def test_transactions( ): sentry_init( integrations=[SqlalchemyIntegration()], - trace_lifecycle="stream", _experiments={ "record_sql_params": True, }, @@ -172,7 +170,6 @@ def test_transactions_no_engine_url( ): sentry_init( integrations=[SqlalchemyIntegration()], - trace_lifecycle="stream", _experiments={ "record_sql_params": True, }, @@ -239,7 +236,6 @@ def test_long_sql_query_preserved( sentry_init( traces_sample_rate=1, integrations=[SqlalchemyIntegration()], - trace_lifecycle="stream", ) engine = create_engine( @@ -262,7 +258,6 @@ def test_engine_name_not_string( ): sentry_init( integrations=[SqlalchemyIntegration()], - trace_lifecycle="stream", ) engine = create_engine( @@ -283,7 +278,6 @@ def test_query_source_disabled( "traces_sample_rate": 1.0, "enable_db_query_source": False, "db_query_source_threshold_ms": 0, - "trace_lifecycle": "stream", } sentry_init(**sentry_options) @@ -338,7 +332,6 @@ def test_query_source_enabled( "integrations": [SqlalchemyIntegration()], "traces_sample_rate": 1.0, "db_query_source_threshold_ms": 0, - "trace_lifecycle": "stream", } if enable_db_query_source is not None: @@ -395,7 +388,6 @@ def test_query_source( traces_sample_rate=1.0, enable_db_query_source=True, db_query_source_threshold_ms=0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -464,7 +456,6 @@ def test_query_source_with_module_in_search_path( traces_sample_rate=1.0, enable_db_query_source=True, db_query_source_threshold_ms=0, - trace_lifecycle="stream", ) from sqlalchemy_helpers.helpers import ( @@ -539,7 +530,6 @@ def test_no_query_source_if_duration_too_short( traces_sample_rate=1.0, enable_db_query_source=True, db_query_source_threshold_ms=100, - trace_lifecycle="stream", ) items = capture_items("span") @@ -608,7 +598,6 @@ def test_query_source_if_duration_over_threshold( traces_sample_rate=1.0, enable_db_query_source=True, db_query_source_threshold_ms=100, - trace_lifecycle="stream", ) items = capture_items("span") @@ -694,7 +683,6 @@ def test_span_origin( sentry_init( integrations=[SqlalchemyIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) engine = create_engine( diff --git a/tests/integrations/starlette/test_starlette.py b/tests/integrations/starlette/test_starlette.py index 41b905746f..f6e043935b 100644 --- a/tests/integrations/starlette/test_starlette.py +++ b/tests/integrations/starlette/test_starlette.py @@ -293,7 +293,6 @@ async def test_request_info_json_body(sentry_init, capture_items): traces_sample_rate=1.0, send_default_pii=True, integrations=[StarletteIntegration()], - trace_lifecycle="stream", ) starlette_app = starlette_app_factory() @@ -336,7 +335,6 @@ async def test_formdata_request_body(sentry_init, capture_items): send_default_pii=True, max_request_body_size="always", integrations=[StarletteIntegration()], - trace_lifecycle="stream", ) starlette_app = starlette_app_factory() @@ -381,7 +379,6 @@ async def test_request_body_too_big(sentry_init, capture_items): traces_sample_rate=1.0, send_default_pii=True, integrations=[StarletteIntegration()], - trace_lifecycle="stream", ) starlette_app = starlette_app_factory() @@ -427,7 +424,6 @@ async def test_formdata_request_body_data_collection_http_bodies_empty( traces_sample_rate=1.0, max_request_body_size="always", integrations=[StarletteIntegration()], - trace_lifecycle="stream", _experiments={"data_collection": {"http_bodies": []}}, ) @@ -476,7 +472,6 @@ async def test_request_body_data_collection( sentry_init( traces_sample_rate=1.0, integrations=[StarletteIntegration()], - trace_lifecycle="stream", _experiments=( {} if data_collection is None else {"data_collection": data_collection} ), @@ -514,7 +509,6 @@ async def test_request_info_no_pii(sentry_init, capture_items): traces_sample_rate=1.0, send_default_pii=False, integrations=[StarletteIntegration()], - trace_lifecycle="stream", ) starlette_app = starlette_app_factory() @@ -653,7 +647,6 @@ async def test_cookie_data_collection( sentry_init( traces_sample_rate=1.0, integrations=[StarletteIntegration()], - trace_lifecycle="stream", **init_kwargs, ) @@ -712,7 +705,6 @@ def test_query_string_data_collection( sentry_init( traces_sample_rate=1.0, integrations=[StarletteIntegration()], - trace_lifecycle="stream", **init_kwargs, ) @@ -776,7 +768,6 @@ def test_span_http_query_data_collection( auto_enabling_integrations=False, integrations=[StarletteIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", **init_kwargs, ) @@ -856,7 +847,6 @@ def test_user_info_data_collection( auto_enabling_integrations=False, integrations=[StarletteIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", **kwargs, ) @@ -933,7 +923,6 @@ def test_host_route_path_has_url_source(sentry_init, capture_items): sentry_init( integrations=[StarletteIntegration(transaction_style="url")], traces_sample_rate=1.0, - trace_lifecycle="stream", ) async def hosted_endpoint(request): @@ -1062,7 +1051,6 @@ def test_user_information(sentry_init, capture_events, init_kwargs, expect_user) sentry_init( traces_sample_rate=1.0, integrations=[StarletteIntegration()], - trace_lifecycle="stream", **init_kwargs, ) starlette_app = starlette_app_factory( @@ -1095,7 +1083,6 @@ def test_user_information_does_not_clobber_app_set_user(sentry_init, capture_eve traces_sample_rate=1.0, send_default_pii=True, integrations=[StarletteIntegration()], - trace_lifecycle="stream", ) async def _set_user(request): @@ -1132,7 +1119,6 @@ def test_middleware_spans(sentry_init, capture_items): traces_sample_rate=1.0, integrations=[StarletteIntegration(middleware_spans=True)], auto_enabling_integrations=False, # disable because httpx will enable otherwise, leading to the segment span being an `http.client` sentry.op (the TestClient initiating the request), rather than the more realistic `http.server`. - trace_lifecycle="stream", ) starlette_app = starlette_app_factory( middleware=[Middleware(AuthenticationMiddleware, backend=BasicAuthBackend())] @@ -1180,7 +1166,6 @@ def test_middleware_spans_disabled(sentry_init, capture_items): traces_sample_rate=1.0, integrations=[StarletteIntegration(middleware_spans=False)], auto_enabling_integrations=False, # disable because httpx will enable otherwise, leading to the segment span being an `http.client` sentry.op (the TestClient initiating the request), rather than the more realistic `http.server`. - trace_lifecycle="stream", ) starlette_app = starlette_app_factory( middleware=[Middleware(AuthenticationMiddleware, backend=BasicAuthBackend())] @@ -1210,7 +1195,6 @@ def test_middleware_callback_spans(sentry_init, capture_items): traces_sample_rate=1.0, integrations=[StarletteIntegration(middleware_spans=True)], auto_enabling_integrations=False, # disable because httpx will enable otherwise, leading to the segment span being an `http.client` sentry.op (the TestClient initiating the request), rather than the more realistic `http.server`. - trace_lifecycle="stream", ) starlette_app = starlette_app_factory(middleware=[Middleware(SampleMiddleware)]) @@ -1294,7 +1278,6 @@ def test_middleware_receive_send(sentry_init, capture_events): sentry_init( traces_sample_rate=1.0, integrations=[StarletteIntegration()], - trace_lifecycle="stream", ) starlette_app = starlette_app_factory( middleware=[Middleware(SampleReceiveSendMiddleware)] @@ -1313,7 +1296,6 @@ def test_middleware_partial_receive_send(sentry_init, capture_items): sentry_init( traces_sample_rate=1.0, integrations=[StarletteIntegration()], - trace_lifecycle="stream", ) starlette_app = starlette_app_factory( middleware=[Middleware(SamplePartialReceiveSendMiddleware)] @@ -1386,7 +1368,6 @@ def test_middleware_positional_args(sentry_init): sentry_init( traces_sample_rate=1.0, integrations=[StarletteIntegration()], - trace_lifecycle="stream", ) _ = starlette_app_factory(middleware=[Middleware(SampleMiddlewareWithArgs, "bla")]) @@ -1421,7 +1402,6 @@ def test_active_thread_id(sentry_init, capture_items, endpoint): auto_enabling_integrations=False, # avoid legacy spans from auto-enabled integrations leaking into streaming mode integrations=[StarletteIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) app = starlette_app_factory() @@ -1446,7 +1426,6 @@ def test_http_route(sentry_init, capture_items, endpoint): auto_enabling_integrations=False, integrations=[StarletteIntegration(transaction_style="url")], traces_sample_rate=1.0, - trace_lifecycle="stream", ) app = starlette_app_factory() @@ -1473,7 +1452,6 @@ def test_segment_name_is_route_resolved_name_static( auto_enabling_integrations=False, integrations=[StarletteIntegration(transaction_style="url")], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -1590,7 +1568,6 @@ def test_transaction_name( auto_enabling_integrations=False, # Make sure that httpx integration is not added, because it adds tracing information to the starlette test clients request. integrations=[StarletteIntegration(transaction_style=transaction_style)], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -1653,7 +1630,6 @@ def dummy_traces_sampler(sampling_context): integrations=[StarletteIntegration(transaction_style=transaction_style)], traces_sampler=dummy_traces_sampler, traces_sample_rate=1.0, - trace_lifecycle="stream", ) app = starlette_app_factory() @@ -1699,7 +1675,6 @@ def test_transaction_name_in_middleware( ), ], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -1731,7 +1706,6 @@ def test_span_origin(sentry_init, capture_items): auto_enabling_integrations=False, # avoid httpx auto-instrumentation leaking spans integrations=[StarletteIntegration(middleware_spans=True)], traces_sample_rate=1.0, - trace_lifecycle="stream", ) starlette_app = starlette_app_factory( middleware=[Middleware(AuthenticationMiddleware, backend=BasicAuthBackend())] @@ -1766,7 +1740,6 @@ def test_segment_http_method_default(sentry_init, capture_items): integrations=[ StarletteIntegration(), ], - trace_lifecycle="stream", ) items = capture_items("span") @@ -1791,7 +1764,6 @@ def test_request_url(sentry_init, capture_items): integrations=[ StarletteIntegration(), ], - trace_lifecycle="stream", ) starlette_app = starlette_app_factory() @@ -1829,7 +1801,6 @@ def test_segment_http_method_custom(sentry_init, capture_items): ), # capitalization does not matter ), ], - trace_lifecycle="stream", ) items = capture_items("span") @@ -1890,7 +1861,6 @@ async def test_malformed_json_request_body(sentry_init, capture_events): traces_sample_rate=1.0, send_default_pii=True, integrations=[StarletteIntegration()], - trace_lifecycle="stream", ) starlette_app = starlette_app_factory() diff --git a/tests/integrations/starlite/test_starlite.py b/tests/integrations/starlite/test_starlite.py index 011cb52e9f..2a0e90007c 100644 --- a/tests/integrations/starlite/test_starlite.py +++ b/tests/integrations/starlite/test_starlite.py @@ -146,7 +146,6 @@ def test_transaction_name_and_source( sentry_init( traces_sample_rate=1.0, integrations=[StarliteIntegration()], - trace_lifecycle="stream", ) starlite_app = starlite_app_factory() client = TestClient(starlite_app) @@ -169,7 +168,6 @@ def test_middleware_spans(sentry_init, capture_items): sentry_init( traces_sample_rate=1.0, integrations=[StarliteIntegration()], - trace_lifecycle="stream", ) logging_config = LoggingMiddlewareConfig() @@ -224,7 +222,6 @@ async def do_stuff(message): sentry_init( traces_sample_rate=1.0, integrations=[StarliteIntegration()], - trace_lifecycle="stream", ) starlite_app = starlite_app_factory(middleware=[SampleMiddleware]) @@ -285,7 +282,6 @@ async def __call__(self, scope, receive, send): sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", integrations=[StarliteIntegration()], ) starlite_app = starlite_app_factory(middleware=[SampleReceiveSendMiddleware]) @@ -319,7 +315,6 @@ async def my_send(*args, **kwargs): sentry_init( traces_sample_rate=1.0, integrations=[StarliteIntegration()], - trace_lifecycle="stream", ) starlite_app = starlite_app_factory(middleware=[SamplePartialReceiveSendMiddleware]) @@ -370,7 +365,6 @@ def test_span_origin(sentry_init, capture_items): sentry_init( integrations=[StarliteIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) logging_config = LoggingMiddlewareConfig() @@ -468,7 +462,6 @@ def test_request_body_data_collection( sentry_init( traces_sample_rate=1.0, integrations=[StarliteIntegration()], - trace_lifecycle="stream", _experiments=( {} if data_collection is None else {"data_collection": data_collection} ), @@ -496,7 +489,6 @@ def test_request_body_data_collection_wins_over_send_default_pii( sentry_init( traces_sample_rate=1.0, integrations=[StarliteIntegration()], - trace_lifecycle="stream", send_default_pii=True, _experiments={"data_collection": {"http_bodies": []}}, ) @@ -619,7 +611,6 @@ def test_cookie_data_collection( sentry_init( traces_sample_rate=1.0, integrations=[StarliteIntegration()], - trace_lifecycle="stream", **init_kwargs, ) diff --git a/tests/integrations/statsig/test_statsig.py b/tests/integrations/statsig/test_statsig.py index 313d78d9f3..ce5849c89b 100644 --- a/tests/integrations/statsig/test_statsig.py +++ b/tests/integrations/statsig/test_statsig.py @@ -193,7 +193,6 @@ def test_statsig_span_integration( sentry_init( traces_sample_rate=1.0, integrations=[StatsigIntegration()], - trace_lifecycle="stream", ) user = StatsigUser(user_id="user-id") diff --git a/tests/integrations/stdlib/test_httplib.py b/tests/integrations/stdlib/test_httplib.py index 7955cceb5b..aeaaf1f5f0 100644 --- a/tests/integrations/stdlib/test_httplib.py +++ b/tests/integrations/stdlib/test_httplib.py @@ -80,7 +80,6 @@ def create_chunked_server(): def test_crumb_capture(sentry_init, capture_events, send_default_pii): sentry_init( integrations=[StdlibIntegration()], - trace_lifecycle="stream", send_default_pii=send_default_pii, ) events = capture_events() @@ -129,7 +128,6 @@ def test_crumb_capture_client_error( ): sentry_init( integrations=[StdlibIntegration()], - trace_lifecycle="stream", send_default_pii=send_default_pii, ) events = capture_events() @@ -180,7 +178,6 @@ def before_breadcrumb(crumb, hint): integrations=[StdlibIntegration()], before_breadcrumb=before_breadcrumb, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) events = capture_events() @@ -223,7 +220,6 @@ def test_empty_realurl( sentry_init( dsn="", - trace_lifecycle="stream", ) HTTPConnection("localhost", port=PORT).putrequest("POST", None) @@ -280,7 +276,6 @@ def test_outgoing_trace_headers( ): sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", ) already_patched_getresponse = HTTPSConnection.getresponse @@ -356,7 +351,6 @@ def test_outgoing_trace_headers_head_sdk( sentry_init( traces_sample_rate=0.5, release="foo", - trace_lifecycle="stream", ) already_patched_getresponse = HTTPSConnection.getresponse @@ -418,7 +412,6 @@ def test_outgoing_trace_headers_no_current_span(sentry_init): """ sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", ) already_patched_getresponse = HTTPSConnection.getresponse @@ -547,7 +540,6 @@ def test_option_trace_propagation_targets( sentry_init( trace_propagation_targets=trace_propagation_targets, traces_sample_rate=1.0, - trace_lifecycle="stream", ) already_patched_getresponse = HTTPSConnection.getresponse @@ -608,7 +600,6 @@ def test_request_source_disabled( sentry_init( **sentry_options, - trace_lifecycle="stream", ) items = capture_items("span") @@ -638,7 +629,6 @@ def test_request_source_enabled( sentry_options = { "traces_sample_rate": 1.0, "http_request_source_threshold_ms": 0, - "trace_lifecycle": "stream", } if enable_http_request_source is not None: @@ -674,7 +664,6 @@ def test_request_source( traces_sample_rate=1.0, enable_http_request_source=True, http_request_source_threshold_ms=0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -721,7 +710,6 @@ def test_request_source_with_module_in_search_path( traces_sample_rate=1.0, enable_http_request_source=True, http_request_source_threshold_ms=0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -761,7 +749,6 @@ def test_no_request_source_if_duration_too_short( traces_sample_rate=1.0, enable_http_request_source=True, http_request_source_threshold_ms=100, - trace_lifecycle="stream", ) add_http_request_source = sentry_sdk.tracing_utils.add_http_request_source @@ -803,7 +790,6 @@ def test_request_source_if_duration_over_threshold( traces_sample_rate=1.0, enable_http_request_source=True, http_request_source_threshold_ms=100, - trace_lifecycle="stream", ) add_http_request_source = sentry_sdk.tracing_utils.add_http_request_source @@ -863,7 +849,6 @@ def test_span_origin( sentry_init( traces_sample_rate=1.0, debug=True, - trace_lifecycle="stream", ) items = capture_items("span") @@ -891,7 +876,6 @@ def test_http_timeout( sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -925,7 +909,6 @@ def test_proxy_http_tunnel( sentry_init( traces_sample_rate=1.0, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) items = capture_items("span") @@ -966,7 +949,6 @@ def test_chunked_response_span_covers_body_read( ): sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", ) min_expected_duration = CHUNK_DELAY * NUM_CHUNKS @@ -1068,7 +1050,6 @@ def test_url_query_data_collection( sentry_init( integrations=[StdlibIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", **init_kwargs, ) @@ -1125,7 +1106,6 @@ def test_url_full_reassembly(sentry_init, capture_items, init_kwargs, expected_s sentry_init( integrations=[StdlibIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", **init_kwargs, ) @@ -1188,7 +1168,6 @@ def test_crumb_url_query_data_collection( ): sentry_init( integrations=[StdlibIntegration()], - trace_lifecycle="stream", **init_kwargs, ) events = capture_events() diff --git a/tests/integrations/stdlib/test_subprocess.py b/tests/integrations/stdlib/test_subprocess.py index 1fd2322f8e..1d4b7777bf 100644 --- a/tests/integrations/stdlib/test_subprocess.py +++ b/tests/integrations/stdlib/test_subprocess.py @@ -60,7 +60,6 @@ def test_subprocess_basic( sentry_init( integrations=[StdlibIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("event", "span") @@ -172,7 +171,6 @@ def test_subprocess_empty_env( sentry_init( integrations=[StdlibIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) with sentry_sdk.traces.start_span(name="custom parent"): args = [ @@ -190,7 +188,6 @@ def test_subprocess_invalid_args( ): sentry_init( integrations=[StdlibIntegration()], - trace_lifecycle="stream", ) with pytest.raises(TypeError) as excinfo: @@ -206,7 +203,6 @@ def test_subprocess_span_origin( sentry_init( integrations=[StdlibIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") diff --git a/tests/integrations/strawberry/test_strawberry.py b/tests/integrations/strawberry/test_strawberry.py index 7900638155..d60669a436 100644 --- a/tests/integrations/strawberry/test_strawberry.py +++ b/tests/integrations/strawberry/test_strawberry.py @@ -559,7 +559,6 @@ def test_capture_segment_on_error( ] + framework_integrations, traces_sample_rate=1, - trace_lifecycle="stream", ) items = capture_items("event", "span") @@ -630,7 +629,6 @@ def test_capture_segment_on_success( + framework_integrations, traces_sample_rate=1, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) items = capture_items("span") @@ -698,7 +696,6 @@ def test_segment_no_operation_name( + framework_integrations, traces_sample_rate=1, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) items = capture_items("span") @@ -768,7 +765,6 @@ def test_segment_mutation( + framework_integrations, traces_sample_rate=1, send_default_pii=send_default_pii, - trace_lifecycle="stream", ) items = capture_items("span") @@ -860,7 +856,6 @@ def test_graphql_span_data_collection( "integrations": [StrawberryIntegration(async_execution=async_execution)] + framework_integrations, "traces_sample_rate": 1, - "trace_lifecycle": "stream", "_experiments": {"data_collection": data_collection}, } if send_default_pii is not None: @@ -970,7 +965,6 @@ def test_span_origin( ] + framework_integrations, traces_sample_rate=1, - trace_lifecycle="stream", ) items = capture_items("span") @@ -1020,7 +1014,6 @@ def test_span_origin2( ] + framework_integrations, traces_sample_rate=1, - trace_lifecycle="stream", ) items = capture_items("span") @@ -1070,7 +1063,6 @@ def test_span_origin3( ] + framework_integrations, traces_sample_rate=1, - trace_lifecycle="stream", ) items = capture_items("span") diff --git a/tests/integrations/threading/test_threading.py b/tests/integrations/threading/test_threading.py index 6c27f1f5b2..a21f9f72bb 100644 --- a/tests/integrations/threading/test_threading.py +++ b/tests/integrations/threading/test_threading.py @@ -132,7 +132,6 @@ def test_spans_from_multiple_threads( ): sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", integrations=[ThreadingIntegration(propagate_scope=propagate_scope)], ) items = capture_items("span") @@ -196,7 +195,6 @@ def test_spans_from_threadpool( ): sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", integrations=[ThreadingIntegration(propagate_scope=propagate_scope)], ) items = capture_items() diff --git a/tests/integrations/tornado/test_tornado.py b/tests/integrations/tornado/test_tornado.py index c62963e458..4b5163b5f1 100644 --- a/tests/integrations/tornado/test_tornado.py +++ b/tests/integrations/tornado/test_tornado.py @@ -286,7 +286,6 @@ def test_url_query_data_collection( sentry_init( integrations=[TornadoIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", **init_kwargs, ) @@ -326,7 +325,6 @@ def test_url_query_data_collection_no_query_string( sentry_init( integrations=[TornadoIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", _experiments={"data_collection": {}}, ) @@ -351,7 +349,6 @@ def test_url_query_data_collection_repeated_and_blank_params( sentry_init( integrations=[TornadoIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", _experiments={"data_collection": {}}, ) @@ -393,7 +390,6 @@ def test_request_body_data_collection( sentry_init( integrations=[TornadoIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", _experiments={"data_collection": data_collection}, ) @@ -423,7 +419,6 @@ def test_oversized_request_body_not_annotated_data_collection( sentry_init( integrations=[TornadoIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", max_request_body_size="small", _experiments={"data_collection": {"http_bodies": []}}, ) @@ -465,7 +460,6 @@ def test_request_body_data_collection_event_processor( ): sentry_init( integrations=[TornadoIntegration()], - trace_lifecycle="static", _experiments={"data_collection": data_collection}, ) @@ -512,7 +506,6 @@ def test_transactions( integrations=[TornadoIntegration()], traces_sample_rate=1.0, send_default_pii=send_pii, - trace_lifecycle="stream", ) items = capture_items("event", "span") @@ -717,7 +710,6 @@ def test_error_has_new_trace_context_performance_enabled( sentry_init( integrations=[TornadoIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items() @@ -750,7 +742,6 @@ def test_error_has_new_trace_context_performance_disabled( sentry_init( integrations=[TornadoIntegration()], traces_sample_rate=None, # this is the default, just added for clarity - trace_lifecycle="stream", ) events = capture_events() @@ -781,7 +772,6 @@ def test_error_has_existing_trace_context_performance_enabled( sentry_init( integrations=[TornadoIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items() @@ -822,7 +812,6 @@ def test_error_has_existing_trace_context_performance_disabled( sentry_init( integrations=[TornadoIntegration()], traces_sample_rate=None, # this is the default, just added for clarity - trace_lifecycle="stream", ) events = capture_events() @@ -860,7 +849,6 @@ def test_span_origin( sentry_init( integrations=[TornadoIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -884,7 +872,6 @@ def test_user_ip_address_on_all_spans( sentry_init( integrations=[TornadoIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", **init_kwargs, ) @@ -912,7 +899,6 @@ def test_client_address_span_attribute_data_collection( sentry_init( integrations=[TornadoIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", **init_kwargs, ) diff --git a/tests/integrations/trytond_wsgi/test_trytond.py b/tests/integrations/trytond_wsgi/test_trytond.py index 9af0aa8c58..619cd40eed 100644 --- a/tests/integrations/trytond_wsgi/test_trytond.py +++ b/tests/integrations/trytond_wsgi/test_trytond.py @@ -126,7 +126,6 @@ def test_span_origin(sentry_init, app, capture_items, get_client): sentry_init( integrations=[TrytondWSGIIntegration()], traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") diff --git a/tests/integrations/unleash/test_unleash.py b/tests/integrations/unleash/test_unleash.py index ca8ecca994..c6920a8d61 100644 --- a/tests/integrations/unleash/test_unleash.py +++ b/tests/integrations/unleash/test_unleash.py @@ -176,7 +176,6 @@ def test_unleash_span_integration( sentry_init( traces_sample_rate=1.0, integrations=[UnleashIntegration()], - trace_lifecycle="stream", ) client = UnleashClient() # type: ignore[arg-type] diff --git a/tests/integrations/wsgi/test_wsgi.py b/tests/integrations/wsgi/test_wsgi.py index 952418662a..bb2ab905b4 100644 --- a/tests/integrations/wsgi/test_wsgi.py +++ b/tests/integrations/wsgi/test_wsgi.py @@ -45,7 +45,7 @@ def next(self): def test_basic(sentry_init, crashing_app, capture_events): - sentry_init(send_default_pii=True, trace_lifecycle="stream") + sentry_init(send_default_pii=True) app = SentryWsgiMiddleware(crashing_app) client = Client(app) events = capture_events() @@ -152,7 +152,6 @@ def dogpark(environ, start_response): sentry_init( send_default_pii=True, traces_sample_rate=1.0, - trace_lifecycle="stream", ) app = SentryWsgiMiddleware(dogpark) client = Client(app) @@ -200,7 +199,6 @@ def dogpark(environ, start_response): sentry_init( send_default_pii=send_pii, traces_sample_rate=1.0, - trace_lifecycle="stream", ) app = SentryWsgiMiddleware(dogpark) client = Client(app) @@ -246,7 +244,6 @@ def dogpark(environ, start_response): sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", ) app = SentryWsgiMiddleware(dogpark) client = Client(app) @@ -317,7 +314,6 @@ def dogpark(environ, start_response): sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", ) app = SentryWsgiMiddleware(dogpark) client = Client(app) @@ -387,7 +383,6 @@ def app(environ, start_response): sentry_init( send_default_pii=True, traces_sampler=traces_sampler, - trace_lifecycle="stream", ) app = SentryWsgiMiddleware(app) client = Client(app) @@ -431,7 +426,6 @@ def app(environ, start_response): sentry_init( send_default_pii=True, traces_sampler=traces_sampler, - trace_lifecycle="stream", ) app = SentryWsgiMiddleware(app) envelopes = capture_envelopes() @@ -474,7 +468,6 @@ def sample_app(environ, start_response): sentry_init( send_default_pii=True, traces_sampler=traces_sampler, - trace_lifecycle="stream", ) app = SentryWsgiMiddleware(sample_app) envelopes = capture_envelopes() @@ -517,7 +510,6 @@ def dogpark(environ, start_response): sentry_init( send_default_pii=True, traces_sample_rate=1.0, - trace_lifecycle="stream", ) app = SentryWsgiMiddleware(dogpark) @@ -540,7 +532,6 @@ def dogpark(environ, start_response): sentry_init( send_default_pii=True, traces_sample_rate=1.0, - trace_lifecycle="stream", ) app = SentryWsgiMiddleware( dogpark, @@ -1097,7 +1088,6 @@ def dogpark(environ, start_response): sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", **init_kwargs, ) app = SentryWsgiMiddleware(dogpark) @@ -1128,7 +1118,6 @@ def dogpark(environ, start_response): sentry_init( send_default_pii=send_default_pii, traces_sample_rate=1.0, - trace_lifecycle="stream", ) app = SentryWsgiMiddleware(dogpark) client = Client(app) @@ -1163,7 +1152,6 @@ def dogpark(environ, start_response): sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", **init_kwargs, ) app = SentryWsgiMiddleware(dogpark) diff --git a/tests/profiler/test_continuous_profiler.py b/tests/profiler/test_continuous_profiler.py index a791aa343c..60c05ccc21 100644 --- a/tests/profiler/test_continuous_profiler.py +++ b/tests/profiler/test_continuous_profiler.py @@ -290,7 +290,6 @@ def test_continuous_profiler_auto_start_and_manual_stop( options = make_options(mode=mode, auto_start=True) sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", **options, ) @@ -350,7 +349,6 @@ def test_continuous_profiler_manual_start_and_stop_sampled( ) sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", **options, ) @@ -409,7 +407,6 @@ def test_continuous_profiler_manual_start_and_stop_unsampled( ) sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", **options, ) @@ -446,7 +443,6 @@ def test_continuous_profiler_auto_start_and_stop_sampled( ) sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", **options, ) @@ -521,7 +517,6 @@ def test_continuous_profiler_auto_start_and_stop_unsampled( ) sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", **options, ) @@ -564,7 +559,6 @@ def test_continuous_profiler_manual_start_and_stop_noop_when_using_trace_lifecyl ) sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", **options, ) @@ -606,7 +600,6 @@ def test_continuous_profiler_run_does_not_null_buffer( ) sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", **options, ) envelopes = capture_envelopes() diff --git a/tests/test_api.py b/tests/test_api.py index ce57b2d224..1d5d31c14e 100644 --- a/tests/test_api.py +++ b/tests/test_api.py @@ -38,7 +38,7 @@ def test_get_current_span_via_traces(): def test_get_current_span_current_scope_via_traces(sentry_init): - sentry_init(trace_lifecycle="stream") + sentry_init() assert sentry_sdk.traces.get_current_span() is None @@ -50,7 +50,7 @@ def test_get_current_span_current_scope_via_traces(sentry_init): def test_get_current_span_with_segment(sentry_init): - sentry_init(trace_lifecycle="stream") + sentry_init() assert sentry_sdk.traces.get_current_span() is None @@ -59,7 +59,7 @@ def test_get_current_span_with_segment(sentry_init): def test_traceparent_with_tracing_enabled(sentry_init): - sentry_init(traces_sample_rate=1.0, trace_lifecycle="stream") + sentry_init(traces_sample_rate=1.0) with sentry_sdk.traces.start_span(name="span") as segment: expected_traceparent = "%s-%s-1" % ( @@ -70,7 +70,7 @@ def test_traceparent_with_tracing_enabled(sentry_init): def test_traceparent_with_tracing_disabled(sentry_init): - sentry_init(trace_lifecycle="stream") + sentry_init() propagation_context = get_isolation_scope()._propagation_context expected_traceparent = "%s-%s" % ( @@ -81,7 +81,7 @@ def test_traceparent_with_tracing_disabled(sentry_init): def test_baggage_with_tracing_disabled(sentry_init): - sentry_init(release="1.0.0", environment="dev", trace_lifecycle="stream") + sentry_init(release="1.0.0", environment="dev") propagation_context = get_isolation_scope()._propagation_context expected_baggage = ( "sentry-trace_id={},sentry-environment=dev,sentry-release=1.0.0".format( @@ -94,7 +94,6 @@ def test_baggage_with_tracing_disabled(sentry_init): def test_baggage_with_tracing_enabled(sentry_init): sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", release="1.0.0", environment="dev", ) @@ -109,7 +108,6 @@ def test_baggage_with_dsn(sentry_init): sentry_init( dsn="http://97333d956c9e40989a0139756c121c34@sentry-x.sentry-y.s.c.local/976543210", traces_sample_rate=1.0, - trace_lifecycle="stream", release="2.0.0", environment="dev", transport=TestTransportWithOptions, @@ -122,7 +120,7 @@ def test_baggage_with_dsn(sentry_init): def test_continue_trace(sentry_init): - sentry_init(trace_lifecycle="stream") + sentry_init() trace_id = "471a43a4192642f0b136d5159a501701" parent_span_id = "6e8f22c393e68f19" diff --git a/tests/test_attributes.py b/tests/test_attributes.py index d76bb13c8f..bba1141f33 100644 --- a/tests/test_attributes.py +++ b/tests/test_attributes.py @@ -191,7 +191,6 @@ def test_user_attributes(sentry_init, capture_items): sentry_init( traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) items = capture_items("trace_metric", "span") diff --git a/tests/test_basics.py b/tests/test_basics.py index 8e28792da4..eb4eb516fe 100644 --- a/tests/test_basics.py +++ b/tests/test_basics.py @@ -630,7 +630,7 @@ def before_send(event, hint): def test_event_processor_drop_records_client_report( sentry_init, capture_events, capture_record_lost_event_calls ): - sentry_init(traces_sample_rate=1.0, trace_lifecycle="stream") + sentry_init(traces_sample_rate=1.0) events = capture_events() record_lost_event_calls = capture_record_lost_event_calls() @@ -750,7 +750,6 @@ def test_functions_to_trace(sentry_init, capture_items): sentry_init( traces_sample_rate=1.0, functions_to_trace=functions_to_trace, - trace_lifecycle="stream", ) items = capture_items("span") @@ -794,7 +793,6 @@ def test_functions_to_trace_with_class(sentry_init, capture_items): sentry_init( traces_sample_rate=1.0, functions_to_trace=functions_to_trace, - trace_lifecycle="stream", ) items = capture_items("span") @@ -843,7 +841,6 @@ def test_staticmethod_class_tracing(sentry_init, capture_items): functions_to_trace=[ {"qualified_name": "tests.test_basics.TracingTestClass.static"} ], - trace_lifecycle="stream", ) items = capture_items("span") @@ -869,7 +866,6 @@ def test_staticmethod_instance_tracing(sentry_init, capture_items): functions_to_trace=[ {"qualified_name": "tests.test_basics.TracingTestClass.static"} ], - trace_lifecycle="stream", ) items = capture_items("span") @@ -894,7 +890,6 @@ def test_classmethod_class_tracing(sentry_init, capture_items): functions_to_trace=[ {"qualified_name": "tests.test_basics.TracingTestClass.class_"} ], - trace_lifecycle="stream", ) items = capture_items("span") @@ -919,7 +914,6 @@ def test_classmethod_instance_tracing(sentry_init, capture_items): functions_to_trace=[ {"qualified_name": "tests.test_basics.TracingTestClass.class_"} ], - trace_lifecycle="stream", ) items = capture_items("span") @@ -940,12 +934,11 @@ def test_functions_to_trace_no_dot_does_not_crash(sentry_init): sentry_init( traces_sample_rate=1.0, functions_to_trace=[{"qualified_name": "my_function"}], - trace_lifecycle="stream", ) def test_last_event_id(sentry_init): - sentry_init(traces_sample_rate=1.0, trace_lifecycle="stream") + sentry_init(traces_sample_rate=1.0) assert last_event_id() is None @@ -955,7 +948,7 @@ def test_last_event_id(sentry_init): def test_last_event_id_scope(sentry_init): - sentry_init(traces_sample_rate=1.0, trace_lifecycle="stream") + sentry_init(traces_sample_rate=1.0) # Should not crash with isolation_scope() as scope: diff --git a/tests/test_dsc.py b/tests/test_dsc.py index 4c2b8a1f14..7d61b68850 100644 --- a/tests/test_dsc.py +++ b/tests/test_dsc.py @@ -26,7 +26,6 @@ def test_dsc_head_of_trace(sentry_init, capture_envelopes): release="myapp@0.0.1", environment="canary", traces_sample_rate=1.0, - trace_lifecycle="stream", transport=TestTransportWithOptions, ) envelopes = capture_envelopes() @@ -85,7 +84,6 @@ def test_dsc_head_of_trace_uses_custom_org_id(sentry_init, capture_envelopes): release="myapp@0.0.1", environment="canary", traces_sample_rate=1.0, - trace_lifecycle="stream", transport=TestTransportWithOptions, ) envelopes = capture_envelopes() @@ -116,7 +114,6 @@ def test_dsc_continuation_of_trace(sentry_init, capture_envelopes): release="myapp@0.0.1", environment="canary", traces_sample_rate=1.0, - trace_lifecycle="stream", transport=TestTransportWithOptions, ) envelopes = capture_envelopes() @@ -197,7 +194,6 @@ def my_traces_sampler(sampling_context): release="myapp@0.0.1", environment="canary", traces_sampler=my_traces_sampler, - trace_lifecycle="stream", transport=TestTransportWithOptions, ) envelopes = capture_envelopes() @@ -270,7 +266,6 @@ def test_dsc_issue(sentry_init, capture_envelopes): dsn="https://mysecret@o1234.ingest.sentry.io/12312012", release="myapp@0.0.1", environment="canary", - trace_lifecycle="stream", transport=TestTransportWithOptions, ) envelopes = capture_envelopes() @@ -323,7 +318,6 @@ def test_dsc_issue_with_tracing(sentry_init, capture_envelopes): release="myapp@0.0.1", environment="canary", traces_sample_rate=1.0, - trace_lifecycle="stream", transport=TestTransportWithOptions, ) envelopes = capture_envelopes() @@ -398,7 +392,6 @@ def test_dsc_issue_twp(sentry_init, capture_envelopes, traces_sample_rate): release="myapp@0.0.1", environment="canary", traces_sample_rate=traces_sample_rate, - trace_lifecycle="stream", transport=TestTransportWithOptions, ) envelopes = capture_envelopes() diff --git a/tests/test_envelope.py b/tests/test_envelope.py index 7252195b5a..f103ba6006 100644 --- a/tests/test_envelope.py +++ b/tests/test_envelope.py @@ -54,7 +54,6 @@ def test_envelope_headers(sentry_init, capture_envelopes, monkeypatch): sentry_init( dsn="https://dogsarebadatkeepingsecrets@squirrelchasers.ingest.sentry.io/12312012", - trace_lifecycle="stream", ) envelopes = capture_envelopes() diff --git a/tests/test_feature_flags.py b/tests/test_feature_flags.py index c9f3e421f3..dd2a353d41 100644 --- a/tests/test_feature_flags.py +++ b/tests/test_feature_flags.py @@ -32,7 +32,6 @@ def test_featureflags_integration(sentry_init, capture_events, uninstall_integra async def test_featureflags_integration_spans_async(sentry_init, capture_events): sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", ) events = capture_events() @@ -61,7 +60,6 @@ async def test_featureflags_integration_spans_async(sentry_init, capture_events) def test_featureflags_integration_spans_sync(sentry_init, capture_events): sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", ) events = capture_events() diff --git a/tests/test_logs.py b/tests/test_logs.py index 08d97f356d..28f7d39046 100644 --- a/tests/test_logs.py +++ b/tests/test_logs.py @@ -230,7 +230,7 @@ def test_logs_tied_to_segments(sentry_init, capture_items): """ Log messages are also tied to segments. """ - sentry_init(traces_sample_rate=1.0, trace_lifecycle="stream") + sentry_init(traces_sample_rate=1.0) items = capture_items("log") with sentry_sdk.traces.start_span(name="test-segment") as sgmt: @@ -264,7 +264,7 @@ def test_logs_tied_to_spans(sentry_init, capture_items): """ Log messages are also tied to spans. """ - sentry_init(traces_sample_rate=1.0, trace_lifecycle="stream") + sentry_init(traces_sample_rate=1.0) items = capture_items("log") with sentry_sdk.traces.start_span(name="test-segment"): diff --git a/tests/test_metrics.py b/tests/test_metrics.py index fad2981c4a..140f2e77dc 100644 --- a/tests/test_metrics.py +++ b/tests/test_metrics.py @@ -102,7 +102,7 @@ def test_metrics_no_user_if_pii_off(sentry_init, capture_items): def test_metrics_with_span(sentry_init, capture_items): - sentry_init(traces_sample_rate=1.0, trace_lifecycle="stream") + sentry_init(traces_sample_rate=1.0) items = capture_items("trace_metric") with sentry_sdk.traces.start_span(name="test-span") as segment: diff --git a/tests/test_monitor.py b/tests/test_monitor.py index fd992e48cc..3501fa1e6b 100644 --- a/tests/test_monitor.py +++ b/tests/test_monitor.py @@ -63,7 +63,6 @@ def test_segment_uses_downsampled_rate( ): sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", transport=UnhealthyTestTransport(), ) diff --git a/tests/test_scope.py b/tests/test_scope.py index b90fb4665c..cba5b50298 100644 --- a/tests/test_scope.py +++ b/tests/test_scope.py @@ -87,7 +87,6 @@ def test_set_user_none_values_are_dropped_when_copying_to_attributes( sentry_init( traces_sample_rate=1.0, send_default_pii=True, - trace_lifecycle="stream", ) items = capture_items("span") @@ -884,7 +883,7 @@ def test_set_tags(): def test_last_event_id(sentry_init): - sentry_init(traces_sample_rate=1.0, trace_lifecycle="stream") + sentry_init(traces_sample_rate=1.0) assert Scope.last_event_id() is None @@ -894,7 +893,7 @@ def test_last_event_id(sentry_init): def test_last_event_id_cleared(sentry_init): - sentry_init(traces_sample_rate=1.0, trace_lifecycle="stream") + sentry_init(traces_sample_rate=1.0) # Make sure last_event_id is set sentry_sdk.capture_exception(Exception("test")) @@ -973,7 +972,7 @@ def test_handle_error_on_token_reset_isolation_scope(error_cls, scope_manager): def test_trace_context_tracing(sentry_init): - sentry_init(traces_sample_rate=1.0, trace_lifecycle="stream") + sentry_init(traces_sample_rate=1.0) with sentry_sdk.traces.start_span(name="seg") as segment: with sentry_sdk.traces.start_span(name="span1"): diff --git a/tests/test_tracing_utils.py b/tests/test_tracing_utils.py index 0b2f730909..070c56e8b8 100644 --- a/tests/test_tracing_utils.py +++ b/tests/test_tracing_utils.py @@ -277,7 +277,6 @@ def test_should_continue_trace( org_id=explicit_org_id, strict_trace_continuation=strict_trace_continuation, traces_sample_rate=1.0, - trace_lifecycle="stream", transport=TestTransportWithOptions, ) diff --git a/tests/tracing/test_conversation_id.py b/tests/tracing/test_conversation_id.py index 220eaee561..388b3c1654 100644 --- a/tests/tracing/test_conversation_id.py +++ b/tests/tracing/test_conversation_id.py @@ -5,7 +5,7 @@ def test_conversation_id_propagates_to_span_with_gen_ai_operation_name( sentry_init, capture_items ): """Span with gen_ai.operation.name attribute should get conversation_id.""" - sentry_init(traces_sample_rate=1.0, trace_lifecycle="stream") + sentry_init(traces_sample_rate=1.0) items = capture_items("span") scope = sentry_sdk.get_current_scope() @@ -29,7 +29,7 @@ def test_conversation_id_propagates_to_span_with_gen_ai_operation_name( def test_conversation_id_propagates_to_span_with_ai_op(sentry_init, capture_items): """Span with ai.* op should get conversation_id.""" - sentry_init(traces_sample_rate=1.0, trace_lifecycle="stream") + sentry_init(traces_sample_rate=1.0) items = capture_items("span") scope = sentry_sdk.get_current_scope() @@ -58,7 +58,6 @@ def test_conversation_id_propagates_to_span_with_gen_ai_op( """Span with gen_ai.* op should get conversation_id.""" sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -82,7 +81,7 @@ def test_conversation_id_propagates_to_span_with_gen_ai_op( def test_conversation_id_not_propagated_to_non_ai_span(sentry_init, capture_items): """Non-AI span should NOT get conversation_id.""" - sentry_init(traces_sample_rate=1.0, trace_lifecycle="stream") + sentry_init(traces_sample_rate=1.0) items = capture_items("span") scope = sentry_sdk.get_current_scope() @@ -106,7 +105,7 @@ def test_conversation_id_not_propagated_to_non_ai_span(sentry_init, capture_item def test_conversation_id_not_propagated_when_not_set(sentry_init, capture_items): """AI span should not have conversation_id if not set on scope.""" - sentry_init(traces_sample_rate=1.0, trace_lifecycle="stream") + sentry_init(traces_sample_rate=1.0) items = capture_items("span") scope = sentry_sdk.get_current_scope() @@ -130,7 +129,7 @@ def test_conversation_id_not_propagated_when_not_set(sentry_init, capture_items) def test_conversation_id_not_propagated_to_span_without_op(sentry_init, capture_items): """Span without op and without gen_ai.operation.name should NOT get conversation_id.""" - sentry_init(traces_sample_rate=1.0, trace_lifecycle="stream") + sentry_init(traces_sample_rate=1.0) items = capture_items("span") scope = sentry_sdk.get_current_scope() @@ -154,7 +153,7 @@ def test_conversation_id_propagates_with_gen_ai_operation_name_no_op( sentry_init, capture_items ): """Span with gen_ai.operation.name but no op should still get conversation_id.""" - sentry_init(traces_sample_rate=1.0, trace_lifecycle="stream") + sentry_init(traces_sample_rate=1.0) items = capture_items("span") scope = sentry_sdk.get_current_scope() @@ -178,7 +177,7 @@ def test_conversation_id_propagates_with_gen_ai_operation_name_no_op( def test_conversation_id_propagates_to_segment_with_ai_op(sentry_init, capture_items): """Segment with ai.* op should get conversation_id.""" - sentry_init(traces_sample_rate=1.0, trace_lifecycle="stream") + sentry_init(traces_sample_rate=1.0) items = capture_items("span") scope = sentry_sdk.get_current_scope() @@ -197,7 +196,7 @@ def test_conversation_id_propagates_to_segment_with_ai_op(sentry_init, capture_i def test_conversation_id_not_propagated_to_non_ai_segment(sentry_init, capture_items): """Non-AI segment should NOT get conversation_id.""" - sentry_init(traces_sample_rate=1.0, trace_lifecycle="stream") + sentry_init(traces_sample_rate=1.0) items = capture_items("span") scope = sentry_sdk.get_current_scope() diff --git a/tests/tracing/test_decorator.py b/tests/tracing/test_decorator.py index eac6af2700..79cdf3a706 100644 --- a/tests/tracing/test_decorator.py +++ b/tests/tracing/test_decorator.py @@ -16,7 +16,6 @@ async def my_async_example_function(): def test_trace_decorator(sentry_init, capture_items): sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -44,7 +43,6 @@ def traced_function(): def test_trace_decorator_arguments(sentry_init, capture_items): sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -71,7 +69,6 @@ def traced_function(): def test_trace_decorator_inactive(sentry_init, capture_items): sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -100,7 +97,6 @@ def traced_function(): async def test_trace_decorator_async(sentry_init, capture_items): sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -130,7 +126,6 @@ async def traced_function(): async def test_trace_decorator_async_arguments(sentry_init, capture_items): sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -158,7 +153,6 @@ async def traced_function(): async def test_trace_decorator_async_inactive(sentry_init, capture_items): sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -187,7 +181,6 @@ def test_trace_decorator_child(sentry_init, capture_items): """Spans created with @trace show up as children if a span is active.""" sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -220,7 +213,6 @@ async def test_trace_decorator_async_child(sentry_init, capture_items): """Spans created with @trace show up as children if a span is active.""" sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -251,7 +243,6 @@ async def _some_function_traced_stream(a, b, c): def test_functions_to_trace_signature_unchanged_sync(sentry_init): sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", ) def _some_function(a, b, c): @@ -270,7 +261,6 @@ def _some_function_traced_stream(a, b, c): async def test_functions_to_trace_signature_unchanged_async(sentry_init): sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", ) async def _some_function(a, b, c): diff --git a/tests/tracing/test_http_headers.py b/tests/tracing/test_http_headers.py index 9083e4c883..d89537e7e3 100644 --- a/tests/tracing/test_http_headers.py +++ b/tests/tracing/test_http_headers.py @@ -11,7 +11,6 @@ def test_to_traceparent(sentry_init, traces_sample_rate): sentry_init( traces_sample_rate=traces_sample_rate, - trace_lifecycle="stream", ) with sentry_sdk.traces.start_span(name="/interactions/other-dogs/new-dog") as span: @@ -70,7 +69,6 @@ def test_sentrytrace_extraction_leading_empty_fragment(): def test_iter_headers(sentry_init, monkeypatch): sentry_init( traces_sample_rate=0.0, - trace_lifecycle="stream", ) monkeypatch.setattr( StreamedSpan, diff --git a/tests/tracing/test_integration_tests.py b/tests/tracing/test_integration_tests.py index 97f253bcaf..b8421184b6 100644 --- a/tests/tracing/test_integration_tests.py +++ b/tests/tracing/test_integration_tests.py @@ -15,7 +15,7 @@ @pytest.mark.parametrize("sample_rate", [0.0, 1.0]) def test_basic(sentry_init, capture_items, sample_rate): - sentry_init(traces_sample_rate=sample_rate, trace_lifecycle="stream") + sentry_init(traces_sample_rate=sample_rate) items = capture_items() with sentry_sdk.traces.start_span(name="hi"): @@ -49,7 +49,7 @@ def test_basic(sentry_init, capture_items, sample_rate): def test_error_event_linked_without_performance(sentry_init, capture_items): - sentry_init(traces_sample_rate=None, trace_lifecycle="stream") + sentry_init(traces_sample_rate=None) items = capture_items("event") with sentry_sdk.traces.start_span( @@ -74,7 +74,6 @@ def test_continue_trace(sentry_init, capture_items, parent_sampled, sample_rate) """ sentry_init( traces_sample_rate=sample_rate, - trace_lifecycle="stream", ) items = capture_items() @@ -195,7 +194,6 @@ def test_dynamic_sampling_head_sdk_creates_dsc( sentry_init( traces_sample_rate=sample_rate, release="foo", - trace_lifecycle="stream", ) envelopes = capture_envelopes() @@ -256,7 +254,7 @@ def test_dynamic_sampling_head_sdk_creates_dsc( [{"traces_sample_rate": 1.0}, {"traces_sample_rate": 0.0}], ) def test_memory_usage(sentry_init, capture_events, args): - sentry_init(**args, trace_lifecycle="stream") + sentry_init(**args) references = weakref.WeakSet() @@ -288,7 +286,6 @@ def before_send(event, hint): sentry_init( traces_sample_rate=1.0, before_send=before_send, - trace_lifecycle="stream", ) items = capture_items() @@ -315,7 +312,6 @@ def capture_event(self, event): sentry_init( traces_sample_rate=1, transport=CustomTransport(), - trace_lifecycle="stream", ) items = capture_items() @@ -331,7 +327,6 @@ def test_trace_propagation_meta_head_sdk(sentry_init): sentry_init( traces_sample_rate=1.0, release="foo", - trace_lifecycle="stream", ) sentry_sdk.traces.new_trace() @@ -365,7 +360,7 @@ def test_trace_propagation_meta_head_sdk(sentry_init): def test_non_error_exceptions( sentry_init, capture_items, exception_cls, exception_value ): - sentry_init(traces_sample_rate=1.0, trace_lifecycle="stream") + sentry_init(traces_sample_rate=1.0) items = capture_items() with sentry_sdk.traces.start_span(name="hi") as segment: @@ -385,7 +380,7 @@ def test_non_error_exceptions( @pytest.mark.parametrize("exception_value", [None, 0, False]) def test_good_sysexit_doesnt_fail_segment(sentry_init, capture_items, exception_value): - sentry_init(traces_sample_rate=1.0, trace_lifecycle="stream") + sentry_init(traces_sample_rate=1.0) items = capture_items() with sentry_sdk.traces.start_span(name="hi"): @@ -430,7 +425,6 @@ def test_continue_trace_strict_trace_continuation( strict_trace_continuation=strict_trace_continuation, traces_sample_rate=1.0, transport=TestTransportWithOptions, - trace_lifecycle="stream", ) headers = { @@ -467,7 +461,7 @@ def test_continue_trace_forces_new_traces_when_no_propagation( ): """This is to make sure we don't have a long running trace because of TWP logic for the no propagation case.""" - sentry_init(traces_sample_rate=1.0, trace_lifecycle="stream") + sentry_init(traces_sample_rate=1.0) sentry_sdk.traces.continue_trace({}) with sentry_sdk.traces.start_span(name="segment1") as segment1: @@ -483,7 +477,7 @@ def test_continue_trace_forces_new_traces_when_no_propagation( def test_continue_trace_forces_new_traces_when_no_propagation_with_new_trace( sentry_init, ): - sentry_init(traces_sample_rate=1.0, trace_lifecycle="stream") + sentry_init(traces_sample_rate=1.0) sentry_sdk.traces.new_trace() with sentry_sdk.traces.start_span(name="segment1") as segment1: diff --git a/tests/tracing/test_misc.py b/tests/tracing/test_misc.py index 4ef12711a0..2161eb5d49 100644 --- a/tests/tracing/test_misc.py +++ b/tests/tracing/test_misc.py @@ -12,7 +12,6 @@ def test_finds_segment_on_scope(sentry_init): sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", ) with sentry_sdk.traces.start_span(name="dogpark"): @@ -29,7 +28,6 @@ def test_finds_segment_on_scope(sentry_init): def test_finds_span_on_scope(sentry_init): sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", ) segment = sentry_sdk.traces.start_span(name="dogpark") @@ -109,7 +107,6 @@ def test_should_propagate_trace_to_sentry( sentry_init( dsn=dsn, traces_sample_rate=1.0, - trace_lifecycle="stream", ) client = sentry_sdk.get_client() @@ -119,7 +116,7 @@ def test_should_propagate_trace_to_sentry( def test_start_span_segment_updates_scope_name(sentry_init): - sentry_init(traces_sample_rate=1.0, trace_lifecycle="stream") + sentry_init(traces_sample_rate=1.0) scope = sentry_sdk.get_current_scope() diff --git a/tests/tracing/test_propagation.py b/tests/tracing/test_propagation.py index 22458ed76e..378610564a 100644 --- a/tests/tracing/test_propagation.py +++ b/tests/tracing/test_propagation.py @@ -2,7 +2,7 @@ def test_span_in_segment(sentry_init): - sentry_init(traces_sample_rate=1.0, trace_lifecycle="stream") + sentry_init(traces_sample_rate=1.0) with sentry_sdk.traces.start_span(name="test"): with sentry_sdk.traces.start_span(name="test2") as span: @@ -11,7 +11,7 @@ def test_span_in_segment(sentry_init): def test_span_in_span_in_segment(sentry_init): - sentry_init(traces_sample_rate=1.0, trace_lifecycle="stream") + sentry_init(traces_sample_rate=1.0) with sentry_sdk.traces.start_span(name="test"): with sentry_sdk.traces.start_span(name="test2"): diff --git a/tests/tracing/test_sample_rand.py b/tests/tracing/test_sample_rand.py index cf31750042..f2bdff629b 100644 --- a/tests/tracing/test_sample_rand.py +++ b/tests/tracing/test_sample_rand.py @@ -27,7 +27,6 @@ def test_deterministic_sampled(sentry_init, capture_items, sample_rate, sample_r """ sentry_init( traces_sample_rate=sample_rate, - trace_lifecycle="stream", ) items = capture_items("span") @@ -56,7 +55,6 @@ def test_segment_uses_incoming_sample_rand( """ sentry_init( traces_sample_rate=sample_rate, - trace_lifecycle="stream", ) items = capture_items("span") diff --git a/tests/tracing/test_sample_rand_propagation.py b/tests/tracing/test_sample_rand_propagation.py index 773c06ff48..56a087e0ee 100644 --- a/tests/tracing/test_sample_rand_propagation.py +++ b/tests/tracing/test_sample_rand_propagation.py @@ -16,7 +16,7 @@ def test_continue_trace_with_sample_rand(sentry_init): """ Test that an incoming sample_rand is propagated onto the segment's baggage. """ - sentry_init(traces_sample_rate=1.0, trace_lifecycle="stream") + sentry_init(traces_sample_rate=1.0) headers = { "sentry-trace": "00000000000000000000000000000000-0000000000000000-1", @@ -33,7 +33,7 @@ def test_continue_trace_missing_sample_rand(sentry_init): Test that a missing sample_rand is filled in onto the segment's baggage. """ - sentry_init(traces_sample_rate=1.0, trace_lifecycle="stream") + sentry_init(traces_sample_rate=1.0) headers = { "sentry-trace": "00000000000000000000000000000000-0000000000000000", diff --git a/tests/tracing/test_sampling.py b/tests/tracing/test_sampling.py index f0b79a8a78..bd95164458 100644 --- a/tests/tracing/test_sampling.py +++ b/tests/tracing/test_sampling.py @@ -12,7 +12,6 @@ def test_sampling_decided_only_for_segments(sentry_init, capture_events): sentry_init( traces_sample_rate=0.5, - trace_lifecycle="stream", ) with sentry_sdk.traces.start_span(name="hi") as segment: @@ -28,7 +27,6 @@ def test_no_double_sampling(sentry_init, capture_items): sentry_init( traces_sample_rate=1.0, sample_rate=0.0, - trace_lifecycle="stream", ) items = capture_items() @@ -44,7 +42,7 @@ def test_no_double_sampling(sentry_init, capture_items): def test_get_span_from_scope_regardless_of_sampling_decision( sentry_init, sampling_decision ): - sentry_init(traces_sample_rate=1.0, trace_lifecycle="stream") + sentry_init(traces_sample_rate=1.0) sentry_sdk.traces.continue_trace( { @@ -75,7 +73,6 @@ def test_uses_traces_sample_rate_correctly( ): sentry_init( traces_sample_rate=traces_sample_rate, - trace_lifecycle="stream", ) sentry_sdk.traces.continue_trace( @@ -100,7 +97,6 @@ def test_uses_traces_sampler_return_value_correctly( ): sentry_init( traces_sampler=mock.Mock(return_value=traces_sampler_return_value), - trace_lifecycle="stream", ) sentry_sdk.traces.continue_trace( @@ -120,7 +116,6 @@ def test_tolerates_traces_sampler_returning_a_boolean( ): sentry_init( traces_sampler=mock.Mock(return_value=traces_sampler_return_value), - trace_lifecycle="stream", ) with sentry_sdk.traces.start_span(name="dogpark") as span: @@ -136,7 +131,6 @@ def test_traces_sampler_raising_falls_back_to_parent_sampling_decision( sentry_init( traces_sampler=mock.Mock(side_effect=ValueError("boom")), traces_sample_rate=0.0 if parent_sampling_decision else 1.0, - trace_lifecycle="stream", ) sentry_sdk.traces.continue_trace( @@ -161,7 +155,6 @@ def test_traces_sampler_raising_falls_back_to_traces_sample_rate( sentry_init( traces_sampler=mock.Mock(side_effect=ValueError("boom")), traces_sample_rate=traces_sample_rate, - trace_lifecycle="stream", ) sentry_sdk.traces.continue_trace( @@ -188,7 +181,6 @@ def test_traces_sampler_raising_no_incoming_trace_falls_back_to_traces_sample_ra sentry_init( traces_sampler=mock.Mock(side_effect=ValueError("boom")), traces_sample_rate=traces_sample_rate, - trace_lifecycle="stream", ) # no continue_trace, so no propagated sample_rand; make it deterministic @@ -205,7 +197,6 @@ def test_traces_sampler_raising_no_incoming_trace_and_no_traces_sample_rate( ): sentry_init( traces_sampler=mock.Mock(side_effect=ValueError("boom")), - trace_lifecycle="stream", ) with sentry_sdk.traces.start_span(name="dogpark") as span: @@ -220,7 +211,6 @@ def test_only_captures_segment_when_sampled_is_true( traces_sampler=mock.Mock( return_value=sampling_decision, ), - trace_lifecycle="stream", ) items = capture_items() @@ -246,7 +236,6 @@ def test_prefers_traces_sampler_to_traces_sample_rate( sentry_init( traces_sample_rate=traces_sample_rate, traces_sampler=traces_sampler, - trace_lifecycle="stream", ) span = sentry_sdk.traces.start_span(name="dogpark") @@ -263,7 +252,6 @@ def test_ignores_inherited_sample_decision_when_traces_sampler_defined( traces_sampler = mock.Mock(return_value=not bool(int(parent_sampling_decision))) sentry_init( traces_sampler=traces_sampler, - trace_lifecycle="stream", ) sentry_sdk.traces.continue_trace( @@ -281,7 +269,6 @@ def test_inherits_parent_sampling_decision_when_traces_sampler_undefined( ): sentry_init( traces_sample_rate=0.5, - trace_lifecycle="stream", ) sentry_sdk.traces.continue_trace( @@ -313,7 +300,6 @@ def traces_sampler(sampling_context): sentry_init( traces_sampler=traces_sampler, - trace_lifecycle="stream", ) sentry_sdk.get_current_scope().set_custom_sampling_context( @@ -337,7 +323,6 @@ def traces_sampler(sampling_context): sentry_init( traces_sampler=traces_sampler, - trace_lifecycle="stream", ) sentry_sdk.traces.new_trace() @@ -384,7 +369,6 @@ def test_warns_and_sets_sampled_to_false_on_invalid_traces_sampler_return_value( ): sentry_init( traces_sampler=mock.Mock(return_value=traces_sampler_return_value), - trace_lifecycle="stream", ) with mock.patch.object(logger, "warning", mock.Mock()): @@ -412,7 +396,7 @@ def test_records_lost_event_only_if_traces_sample_rate_enabled( sampled_output, expected_record_lost_event_calls, ): - sentry_init(traces_sample_rate=traces_sample_rate, trace_lifecycle="stream") + sentry_init(traces_sample_rate=traces_sample_rate) record_lost_event_calls = capture_record_lost_event_calls() span = sentry_sdk.traces.start_span(name="dogpark") @@ -442,7 +426,7 @@ def test_records_lost_event_only_if_traces_sampler_enabled( sampled_output, expected_record_lost_event_calls, ): - sentry_init(traces_sampler=traces_sampler, trace_lifecycle="stream") + sentry_init(traces_sampler=traces_sampler) record_lost_event_calls = capture_record_lost_event_calls() segment = sentry_sdk.traces.start_span(name="dogpark") @@ -458,7 +442,6 @@ def test_unsampled_spans_produce_client_report_if_traces_sample_rate_defined( ): sentry_init( traces_sample_rate=0.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -487,7 +470,6 @@ def test_unsampled_spans_produce_client_report_if_traces_sampler_defined( ): sentry_init( traces_sampler=lambda _: 0.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -516,7 +498,6 @@ def test_no_client_reports_if_tracing_is_off( ): sentry_init( traces_sample_rate=None, - trace_lifecycle="stream", ) items = capture_items("span") diff --git a/tests/tracing/test_span_batcher.py b/tests/tracing/test_span_batcher.py index 8eae824ce0..9ea62d4495 100644 --- a/tests/tracing/test_span_batcher.py +++ b/tests/tracing/test_span_batcher.py @@ -13,7 +13,6 @@ def test_envelope_by_trace_id(sentry_init, capture_envelopes, monkeypatch): """Envelopes only contain spans of one trace ID.""" sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", ) envelopes = capture_envelopes() @@ -68,7 +67,6 @@ def test_max_envelope_size(sentry_init, capture_envelopes, monkeypatch): sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", ) envelopes = capture_envelopes() @@ -110,7 +108,6 @@ def test_drop_after_max_reached( sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", ) envelopes = capture_envelopes() @@ -144,7 +141,6 @@ def test_drop_isolated_per_bucket( sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", ) envelopes = capture_envelopes() @@ -195,7 +191,6 @@ def test_length_based_flushing(sentry_init, capture_items, monkeypatch): sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -219,7 +214,6 @@ def test_weight_based_flushing(sentry_init, capture_envelopes, monkeypatch): sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", ) envelopes = capture_envelopes() @@ -245,7 +239,6 @@ def test_weight_based_flushing_by_attribute_size( sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", ) envelopes = capture_envelopes() @@ -283,7 +276,6 @@ def test_bucket_recreated_after_flush(sentry_init, capture_envelopes, monkeypatc sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", ) envelopes = capture_envelopes() @@ -333,7 +325,6 @@ def test_quiet_buckets_flush_eventually(sentry_init, capture_envelopes, monkeypa sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", ) envelopes = capture_envelopes() @@ -359,7 +350,6 @@ def test_quiet_buckets_flushed_with_busy_neighbors( sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", ) envelopes = capture_envelopes() @@ -412,7 +402,6 @@ def test_transport_format(sentry_init, capture_envelopes): server_name="test-server", release="1.0.0", traces_sample_rate=1.0, - trace_lifecycle="stream", ) envelopes = capture_envelopes() @@ -465,7 +454,7 @@ def test_trace_bucket_flushes_when_segment_ends( """All currently completed spans in a trace are flushed when the segment is finished.""" monkeypatch.setattr(SpanBatcher, "FLUSH_WAIT_TIME", 100000) - sentry_init(traces_sample_rate=1.0, trace_lifecycle="stream") + sentry_init(traces_sample_rate=1.0) items = capture_items("span") with sentry_sdk.traces.start_span(name="segment span"): @@ -498,7 +487,6 @@ def test_span_batcher_lock_reset_in_child_after_fork(sentry_init): """ sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", ) batcher = sentry_sdk.get_client().span_batcher assert batcher is not None diff --git a/tests/tracing/test_span_origin.py b/tests/tracing/test_span_origin.py index f36b4ab84e..c2b8fa2e96 100644 --- a/tests/tracing/test_span_origin.py +++ b/tests/tracing/test_span_origin.py @@ -2,7 +2,7 @@ def test_span_origin_manual(sentry_init, capture_items): - sentry_init(trace_lifecycle="stream", traces_sample_rate=1.0) + sentry_init(traces_sample_rate=1.0) items = capture_items("span") with sentry_sdk.traces.start_span(name="hi"): @@ -17,7 +17,7 @@ def test_span_origin_manual(sentry_init, capture_items): def test_span_origin_custom(sentry_init, capture_items): - sentry_init(trace_lifecycle="stream", traces_sample_rate=1.0) + sentry_init(traces_sample_rate=1.0) items = capture_items("span") with sentry_sdk.traces.start_span( diff --git a/tests/tracing/test_span_streaming.py b/tests/tracing/test_span_streaming.py index 295c963b1a..e565c84b5b 100644 --- a/tests/tracing/test_span_streaming.py +++ b/tests/tracing/test_span_streaming.py @@ -21,7 +21,6 @@ def test_start_span(sentry_init, capture_items): sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -61,7 +60,6 @@ def test_start_span(sentry_init, capture_items): def test_start_span_no_context_manager(sentry_init, capture_items): sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -109,7 +107,6 @@ def traces_sampler(sampling_context): sentry_init( traces_sampler=traces_sampler, - trace_lifecycle="stream", ) items = capture_items("span") @@ -131,7 +128,6 @@ def traces_sampler(sampling_context): def test_start_span_attributes(sentry_init, capture_items): sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -163,7 +159,6 @@ def traces_sampler(sampling_context): sentry_init( traces_sampler=traces_sampler, - trace_lifecycle="stream", ) items = capture_items("span") @@ -204,7 +199,6 @@ def traces_sampler(sampling_context): sentry_init( traces_sampler=traces_sampler, - trace_lifecycle="stream", ) items = capture_items("span") @@ -233,7 +227,6 @@ def before_send_span(span, hint): sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", before_send_span=before_send_span, ) @@ -274,7 +267,6 @@ def before_send_span(span, hint): sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", before_send_span=before_send_span, ) @@ -301,7 +293,6 @@ def before_send_span(span, hint): sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", before_send_span=before_send_span, ) @@ -330,7 +321,6 @@ def before_send_span(span, hint): sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", before_send_span=before_send_span, ignore_spans=[ "ignored", @@ -360,7 +350,6 @@ def before_send_span(span, hint): sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", before_send_span=before_send_span, ) @@ -385,7 +374,6 @@ def before_send_span(span, hint): def test_span_attributes(sentry_init, capture_items): sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -419,7 +407,6 @@ def test_span_attributes(sentry_init, capture_items): def test_span_attributes_serialize_early(sentry_init, capture_items): sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -464,7 +451,6 @@ def traces_sampler(sampling_context): sentry_init( traces_sampler=traces_sampler, - trace_lifecycle="stream", ) items = capture_items("span") @@ -496,7 +482,6 @@ def traces_sampler(sampling_context): sentry_init( traces_sampler=traces_sampler, - trace_lifecycle="stream", ) with sentry_sdk.traces.start_span(name="segment") as segment: @@ -513,7 +498,6 @@ def traces_sampler(sampling_context): def test_start_inactive_span(sentry_init, capture_items): sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -550,7 +534,6 @@ def test_start_inactive_span(sentry_init, capture_items): def test_start_span_override_parent(sentry_init, capture_items): sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -589,7 +572,6 @@ def test_start_span_override_parent(sentry_init, capture_items): def test_sibling_segments(sentry_init, capture_items): sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -622,7 +604,6 @@ def test_sibling_segments(sentry_init, capture_items): def test_sibling_segments_new_trace(sentry_init, capture_items): sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -657,7 +638,6 @@ def test_continue_trace_sampled(sentry_init, capture_items): sentry_init( # parent sampling decision takes precedence over traces_sample_rate traces_sample_rate=0.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -697,7 +677,6 @@ def test_continue_trace_unsampled(sentry_init, capture_items): sentry_init( # parent sampling decision takes precedence over traces_sample_rate traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -749,7 +728,6 @@ def test_backpressure_outcome( sentry_init( traces_sample_rate=0.5, enable_backpressure_handling=True, - trace_lifecycle="stream", ) items = capture_items("span") @@ -795,7 +773,6 @@ def test_continue_trace_no_sample_rand(sentry_init, capture_items): sentry_init( # parent sampling decision takes precedence over traces_sample_rate traces_sample_rate=0.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -850,7 +827,6 @@ def test_outgoing_traceparent_and_baggage_head_sdk(sentry_init, traces_sample_ra sentry_init( traces_sample_rate=traces_sample_rate, - trace_lifecycle="stream", ) sentry_sdk.traces.new_trace() @@ -917,7 +893,6 @@ def test_outgoing_traceparent_and_baggage_incoming_trace( # test_outgoing_traceparent_and_baggage_incoming_trace_deferred sentry_init( traces_sample_rate=traces_sample_rate, - trace_lifecycle="stream", ) trace_id = "0af7651916cd43dd8448eb211c80319c" @@ -997,7 +972,6 @@ def test_outgoing_traceparent_and_baggage_inconsistent_incoming_trace( # sampling decision sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", ) trace_id = "0af7651916cd43dd8448eb211c80319c" @@ -1055,7 +1029,6 @@ def test_outgoing_traceparent_and_baggage_incoming_trace_deferred( """The SDK handles a deferred incoming sampling decision correctly.""" sentry_init( traces_sample_rate=traces_sample_rate, - trace_lifecycle="stream", ) if traces_sample_rate == 0.0: @@ -1111,7 +1084,6 @@ def test_outgoing_traceparent_and_baggage_incoming_trace_deferred( def test_outgoing_traceparent_and_baggage_ignored_segment(sentry_init): sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", ignore_spans=[ "ignored", ], @@ -1150,7 +1122,6 @@ def test_outgoing_traceparent_and_baggage_ignored_segment(sentry_init): def test_outgoing_traceparent_and_baggage_ignored_child_span(sentry_init): sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", ignore_spans=[ "ignored", ], @@ -1195,7 +1166,6 @@ def test_outgoing_traceparent_and_baggage_ignored_child_span(sentry_init): def test_set_span_status(sentry_init, capture_items): sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -1219,7 +1189,6 @@ def test_set_span_status(sentry_init, capture_items): def test_set_span_status_on_error(sentry_init, capture_items): sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", ) items = capture_items("span") @@ -1240,7 +1209,6 @@ def test_set_span_status_on_error(sentry_init, capture_items): def test_set_span_status_on_ignored_span(sentry_init, capture_items): sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", ignore_spans=["ignored"], ) @@ -1338,7 +1306,6 @@ def test_ignore_spans_basic( ): sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", ignore_spans=["ignored"], ) @@ -1370,7 +1337,6 @@ def test_ignore_spans_ignored_segment_drops_whole_tree( # Ignored segments should drop the whole span tree. sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", ignore_spans=["ignored"], ) @@ -1405,7 +1371,6 @@ def test_ignore_spans_ignored_segment_drops_whole_tree_explicit_parent_span( # Ignored segments should drop the whole span tree. sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", ignore_spans=["ignored"], ) @@ -1445,7 +1410,6 @@ def test_ignore_spans_set_ignored_child_span_as_parent( # Ignored non-segment spans should NOT drop the whole subtree under them. sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", ignore_spans=["ignored"], ) @@ -1485,7 +1449,6 @@ def test_ignore_spans_set_ignored_child_span_as_parent_explicit_parent_span( # Ignored non-segment spans should NOT drop the whole subtree under them. sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", ignore_spans=["ignored"], ) @@ -1534,7 +1497,6 @@ def test_ignore_spans_set_ignored_child_span_as_parent_explicit_parent_span( def test_ignore_spans_reparenting(sentry_init, capture_items): sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", ignore_spans=["ignored"], ) @@ -1575,7 +1537,6 @@ def test_ignored_spans_produce_client_report( ): sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", ignore_spans=["ignored"], ) @@ -1610,7 +1571,6 @@ def test_segment_span_has_profiler_id( profile_lifecycle="trace", profiler_mode="thread", profile_session_sample_rate=1.0, - trace_lifecycle="stream", _experiments={ "continuous_profiling_auto_start": True, }, @@ -1645,7 +1605,6 @@ def test_segment_span_no_profiler_id_when_unsampled( profile_lifecycle="trace", profiler_mode="thread", profile_session_sample_rate=0.0, - trace_lifecycle="stream", _experiments={ "continuous_profiling_auto_start": True, }, @@ -1681,7 +1640,6 @@ def test_profile_stops_when_segment_ends( profile_lifecycle="trace", profiler_mode="thread", profile_session_sample_rate=1.0, - trace_lifecycle="stream", _experiments={ "continuous_profiling_auto_start": True, }, @@ -1705,7 +1663,6 @@ def test_default_attributes(sentry_init, capture_envelopes): release="1.0.0", dist="1.0", traces_sample_rate=1.0, - trace_lifecycle="stream", ) envelopes = capture_envelopes() @@ -1761,7 +1718,6 @@ def test_ignore_spans_top_level( ): sentry_init( traces_sample_rate=1.0, - trace_lifecycle="stream", ignore_spans=ignore_spans, )