Add transaction styling for aiohttp integration (getsentry#876)

asovchar · web-flow · commit 1cf5d8dc275f · 2020-10-19T13:26:26.000+02:00
diff --git a/sentry_sdk/integrations/aiohttp.py b/sentry_sdk/integrations/aiohttp.py
@@ -43,9 +43,21 @@
     from sentry_sdk._types import EventProcessor
 
 
+TRANSACTION_STYLE_VALUES = ("handler_name", "method_and_path_pattern")
+
+
 class AioHttpIntegration(Integration):
     identifier = "aiohttp"
 
+    def __init__(self, transaction_style="handler_name"):
+        # type: (str) -> None
+        if transaction_style not in TRANSACTION_STYLE_VALUES:
+            raise ValueError(
+                "Invalid value for transaction_style: %s (must be in %s)"
+                % (transaction_style, TRANSACTION_STYLE_VALUES)
+            )
+        self.transaction_style = transaction_style
+
     @staticmethod
     def setup_once():
         # type: () -> None
@@ -120,10 +132,18 @@ async def sentry_urldispatcher_resolve(self, request):
             # type: (UrlDispatcher, Request) -> AbstractMatchInfo
             rv = await old_urldispatcher_resolve(self, request)
 
+            hub = Hub.current
+            integration = hub.get_integration(AioHttpIntegration)
+
             name = None
 
             try:
-                name = transaction_from_function(rv.handler)
+                if integration.transaction_style == "handler_name":
+                    name = transaction_from_function(rv.handler)
+                elif integration.transaction_style == "method_and_path_pattern":
+                    route_info = rv.get_info()
+                    pattern = route_info.get("path") or route_info.get("formatter")
+                    name = "{} {}".format(request.method, pattern)
             except Exception:
                 pass
 
diff --git a/tests/integrations/aiohttp/test_aiohttp.py b/tests/integrations/aiohttp/test_aiohttp.py
@@ -2,6 +2,7 @@
 import json
 from contextlib import suppress
 
+import pytest
 from aiohttp import web
 from aiohttp.client import ServerDisconnectedError
 
@@ -186,3 +187,39 @@ async def hello(request):
         event["transaction"]
         == "tests.integrations.aiohttp.test_aiohttp.test_tracing.<locals>.hello"
     )
+
+
+@pytest.mark.parametrize(
+    "transaction_style,expected_transaction",
+    [
+        (
+            "handler_name",
+            "tests.integrations.aiohttp.test_aiohttp.test_transaction_style.<locals>.hello",
+        ),
+        ("method_and_path_pattern", "GET /{var}"),
+    ],
+)
+async def test_transaction_style(
+    sentry_init, aiohttp_client, capture_events, transaction_style, expected_transaction
+):
+    sentry_init(
+        integrations=[AioHttpIntegration(transaction_style=transaction_style)],
+        traces_sample_rate=1.0,
+    )
+
+    async def hello(request):
+        return web.Response(text="hello")
+
+    app = web.Application()
+    app.router.add_get(r"/{var}", hello)
+
+    events = capture_events()
+
+    client = await aiohttp_client(app)
+    resp = await client.get("/1")
+    assert resp.status == 200
+
+    (event,) = events
+
+    assert event["type"] == "transaction"
+    assert event["transaction"] == expected_transaction
