update http attributes

Author: alexander-alderman-webb

sentry_sdk/consts.py

@@ -844,12 +844,6 @@ class SPANDATA:
     Example: "[{\"role\": \"user\", \"message\": \"hello\"}]"
     """
 
-    HTTP_RESPONSE_STATUS_CODE = "http.response.status_code"
-    """
-    The status code of the HTTP response.
-    Example: 404
-    """
-
     HTTP_QUERY = "http.query"
     """
     The Query string present in the URL.

sentry_sdk/integrations/pyreqwest.py

@@ -96,9 +96,9 @@ def _sentry_pyreqwest_span(request: "Request") -> "Generator[Any, None, None]":
             },
         ) as span:
             if parsed_url is not None:
-                span.set_attribute("url", parsed_url.url)
-                span.set_attribute(SPANDATA.HTTP_QUERY, parsed_url.query)
-                span.set_attribute(SPANDATA.HTTP_FRAGMENT, parsed_url.fragment)
+                span.set_attribute(SPANDATA.URL_FULL, parsed_url.url)
+                span.set_attribute(SPANDATA.URL_QUERY, parsed_url.query)
+                span.set_attribute(SPANDATA.URL_FRAGMENT, parsed_url.fragment)
 
             if should_propagate_trace(sentry_sdk.get_client(), str(request.url)):
                 for (
@@ -167,7 +167,7 @@ async def sentry_async_middleware(
         if isinstance(span, StreamedSpan):
             span.status = "error" if response.status >= 400 else "ok"
             span.set_attribute(
-                SPANDATA.HTTP_RESPONSE_STATUS_CODE,
+                SPANDATA.HTTP_STATUS_CODE,
                 response.status,
             )
         else:
@@ -187,7 +187,7 @@ def sentry_sync_middleware(
         if isinstance(span, StreamedSpan):
             span.status = "error" if response.status >= 400 else "ok"
             span.set_attribute(
-                SPANDATA.HTTP_RESPONSE_STATUS_CODE,
+                SPANDATA.HTTP_STATUS_CODE,
                 response.status,
             )
         else:

tests/integrations/pyreqwest/test_pyreqwest.py

@@ -88,11 +88,11 @@ def test_sync_client_spans(
         span = spans[0]
         assert span["attributes"]["sentry.op"] == "http.client"
         assert span["name"] == f"GET http://localhost:{server_port}/hello"
-        assert span["attributes"]["url"] == f"http://localhost:{server_port}/hello"
+        assert span["attributes"]["url.full"] == f"http://localhost:{server_port}/hello"
         assert span["attributes"][SPANDATA.HTTP_METHOD] == "GET"
         assert span["attributes"][SPANDATA.HTTP_STATUS_CODE] == 200
-        assert span["attributes"][SPANDATA.HTTP_QUERY] == "q=test"
-        assert span["attributes"][SPANDATA.HTTP_FRAGMENT] == "frag"
+        assert span["attributes"][SPANDATA.URL_QUERY] == "q=test"
+        assert span["attributes"][SPANDATA.URL_FRAGMENT] == "frag"
         assert span["attributes"]["sentry.origin"] == "auto.http.pyreqwest"
     else:
         events = capture_events()
@@ -145,7 +145,7 @@ async def test_async_client_spans(
         span = spans[0]
         assert span["attributes"]["sentry.op"] == "http.client"
         assert span["name"] == f"GET {url}"
-        assert span["attributes"]["url"] == url
+        assert span["attributes"]["url.full"] == url
         assert span["attributes"][SPANDATA.HTTP_METHOD] == "GET"
         assert span["attributes"][SPANDATA.HTTP_STATUS_CODE] == 200
         assert span["attributes"]["sentry.origin"] == "auto.http.pyreqwest"
@@ -196,7 +196,7 @@ def test_sync_simple_request_spans(
         span = spans[0]
         assert span["attributes"]["sentry.op"] == "http.client"
         assert span["name"] == f"GET {url}"
-        assert span["attributes"]["url"] == url
+        assert span["attributes"]["url.full"] == url
         assert span["attributes"][SPANDATA.HTTP_METHOD] == "GET"
         assert span["attributes"][SPANDATA.HTTP_STATUS_CODE] == 200
         assert span["attributes"]["sentry.origin"] == "auto.http.pyreqwest"
@@ -247,7 +247,7 @@ async def test_async_simple_request_spans(
         span = spans[0]
         assert span["attributes"]["sentry.op"] == "http.client"
         assert span["name"] == f"GET {url}"
-        assert span["attributes"]["url"] == url
+        assert span["attributes"]["url.full"] == url
         assert span["attributes"][SPANDATA.HTTP_METHOD] == "GET"
         assert span["attributes"][SPANDATA.HTTP_STATUS_CODE] == 200
         assert span["attributes"]["sentry.origin"] == "auto.http.pyreqwest"
@@ -510,8 +510,8 @@ def test_omit_url_data_if_parsing_fails(
         assert span["attributes"][SPANDATA.HTTP_METHOD] == "GET"
         assert span["attributes"][SPANDATA.HTTP_STATUS_CODE] == 200
         assert "url" not in span["attributes"]
-        assert SPANDATA.HTTP_QUERY not in span["attributes"]
-        assert SPANDATA.HTTP_FRAGMENT not in span["attributes"]
+        assert SPANDATA.URL_QUERY not in span["attributes"]
+        assert SPANDATA.URL_FRAGMENT not in span["attributes"]
     else:
         events = capture_events()
 
@@ -530,8 +530,8 @@ def test_omit_url_data_if_parsing_fails(
         assert span["data"][SPANDATA.HTTP_METHOD] == "GET"
         assert span["data"][SPANDATA.HTTP_STATUS_CODE] == 200
         assert "url" not in span["data"]
-        assert SPANDATA.HTTP_QUERY not in span["data"]
-        assert SPANDATA.HTTP_FRAGMENT not in span["data"]
+        assert SPANDATA.URL_QUERY not in span["data"]
+        assert SPANDATA.URL_FRAGMENT not in span["data"]
 
 
 @pytest.mark.parametrize("span_streaming", [True, False])