chore(rq,arq,pyreqwest): Run blocks gated by has_span_streaming_enabled() unconditionally (#7443)

Author: alexander-alderman-webb

sentry_sdk/integrations/arq.py

@@ -6,7 +6,6 @@
 from sentry_sdk.integrations.logging import ignore_logger_for_events
 from sentry_sdk.scope import should_send_default_pii
 from sentry_sdk.traces import SegmentNameSource
-from sentry_sdk.tracing_utils import has_span_streaming_enabled
 from sentry_sdk.utils import (
     SENSITIVE_DATA_SUBSTITUTE,
     _register_control_flow_exception,
@@ -194,13 +193,12 @@ async def _sentry_coroutine(
         if integration is None:
             return await coroutine(ctx, *args, **kwargs)
 
-        if has_span_streaming_enabled(client.options):
-            scope = sentry_sdk.get_current_scope()
-            span = scope.streamed_span
-            if span is not None:
-                span.name = name
+        scope = sentry_sdk.get_current_scope()
+        span = scope.streamed_span
+        if span is not None:
+            span.name = name
 
-            scope.set_transaction_name(name)
+        scope.set_transaction_name(name)
 
         sentry_sdk.get_isolation_scope().add_event_processor(
             _make_event_processor({**ctx, "job_name": name}, *args, **kwargs)

sentry_sdk/integrations/pyreqwest.py

@@ -8,7 +8,6 @@
     add_http_breadcrumb,
     add_http_request_source,
     get_url_attributes,
-    has_span_streaming_enabled,
     propagate_trace_headers,
 )
 from sentry_sdk.utils import (
@@ -99,11 +98,8 @@ def _get_breadcrumb_url_data(
     if parsed_url is None or not url_attributes:
         return {}
 
-    # Legacy spans keep the bare URL in breadcrumbs; only span streaming
-    # reports the full URL
     url = parsed_url.url
-    if has_span_streaming_enabled(sentry_sdk.get_client().options):
-        url = url_attributes.get(SPANDATA.URL_FULL, url)
+    url = url_attributes.get(SPANDATA.URL_FULL, url)
 
     return {
         "url": url,

sentry_sdk/integrations/rq.py

@@ -7,7 +7,6 @@
 from sentry_sdk.integrations.logging import ignore_logger_for_events
 from sentry_sdk.scope import Scope, should_send_default_pii
 from sentry_sdk.traces import SegmentNameSource
-from sentry_sdk.tracing_utils import has_span_streaming_enabled
 from sentry_sdk.utils import (
     SENSITIVE_DATA_SUBSTITUTE,
     capture_internal_exceptions,
@@ -139,12 +138,7 @@ def sentry_patched_enqueue_job(
                 return old_enqueue_job(self, job, **kwargs)
 
             scope = sentry_sdk.get_current_scope()
-            span = (
-                scope.streamed_span
-                if has_span_streaming_enabled(client.options)
-                else scope.span
-            )
-            if span is not None:
+            if scope.streamed_span is not None:
                 job.meta["_sentry_trace_headers"] = dict(
                     scope.iter_trace_propagation_headers()
                 )

tests/integrations/pyreqwest/test_pyreqwest.py

@@ -692,54 +692,6 @@ async def test_async_crumb_capture(
     capture_events,
     server_port,
     send_default_pii,
-):
-    sentry_init(
-        integrations=[PyreqwestIntegration()],
-        send_default_pii=send_default_pii,
-    )
-
-    url = f"http://localhost:{server_port}/hello?q=test#frag"
-
-    events = capture_events()
-
-    # Ensure the isolation scope contextvar is set before pyreqwest spawns
-    # its middleware on a separate asyncio Task. Without this, the child task
-    # lazily creates its own isolation scope, and breadcrumbs added there
-    # don't propagate back to this task's context.
-    sentry_sdk.get_isolation_scope()
-
-    with sentry_sdk.start_transaction():
-        async with ClientBuilder().build() as client:
-            response = await client.get(url).build().send()
-            assert response.status == 200
-
-        capture_message("Testing!")
-
-    (event,) = events
-
-    crumb = event["breadcrumbs"]["values"][0]
-    assert crumb["type"] == "http"
-    assert crumb["category"] == "httplib"
-
-    expected = {
-        SPANDATA.HTTP_METHOD: "GET",
-        SPANDATA.HTTP_STATUS_CODE: 200,
-    }
-    if send_default_pii:
-        expected["url"] = f"http://localhost:{server_port}/hello"
-        expected[SPANDATA.HTTP_QUERY] = "q=test"
-        expected[SPANDATA.HTTP_FRAGMENT] = "frag"
-
-    assert crumb["data"] == ApproxDict(expected)
-
-
-@pytest.mark.asyncio
-@pytest.mark.parametrize("send_default_pii", [True, False])
-async def test_async_crumb_capture_span_streaming(
-    sentry_init,
-    capture_events,
-    server_port,
-    send_default_pii,
 ):
     sentry_init(
         integrations=[PyreqwestIntegration()],
@@ -801,57 +753,6 @@ def test_crumb_capture_client_error(
 
     events = capture_events()
 
-    with sentry_sdk.start_transaction():
-        client = SyncClientBuilder().build()
-        response = client.get(url).build().send()
-        assert response.status == status_code
-
-        capture_message("Testing!")
-
-    (event,) = events
-
-    crumb = event["breadcrumbs"]["values"][0]
-    assert crumb["type"] == "http"
-    assert crumb["category"] == "httplib"
-
-    if level is None:
-        assert "level" not in crumb
-    else:
-        assert crumb["level"] == level
-
-    assert crumb["data"] == ApproxDict(
-        {
-            SPANDATA.HTTP_METHOD: "GET",
-            SPANDATA.HTTP_STATUS_CODE: status_code,
-        }
-    )
-
-
-@pytest.mark.parametrize(
-    "status_code,level",
-    [
-        (200, None),
-        (301, None),
-        (403, "warning"),
-        (405, "warning"),
-        (500, "error"),
-    ],
-)
-def test_crumb_capture_client_error_span_streaming(
-    sentry_init,
-    capture_events,
-    server_port,
-    status_code,
-    level,
-):
-    sentry_init(
-        integrations=[PyreqwestIntegration()],
-    )
-
-    url = f"http://localhost:{server_port}/status/{status_code}"
-
-    events = capture_events()
-
     with sentry_sdk.traces.start_span(name="segment"):
         client = SyncClientBuilder().build()
         response = client.get(url).build().send()
@@ -955,7 +856,7 @@ def test_crumb_capture_client_error_span_streaming(
         ),
     ],
 )
-def test_url_query_data_collection_span_streaming_sync(
+def test_url_query_data_collection_sync(
     sentry_init,
     capture_items,
     server_port,
@@ -1066,7 +967,7 @@ def test_url_query_data_collection_span_streaming_sync(
         ),
     ],
 )
-async def test_url_query_data_collection_span_streaming_async(
+async def test_url_query_data_collection_async(
     sentry_init,
     capture_items,
     server_port,
@@ -1125,7 +1026,7 @@ async def test_url_query_data_collection_span_streaming_async(
         ),
     ],
 )
-def test_url_full_reassembly_span_streaming_sync(
+def test_url_full_reassembly_sync(
     sentry_init,
     capture_items,
     server_port,
@@ -1183,7 +1084,7 @@ def test_url_full_reassembly_span_streaming_sync(
         ),
     ],
 )
-async def test_url_full_reassembly_span_streaming_async(
+async def test_url_full_reassembly_async(
     sentry_init,
     capture_items,
     server_port,
@@ -1243,7 +1144,7 @@ async def test_url_full_reassembly_span_streaming_async(
         ),
     ],
 )
-def test_url_query_params_off_keeps_bare_url_span_streaming_sync(
+def test_url_query_params_off_keeps_bare_url_sync(
     sentry_init,
     capture_items,
     server_port,
@@ -1311,7 +1212,7 @@ def test_url_query_params_off_keeps_bare_url_span_streaming_sync(
         ),
     ],
 )
-async def test_url_query_params_off_keeps_bare_url_span_streaming_async(
+async def test_url_query_params_off_keeps_bare_url_async(
     sentry_init,
     capture_items,
     server_port,
@@ -1488,142 +1389,8 @@ async def test_crumb_url_query_data_collection_async(
     assert crumb["data"][SPANDATA.HTTP_FRAGMENT] == "frag"
 
 
-@pytest.mark.parametrize(
-    "init_kwargs, expected_query",
-    [
-        pytest.param(
-            {"_experiments": {"data_collection": {}}},
-            "toy=tennisball&color=red&auth=%5BFiltered%5D",
-            id="data_collection_denylist_default",
-        ),
-        pytest.param(
-            {
-                "_experiments": {
-                    "data_collection": {
-                        "url_query_params": {"mode": "allowlist", "terms": ["toy"]}
-                    }
-                }
-            },
-            "toy=tennisball&color=%5BFiltered%5D&auth=%5BFiltered%5D",
-            id="data_collection_allowlist",
-        ),
-        pytest.param(
-            {
-                "_experiments": {
-                    "data_collection": {"url_query_params": {"mode": "off"}}
-                }
-            },
-            "",
-            id="data_collection_off",
-        ),
-    ],
-)
-def test_crumb_url_query_data_collection_legacy_sync(
-    sentry_init,
-    capture_events,
-    server_port,
-    init_kwargs,
-    expected_query,
-):
-    """
-    Legacy (non span streaming) breadcrumbs report the bare URL, but the query
-    is still filtered according to the data collection configuration. Remove
-    when we've dropped transaction support and have fully migrated to span
-    streaming.
-    """
-    sentry_init(integrations=[PyreqwestIntegration()], **init_kwargs)
-
-    base_url = f"http://localhost:{server_port}/hello"
-    url = f"{base_url}?toy=tennisball&color=red&auth=secret#frag"
-
-    events = capture_events()
-
-    client = SyncClientBuilder().build()
-    response = client.get(url).build().send()
-    assert response.status == 200
-
-    capture_message("Testing!")
-
-    (event,) = events
-
-    crumb = event["breadcrumbs"]["values"][0]
-
-    assert crumb["data"]["url"] == base_url
-    assert crumb["data"][SPANDATA.HTTP_QUERY] == expected_query
-    assert crumb["data"][SPANDATA.HTTP_FRAGMENT] == "frag"
-
-
-@pytest.mark.asyncio
-@pytest.mark.parametrize(
-    "init_kwargs, expected_query",
-    [
-        pytest.param(
-            {"_experiments": {"data_collection": {}}},
-            "toy=tennisball&color=red&auth=%5BFiltered%5D",
-            id="data_collection_denylist_default",
-        ),
-        pytest.param(
-            {
-                "_experiments": {
-                    "data_collection": {
-                        "url_query_params": {"mode": "allowlist", "terms": ["toy"]}
-                    }
-                }
-            },
-            "toy=tennisball&color=%5BFiltered%5D&auth=%5BFiltered%5D",
-            id="data_collection_allowlist",
-        ),
-        pytest.param(
-            {
-                "_experiments": {
-                    "data_collection": {"url_query_params": {"mode": "off"}}
-                }
-            },
-            "",
-            id="data_collection_off",
-        ),
-    ],
-)
-async def test_crumb_url_query_data_collection_legacy_async(
-    sentry_init,
-    capture_events,
-    server_port,
-    init_kwargs,
-    expected_query,
-):
-    """
-    Legacy (non span streaming) breadcrumbs report the bare URL, but the query
-    is still filtered according to the data collection configuration. Remove
-    when we've dropped transaction support and have fully migrated to span
-    streaming.
-    """
-    sentry_init(integrations=[PyreqwestIntegration()], **init_kwargs)
-
-    base_url = f"http://localhost:{server_port}/hello"
-    url = f"{base_url}?toy=tennisball&color=red&auth=secret#frag"
-
-    events = capture_events()
-
-    sentry_sdk.get_isolation_scope()
-
-    with sentry_sdk.start_transaction():
-        async with ClientBuilder().build() as client:
-            response = await client.get(url).build().send()
-            assert response.status == 200
-
-        capture_message("Testing!")
-
-    event = next(e for e in events if e.get("breadcrumbs"))
-
-    crumb = event["breadcrumbs"]["values"][0]
-
-    assert crumb["data"]["url"] == base_url
-    assert crumb["data"][SPANDATA.HTTP_QUERY] == expected_query
-    assert crumb["data"][SPANDATA.HTTP_FRAGMENT] == "frag"
-
-
 @pytest.mark.tests_internal_exceptions
-def test_omit_url_data_if_parsing_fails_span_streaming(
+def test_omit_url_data_if_parsing_fails_data_collection(
     sentry_init,
     capture_events,
     capture_items,