fix(starlette): Set request body data on segment under streaming

Under span streaming with middleware_spans=True, sentry_sdk.get_current_span() returns the innermost middleware span rather than the segment, so http.request.body.data was being attached to a middleware child span. Route the attribute through current_span._segment so it always lands on the segment, mirroring the _update_active_thread pattern in _sentry_sync_func.

Also deduplicate the sentry_sdk.get_client() call in _sentry_async_func, and parametrize the three body-data streaming tests over middleware_spans=[False, True].

Refs PY-2362
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: ericapisani

sentry_sdk/integrations/starlette.py

@@ -469,9 +469,8 @@ def _sentry_request_response(func: "Callable[[Any], Any]") -> "ASGIApp":
         if is_coroutine:
 
             async def _sentry_async_func(*args: "Any", **kwargs: "Any") -> "Any":
-                integration = sentry_sdk.get_client().get_integration(
-                    StarletteIntegration
-                )
+                client = sentry_sdk.get_client()
+                integration = client.get_integration(StarletteIntegration)
                 if integration is None:
                     return await old_func(*args, **kwargs)
 
@@ -511,7 +510,6 @@ def event_processor(
                     _make_request_event_processor(request, integration)
                 )
 
-                client = sentry_sdk.get_client()
                 is_span_streaming_enabled = has_span_streaming_enabled(client.options)
                 if is_span_streaming_enabled:
                     current_span = sentry_sdk.get_current_span()
@@ -523,7 +521,7 @@ def event_processor(
                         and not isinstance(current_span, NoOpStreamedSpan)
                     ):
                         data = info["data"]
-                        current_span.set_attribute(
+                        current_span._segment.set_attribute(
                             "http.request.body.data",
                             _serialize_body_data(data),
                         )

tests/integrations/starlette/test_starlette.py

@@ -1066,10 +1066,13 @@ async def _handler(request):
     )
 
 
-def test_request_body_data_scrubs_pii_span_streaming(sentry_init, capture_items):
+@pytest.mark.parametrize("middleware_spans", [False, True])
+def test_request_body_data_scrubs_pii_span_streaming(
+    sentry_init, capture_items, middleware_spans
+):
     sentry_init(
         auto_enabling_integrations=False,
-        integrations=[StarletteIntegration()],
+        integrations=[StarletteIntegration(middleware_spans=middleware_spans)],
         traces_sample_rate=1.0,
         _experiments={"trace_lifecycle": "stream"},
     )
@@ -1107,12 +1110,13 @@ async def _read_json(request):
     STARLETTE_VERSION < (0, 21),
     reason="Requires Starlette >= 0.21, because earlier versions use a requests-based TestClient which does not support the 'content' kwarg",
 )
+@pytest.mark.parametrize("middleware_spans", [False, True])
 def test_request_body_data_annotated_value_top_level_span_streaming(
-    sentry_init, capture_items
+    sentry_init, capture_items, middleware_spans
 ):
     sentry_init(
         auto_enabling_integrations=False,
-        integrations=[StarletteIntegration()],
+        integrations=[StarletteIntegration(middleware_spans=middleware_spans)],
         traces_sample_rate=1.0,
         _experiments={"trace_lifecycle": "stream"},
     )
@@ -1140,14 +1144,15 @@ async def _read_body(request):
     assert "!raw" in attr
 
 
+@pytest.mark.parametrize("middleware_spans", [False, True])
 def test_request_body_data_annotated_value_nested_span_streaming(
-    sentry_init, capture_items
+    sentry_init, capture_items, middleware_spans
 ):
     pytest.importorskip("multipart")
 
     sentry_init(
         auto_enabling_integrations=False,
-        integrations=[StarletteIntegration()],
+        integrations=[StarletteIntegration(middleware_spans=middleware_spans)],
         traces_sample_rate=1.0,
         _experiments={"trace_lifecycle": "stream"},
     )