fix(integrations): ASGI integration not capture transactions in Websocket

sentry_sdk/integrations/asgi.py

@@ -192,8 +192,8 @@ async def _run_app(self, scope, receive, send, asgi_version):
 
                     method = scope.get("method", "").upper()
                     transaction = None
-                    if method in self.http_methods_to_capture:
-                        if ty in ("http", "websocket"):
+                    if ty in ("http", "websocket"):
+                        if ty == "websocket" or method in self.http_methods_to_capture:
                             transaction = continue_trace(
                                 _get_headers(scope),
                                 op="{}.server".format(ty),
@@ -205,17 +205,18 @@ async def _run_app(self, scope, receive, send, asgi_version):
                                 "[ASGI] Created transaction (continuing trace): %s",
                                 transaction,
                             )
-                        else:
-                            transaction = Transaction(
-                                op=OP.HTTP_SERVER,
-                                name=transaction_name,
-                                source=transaction_source,
-                                origin=self.span_origin,
-                            )
-                            logger.debug(
-                                "[ASGI] Created transaction (new): %s", transaction
-                            )
+                    else:
+                        transaction = Transaction(
+                            op=OP.HTTP_SERVER,
+                            name=transaction_name,
+                            source=transaction_source,
+                            origin=self.span_origin,
+                        )
+                        logger.debug(
+                            "[ASGI] Created transaction (new): %s", transaction
+                        )
 
+                    if transaction:
                         transaction.set_tag("asgi.type", ty)
                         logger.debug(
                             "[ASGI] Set transaction name and source on transaction: '%s' / '%s'",

tests/integrations/asgi/test_asgi.py

@@ -349,35 +349,32 @@ async def test_trace_from_headers_if_performance_disabled(
 
 @pytest.mark.asyncio
 async def test_websocket(sentry_init, asgi3_ws_app, capture_events, request):
-    sentry_init(send_default_pii=True)
+    sentry_init(send_default_pii=True, traces_sample_rate=1.0)
 
     events = capture_events()
 
     asgi3_ws_app = SentryAsgiMiddleware(asgi3_ws_app)
 
-    scope = {
-        "type": "websocket",
-        "endpoint": asgi3_app,
-        "client": ("127.0.0.1", 60457),
-        "route": "some_url",
-        "headers": [
-            ("accept", "*/*"),
-        ],
-    }
+    request_url = "/ws"
 
     with pytest.raises(ValueError):
-        async with TestClient(asgi3_ws_app, scope=scope) as client:
-            async with client.websocket_connect("/ws") as ws:
-                await ws.receive_text()
+        client = TestClient(asgi3_ws_app)
+        async with client.websocket_connect(request_url) as ws:
+            await ws.receive_text()
 
-    msg_event, error_event = events
+    msg_event, error_event, transaction_event = events
 
+    assert msg_event["transaction"] == request_url
+    assert msg_event["transaction_info"] == {"source": "url"}
     assert msg_event["message"] == "Some message to the world!"
 
     (exc,) = error_event["exception"]["values"]
     assert exc["type"] == "ValueError"
     assert exc["value"] == "Oh no"
 
+    assert transaction_event["transaction"] == request_url
+    assert transaction_event["transaction_info"] == {"source": "url"}
+
 
 @pytest.mark.asyncio
 async def test_auto_session_tracking_with_aggregates(