only add span attrs for proxies

Author: sl0thentr0py

sentry_sdk/integrations/stdlib.py

@@ -69,19 +69,18 @@ def _install_httplib() -> None:
     def putrequest(
         self: "HTTPConnection", method: str, url: str, *args: "Any", **kwargs: "Any"
     ) -> "Any":
-        # proxy info is in _tunnel_host/_tunnel_port
-        host = getattr(self, "_tunnel_host", None) or self.host
-
         default_port = self.default_port
-        tunnel_port = getattr(self, "_tunnel_port", None)
-        if tunnel_port:
-            port = tunnel_port
-            # need to override default_port for correct url recording
-            if tunnel_port == 443:
-                default_port = 443
+
+        # proxies go through set_tunnel
+        tunnel_host = getattr(self, "_tunnel_host", None)
+        if tunnel_host:
+            host = tunnel_host
+            port = getattr(self, "_tunnel_port", None)
         else:
+            host = self.host
             port = self.port
 
+
         client = sentry_sdk.get_client()
         if client.get_integration(StdlibIntegration) is None or is_sentry_url(
             client, host
@@ -113,10 +112,10 @@ def putrequest(
             span.set_data(SPANDATA.HTTP_QUERY, parsed_url.query)
             span.set_data(SPANDATA.HTTP_FRAGMENT, parsed_url.fragment)
 
-        # Set network peer address and port (the actual connection endpoint)
         # for proxies, these point to the proxy host/port
-        span.set_data(SPANDATA.NETWORK_PEER_ADDRESS, self.host)
-        span.set_data(SPANDATA.NETWORK_PEER_PORT, self.port)
+        if tunnel_host:
+            span.set_data(SPANDATA.NETWORK_PEER_ADDRESS, self.host)
+            span.set_data(SPANDATA.NETWORK_PEER_PORT, self.port)
 
         rv = real_putrequest(self, method, url, *args, **kwargs)
 

tests/integrations/stdlib/test_httplib.py

@@ -671,21 +671,23 @@ def test_http_timeout(monkeypatch, sentry_init, capture_envelopes):
     assert span["description"] == f"GET http://localhost:{PORT}/bla"  # noqa: E231
 
 
-def test_proxy_https_tunnel(sentry_init, capture_events):
+@pytest.mark.parametrize("tunnel_port", [8080, None])
+def test_proxy_http_tunnel(sentry_init, capture_events, tunnel_port):
     sentry_init(traces_sample_rate=1.0)
     events = capture_events()
 
     with start_transaction(name="test_transaction"):
         conn = HTTPConnection("localhost", PROXY_PORT)
-        conn.set_tunnel("api.example.com", 443)
+        conn.set_tunnel("api.example.com", tunnel_port)
         conn.request("GET", "/foo")
         conn.getresponse()
 
     (event,) = events
     (span,) = event["spans"]
 
-    assert span["description"] == "GET https://api.example.com/foo"
-    assert span["data"]["url"] == "https://api.example.com/foo"
+    port_modifier = f":{tunnel_port}" if tunnel_port else ''
+    assert span["description"] == f"GET http://api.example.com{port_modifier}/foo"
+    assert span["data"]["url"] == f"http://api.example.com{port_modifier}/foo"
     assert span["data"][SPANDATA.HTTP_METHOD] == "GET"
     assert span["data"][SPANDATA.NETWORK_PEER_ADDRESS] == "localhost"
     assert span["data"][SPANDATA.NETWORK_PEER_PORT] == PROXY_PORT