types

Author: sentrivana

sentry_sdk/integrations/aiohttp.py

@@ -50,7 +50,11 @@
 if TYPE_CHECKING:
     from aiohttp.web_request import Request
     from aiohttp.abc import AbstractMatchInfo
-    from aiohttp import TraceRequestStartParams, TraceRequestEndParams
+    from aiohttp import (
+        TraceRequestStartParams,
+        TraceRequestEndParams,
+        TraceRequestChunkSentParams,
+    )
     from types import SimpleNamespace
     from typing import Any
     from typing import Dict
@@ -244,6 +248,7 @@ async def on_request_start(session, trace_config_ctx, params):
             trace_config_ctx.request_headers = params.headers
 
     async def on_request_chunk_sent(session, trace_config_ctx, params):
+        # type: (ClientSession, SimpleNamespace, TraceRequestChunkSentParams) -> None
         if not hasattr(params, "url") or not hasattr(params, "method"):
             return
 
@@ -346,7 +351,7 @@ def aiohttp_server_processor(
 
 
 def _make_client_processor(trace_config_ctx, response, response_content):
-    # type: (SimpleNamespace, Response, Optional[dict]) -> EventProcessor
+    # type: (SimpleNamespace, Response, Optional[Dict[str, Any]]) -> EventProcessor
     def aiohttp_client_processor(
         event,  # type: Dict[str, Any]
         hint,  # type: Dict[str, Tuple[type, BaseException, Any]]

sentry_sdk/integrations/httpx.py

@@ -207,6 +207,7 @@ def httpx_processor(
 
 
 def _capture_graphql_errors(hub, request, response):
+    # type: (Hub, Request, Response) -> None
     if (
         request.url.path == "/graphql"
         and request.method in ("GET", "POST")

sentry_sdk/integrations/stdlib.py

@@ -145,7 +145,7 @@ def getresponse(self, *args, **kwargs):
             span.set_data("reason", rv.reason)
             span.finish()
 
-        url = getattr(self, "_sentrysdk_url", None)
+        url = getattr(self, "_sentrysdk_url", None)  # type: Optional[str]
         if url is None:
             return rv
 
@@ -189,18 +189,20 @@ def getresponse(self, *args, **kwargs):
 
 
 def _make_request_processor(url, method, status, request_body, response_body):
-    # type: (str, str, int, Any, Any) -> EventProcessor
+    # type: (Optional[str], str, int, Any, Any) -> EventProcessor
     def stdlib_processor(
         event,  # type: Dict[str, Any]
         hint,  # type: Dict[str, Tuple[type, BaseException, Any]]
     ):
         with capture_internal_exceptions():
-            parsed_url = urlparse(url)
-
             request_info = event.setdefault("request", {})
-            request_info["url"] = url
+
+            if url is not None:
+                parsed_url = urlparse(url)
+                request_info["query_string"] = parsed_url.query
+                request_info["url"] = url
+
             request_info["method"] = method
-            request_info["query_string"] = parsed_url.query
             try:
                 request_info["data"] = json.loads(request_body)
             except json.JSONDecodeError:

sentry_sdk/utils.py

@@ -1280,7 +1280,7 @@ class SentryGraphQLClientError(Exception):
 
 
 def _get_graphql_operation_name(query):
-    # type: (dict) -> str
+    # type: (Dict[str, Any]) -> str
     if query.get("operationName"):
         return query["operationName"]
 
@@ -1293,7 +1293,7 @@ def _get_graphql_operation_name(query):
 
 
 def _get_graphql_operation_type(query):
-    # type: (dict) -> str
+    # type: (Dict[str, Any]) -> str
     query = query["query"].strip()
     if query.startswith("mutation"):
         return "mutation"

tests/integrations/requests/test_requests.py

@@ -1,6 +1,5 @@
 import pytest
 import responses
-from textwrap import dedent
 
 requests = pytest.importorskip("requests")
 
@@ -63,92 +62,3 @@ def test_omit_url_data_if_parsing_fails(sentry_init, capture_events):
         "reason": response.reason,
         # no url related data
     }
-
-
-def test_graphql_get_client_error_captured(sentry_init, capture_events):
-    sentry_init(integrations=[StdlibIntegration()])
-
-    url = "http://example.com/graphql"
-    response = {
-        "data": None,
-        "errors": [
-            {
-                "message": "some error",
-                "locations": [{"line": 2, "column": 3}],
-                "path": ["user"],
-            }
-        ],
-    }
-    responses.add(responses.GET, url, status=200, json=response)
-
-    events = capture_events()
-
-    requests.get(url, params={"query": "query QueryName {user{name}}"})
-
-    (event,) = events
-
-    assert event["request"]["url"] == url
-    assert event["request"]["method"] == "GET"
-    assert (
-        event["request"]["query_string"]
-        == "query=query%20QueryName%20%7Buser%7Bname%7D%7D"
-    )
-    assert "data" not in event["request"]
-    assert event["contexts"]["response"]["data"] == response
-
-    assert event["request"]["api_target"] == "graphql"
-    assert event["fingerprint"] == ["QueryName", "query", 200]
-    assert (
-        event["exception"]["values"][0]["value"]
-        == "GraphQL request failed, name: QueryName, type: query"
-    )
-
-
-def test_graphql_post_client_error_captured(sentry_init, capture_events):
-    sentry_init(integrations=[StdlibIntegration()])
-
-    url = "http://example.com/graphql"
-    request = {
-        "query": dedent(
-            """
-            mutation AddPet ($name: String!) {
-                addPet(name: $name) {
-                    id
-                    name
-                }
-            }
-        """
-        ),
-        "variables": {
-            "name": "Lucy",
-        },
-    }
-    response = {
-        "data": None,
-        "errors": [
-            {
-                "message": "already have too many pets",
-                "locations": [{"line": 1, "column": 1}],
-            }
-        ],
-    }
-    responses.add(responses.POST, url, status=200, json=response)
-
-    events = capture_events()
-
-    requests.post(url, json=request)
-
-    (event,) = events
-
-    assert event["request"]["url"] == url
-    assert event["request"]["method"] == "POST"
-    assert event["request"]["query_string"] == ""
-    assert event["request"]["data"] == request
-    assert event["contexts"]["response"]["data"] == response
-
-    assert event["request"]["api_target"] == "graphql"
-    assert event["fingerprint"] == ["AddPet", "mutation", 200]
-    assert (
-        event["exception"]["values"][0]["value"]
-        == "GraphQL request failed, name: AddPet, type: mutation"
-    )