fix(aiohttp): Correctly apply transaction/segment name

Author: mjq

sentry_sdk/integrations/aiohttp.py

@@ -29,6 +29,7 @@
     SegmentNameSource,
     SpanStatus,
     StreamedSpan,
+    get_current_span,
 )
 from sentry_sdk.tracing import (
     BAGGAGE_HEADER_NAME,
@@ -339,7 +340,13 @@ async def sentry_urldispatcher_resolve(
                 pass
 
             if name is not None:
-                current_span = sentry_sdk.get_current_span()
+                current_scope = sentry_sdk.get_current_scope()
+                current_scope.set_transaction_name(
+                    name,
+                    source=SOURCE_FOR_STYLE[integration.transaction_style],
+                )
+
+                current_span = get_current_span()
                 if isinstance(current_span, StreamedSpan) and not isinstance(
                     current_span, NoOpStreamedSpan
                 ):
@@ -348,12 +355,6 @@ async def sentry_urldispatcher_resolve(
                         "sentry.segment.name.source",
                         SEGMENT_SOURCE_FOR_STYLE[integration.transaction_style].value,
                     )
-                else:
-                    current_scope = sentry_sdk.get_current_scope()
-                    current_scope.set_transaction_name(
-                        name,
-                        source=SOURCE_FOR_STYLE[integration.transaction_style],
-                    )
 
             return rv
 

tests/integrations/aiohttp/test_aiohttp.py

@@ -1918,6 +1918,38 @@ async def hello(request):
     assert server_span["status"] == "error"
 
 
+@pytest.mark.asyncio
+async def test_streaming_route_name_is_applied_to_event_and_segment(
+    sentry_init, aiohttp_client, capture_items
+):
+    sentry_init(
+        integrations=[AioHttpIntegration(transaction_style="method_and_path_pattern")],
+        traces_sample_rate=1.0,
+        trace_lifecycle="stream",
+    )
+
+    async def hello(request):
+        1 / 0
+
+    app = web.Application()
+    app.router.add_get(r"/{var}", hello)
+
+    items = capture_items("event", "span")
+
+    client = await aiohttp_client(app)
+    resp = await client.get("/message")
+    assert resp.status == 500
+
+    sentry_sdk.flush()
+
+    assert len(items) == 2
+    error_event = items[0].payload
+    server_segment = items[1].payload
+
+    assert error_event["transaction"] == "GET /{var}"
+    assert server_segment["name"] == "GET /{var}"
+
+
 @pytest.mark.asyncio
 async def test_http_exception_span_streaming(
     sentry_init, aiohttp_client, capture_items