use documented url attributes

Author: alexander-alderman-webb

sentry_sdk/consts.py

@@ -881,6 +881,12 @@ class SPANDATA:
     Example: "tcp", "udp", "unix"
     """
 
+    PROCESS_PID = "process.pid"
+    """
+    The process ID of the running process.
+    Example: 12345
+    """
+
     PROFILER_ID = "profiler_id"
     """
     Label identifying the profiler id that the span occurred in. This should be a string.
@@ -924,6 +930,24 @@ class SPANDATA:
     Example: "MainThread"
     """
 
+    URL_FULL = "url.full"
+    """
+    The URL of the resource that was fetched.
+    Example: "https://example.com/test?foo=bar#buzz"
+    """
+
+    URL_FRAGMENT = "url.fragment"
+    """
+    The fragments present in the URI. Note that this does not contain the leading # character, while the `http.fragment` attribute does.
+    Example: "details"
+    """
+
+    URL_QUERY = "url.query"
+    """
+    The query string present in the URL. Note that this does not contain the leading ? character, while the `http.query` attribute does.
+    Example: "foo=bar&bar=baz"
+    """
+
     MCP_TOOL_NAME = "mcp.tool.name"
     """
     The name of the MCP tool being called.

sentry_sdk/integrations/stdlib.py

@@ -104,7 +104,6 @@ def putrequest(
             parsed_url = parse_url(real_url, sanitize=False)
 
         span_streaming = has_span_streaming_enabled(client.options)
-        span: "Union[Span, StreamedSpan]"
         if span_streaming:
             span = sentry_sdk.traces.start_span(
                 name="%s %s"
@@ -114,6 +113,13 @@ def putrequest(
                     "sentry.op": OP.HTTP_CLIENT,
                 },
             )
+
+            span.set_attribute(SPANDATA.HTTP_METHOD, method)
+            if parsed_url is not None:
+                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)
+
             set_on_span = span.set_attribute
 
         else:
@@ -123,13 +129,14 @@ def putrequest(
                 % (method, parsed_url.url if parsed_url else SENSITIVE_DATA_SUBSTITUTE),
                 origin="auto.http.stdlib.httplib",
             )
-            set_on_span = span.set_data
 
-        set_on_span(SPANDATA.HTTP_METHOD, method)
-        if parsed_url is not None:
-            set_on_span("url", parsed_url.url)
-            set_on_span(SPANDATA.HTTP_QUERY, parsed_url.query)
-            set_on_span(SPANDATA.HTTP_FRAGMENT, parsed_url.fragment)
+            span.set_data(SPANDATA.HTTP_METHOD, method)
+            if parsed_url is not None:
+                span.set_data("url", parsed_url.url)
+                span.set_data(SPANDATA.HTTP_QUERY, parsed_url.query)
+                span.set_data(SPANDATA.HTTP_FRAGMENT, parsed_url.fragment)
+
+            set_on_span = span.set_data
 
         # for proxies, these point to the proxy host/port
         if tunnel_host:

tests/integrations/stdlib/test_httplib.py

@@ -980,7 +980,10 @@ def test_proxy_http_tunnel(
 
         port_modifier = f":{tunnel_port}" if tunnel_port else ""
         assert span["name"] == f"GET http://api.example.com{port_modifier}/foo"
-        assert span["attributes"]["url"] == f"http://api.example.com{port_modifier}/foo"
+        assert (
+            span["attributes"][SPANDATA.URL_FULL]
+            == f"http://api.example.com{port_modifier}/foo"
+        )
         assert span["attributes"][SPANDATA.HTTP_METHOD] == "GET"
         assert span["attributes"][SPANDATA.NETWORK_PEER_ADDRESS] == "localhost"
         assert span["attributes"][SPANDATA.NETWORK_PEER_PORT] == PROXY_PORT