remanining tests

Author: alexander-alderman-webb

tests/integrations/django/asgi/test_asgi.py

@@ -1049,3 +1049,54 @@ async def test_transaction_http_method_custom(
         (event1, event2) = events
         assert event1["request"]["method"] == "OPTIONS"
         assert event2["request"]["method"] == "HEAD"
+
+
+@pytest.mark.parametrize("application", APPS)
+@pytest.mark.asyncio
+@pytest.mark.skipif(
+    django.VERSION < (3, 0), reason="Django ASGI support shipped in 3.0"
+)
+@pytest.mark.parametrize("span_streaming", [True, False])
+async def test_request_url(
+    sentry_init,
+    capture_events,
+    capture_items,
+    application,
+    span_streaming,
+):
+    sentry_init(
+        integrations=[DjangoIntegration()],
+        traces_sample_rate=1.0,
+        send_default_pii=True,
+        _experiments={"trace_lifecycle": "stream" if span_streaming else "static"},
+    )
+    comm = HttpCommunicator(
+        application,
+        "GET",
+        "/root/nomessage",
+    )
+
+    if span_streaming:
+        items = capture_items("span")
+        await comm.get_response()
+        await comm.wait()
+
+        sentry_sdk.flush()
+        spans = [item.payload for item in items]
+
+        (server_span,) = (
+            span
+            for span in spans
+            if span["attributes"].get("sentry.op") == "http.server"
+        )
+        assert server_span["attributes"]["url.full"] == (
+            "http://testserver/root/nomessage"
+        )
+    else:
+        events = capture_events()
+
+        await comm.get_response()
+        await comm.wait()
+
+        (event,) = events
+        assert event["request"]["url"] == "http://testserver/root/nomessage"

tests/integrations/fastapi/test_fastapi.py

@@ -62,6 +62,7 @@
 
 def fastapi_app_factory():
     app = FastAPI()
+    mounted_app = FastAPI()
 
     @app.get("/error")
     async def _error():
@@ -74,6 +75,7 @@ async def _message():
         capture_message("Hi")
         return {"message": "Hi"}
 
+    @mounted_app.get("/nomessage")
     @app.delete("/nomessage")
     @app.get("/nomessage")
     @app.head("/nomessage")
@@ -118,6 +120,8 @@ async def body_form(
         capture_message("hi")
         return {"status": "ok"}
 
+    app.mount("/root", mounted_app)
+
     return app
 
 
@@ -1058,7 +1062,7 @@ def test_request_url(sentry_init, capture_events, capture_items, span_streaming)
 
     starlette_app = fastapi_app_factory()
 
-    client = TestClient(starlette_app, root_path="/root")
+    client = TestClient(starlette_app)
 
     if span_streaming:
         items = capture_items("span")
@@ -1080,7 +1084,6 @@ def test_request_url(sentry_init, capture_events, capture_items, span_streaming)
 
         client.get("/root/nomessage")
 
-        assert len(events) == 1
         (event,) = events
         assert event["request"]["url"] == "http://testserver/root/nomessage"
 

tests/integrations/litestar/test_litestar.py

@@ -47,6 +47,10 @@ async def message_with_id() -> "dict[str, Any]":
         capture_message("hi")
         return {"status": "ok"}
 
+    @get("/nomessage")
+    async def nomessage() -> "dict[str, Any]":
+        return {"status": "ok"}
+
     logging_config = LoggingConfig()
 
     app = Litestar(
@@ -55,6 +59,7 @@ async def message_with_id() -> "dict[str, Any]":
             custom_error,
             message,
             message_with_id,
+            nomessage,
             MyController,
         ],
         debug=debug,
@@ -818,3 +823,41 @@ async def error() -> None: ...
     event_exception = events[0]["exception"]["values"][0]
     assert event_exception["type"] == "RuntimeError"
     assert event_exception["value"] == "Too Hot"
+
+
+@pytest.mark.parametrize("span_streaming", [True, False])
+def test_request_url(sentry_init, capture_events, capture_items, span_streaming):
+    sentry_init(
+        traces_sample_rate=1.0,
+        integrations=[LitestarIntegration()],
+        _experiments={
+            "trace_lifecycle": "stream" if span_streaming else "static",
+        },
+    )
+
+    litestar_app = litestar_app_factory()
+    client = TestClient(litestar_app, root_path="/root")
+
+    if span_streaming:
+        items = capture_items("span")
+
+        client.get("/root/nomessage")
+
+        sentry_sdk.flush()
+        spans = [item.payload for item in items]
+
+        (server_span,) = (
+            span
+            for span in spans
+            if span["attributes"].get("sentry.op") == "http.server"
+        )
+        assert server_span["attributes"]["url.full"] == (
+            "http://testserver/root/nomessage"
+        )
+    else:
+        events = capture_events()
+
+        client.get("/root/nomessage")
+
+        (event,) = events
+        assert event["request"]["url"] == "http://testserver/root/nomessage"

tests/integrations/quart/test_quart.py

@@ -44,6 +44,10 @@ async def hi():
         capture_message("hi")
         return "ok"
 
+    @app.route("/nomessage")
+    async def nomessage():
+        return "ok"
+
     @app.route("/message/<message_id>")
     async def hi_with_id(message_id):
         capture_message("hi with id")
@@ -682,6 +686,22 @@ async def test_span_origin(sentry_init, capture_events):
     assert event["contexts"]["trace"]["origin"] == "auto.http.quart"
 
 
+@pytest.mark.asyncio
+async def test_request_url(sentry_init, capture_events):
+    sentry_init(
+        traces_sample_rate=1.0,
+        integrations=[quart_sentry.QuartIntegration()],
+    )
+    app = quart_app_factory()
+    client = app.test_client()
+
+    events = capture_events()
+    await client.get("/root/nomessage", root_path="/root")
+
+    (event,) = events
+    assert event["request"]["url"] == "http://localhost/root/nomessage"
+
+
 @pytest.mark.asyncio
 async def test_span_streaming_basic(sentry_init, capture_items):
     sentry_init(
@@ -966,3 +986,28 @@ async def test_span_streaming_sensitive_header_passthrough_with_pii(
         segment["attributes"]["http.request.header.authorization"]
         == "Bearer secret-token"
     )
+
+
+@pytest.mark.asyncio
+async def test_span_streaming_request_url(sentry_init, capture_items):
+    sentry_init(
+        traces_sample_rate=1.0,
+        send_default_pii=True,
+        integrations=[quart_sentry.QuartIntegration()],
+        _experiments={
+            "trace_lifecycle": "stream",
+        },
+    )
+    app = quart_app_factory()
+    client = app.test_client()
+
+    items = capture_items("span")
+    await client.get("/root/nomessage", root_path="/root")
+
+    sentry_sdk.flush()
+    spans = [item.payload for item in items]
+
+    (server_span,) = (
+        span for span in spans if span["attributes"].get("sentry.op") == "http.server"
+    )
+    assert server_span["attributes"]["url.full"] == "http://localhost/root/nomessage"

tests/integrations/starlette/test_starlette.py

@@ -146,6 +146,12 @@ async def _body_raw(request):
         "TRACE",
     ]
 
+    mounted_app = starlette.applications.Starlette(
+        routes=[
+            starlette.routing.Route("/nomessage", _nomessage, methods=all_methods),
+        ],
+    )
+
     app = starlette.applications.Starlette(
         debug=debug,
         routes=[
@@ -160,6 +166,7 @@ async def _body_raw(request):
             starlette.routing.Route("/body/json", _body_json, methods=["POST"]),
             starlette.routing.Route("/body/form", _body_form, methods=["POST"]),
             starlette.routing.Route("/body/raw", _body_raw, methods=["POST"]),
+            starlette.routing.Mount("/root", app=mounted_app),
         ],
         middleware=middleware,
     )
@@ -1492,7 +1499,7 @@ def test_request_url(sentry_init, capture_events, capture_items, span_streaming)
 
     starlette_app = starlette_app_factory()
 
-    client = TestClient(starlette_app, root_path="/root")
+    client = TestClient(starlette_app)
 
     if span_streaming:
         items = capture_items("span")
@@ -1514,7 +1521,6 @@ def test_request_url(sentry_init, capture_events, capture_items, span_streaming)
 
         client.get("/root/nomessage")
 
-        assert len(events) == 1
         (event,) = events
         assert event["request"]["url"] == "http://testserver/root/nomessage"
 

tests/integrations/starlite/test_starlite.py

@@ -41,6 +41,10 @@ async def message_with_id() -> "Dict[str, Any]":
         capture_message("hi")
         return {"status": "ok"}
 
+    @get("/nomessage")
+    async def nomessage() -> "Dict[str, Any]":
+        return {"status": "ok"}
+
     logging_config = LoggingConfig()
 
     app = Starlite(
@@ -49,6 +53,7 @@ async def message_with_id() -> "Dict[str, Any]":
             custom_error,
             message,
             message_with_id,
+            nomessage,
             MyController,
         ],
         debug=debug,
@@ -574,3 +579,41 @@ async def __call__(self, scope, receive, send):
         }
     else:
         assert "user" not in event
+
+
+@pytest.mark.parametrize("span_streaming", [True, False])
+def test_request_url(sentry_init, capture_events, capture_items, span_streaming):
+    sentry_init(
+        traces_sample_rate=1.0,
+        integrations=[StarliteIntegration()],
+        _experiments={
+            "trace_lifecycle": "stream" if span_streaming else "static",
+        },
+    )
+
+    starlite_app = starlite_app_factory()
+    client = TestClient(starlite_app, root_path="/root")
+
+    if span_streaming:
+        items = capture_items("span")
+
+        client.get("/nomessage")
+
+        sentry_sdk.flush()
+        spans = [item.payload for item in items]
+
+        (server_span,) = (
+            span
+            for span in spans
+            if span["attributes"].get("sentry.op") == "http.server"
+        )
+        assert server_span["attributes"]["url.full"] == (
+            "http://testserver/root/nomessage"
+        )
+    else:
+        events = capture_events()
+
+        client.get("/nomessage")
+
+        (event,) = events
+        assert event["request"]["url"] == "http://testserver/root/nomessage"