regression-fix: retain httpx.URL type on request.url

CHANGELOG.md

@@ -19,6 +19,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#2297](https://github.com/open-telemetry/opentelemetry-python-contrib/issues/2297))
 - Ensure all http.server.duration metrics have the same description
   ([#2151](https://github.com/open-telemetry/opentelemetry-python-contrib/issues/2298))
+- Fix regression in httpx `request.url` not being of type `httpx.URL` after `0.44b0`
+  ([#2359](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2359))
 - Avoid losing repeated HTTP headers
   ([#2266](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2266))
 

instrumentation/opentelemetry-instrumentation-httpx/src/opentelemetry/instrumentation/httpx/__init__.py

@@ -270,7 +270,7 @@ def _extract_parameters(args, kwargs):
         # In httpx >= 0.20.0, handle_request receives a Request object
         request: httpx.Request = args[0]
         method = request.method.encode()
-        url = remove_url_credentials(str(request.url))
+        url = httpx.URL(remove_url_credentials(str(request.url)))
         headers = request.headers
         stream = request.stream
         extensions = request.extensions

instrumentation/opentelemetry-instrumentation-httpx/tests/test_httpx_integration.py

@@ -57,6 +57,10 @@ def _async_call(coro: typing.Coroutine) -> asyncio.Task:
 
 
 def _response_hook(span, request: "RequestInfo", response: "ResponseInfo"):
+    # httpx < 0.20.0 url is a tuple of len 4 and not a httpx.URL
+    is_url_tuple = isinstance(request[1], tuple) and len(request[1]) == 4
+    if not is_url_tuple:
+        assert isinstance(request.url, httpx.URL)
     span.set_attribute(
         HTTP_RESPONSE_BODY,
         b"".join(response[2]),
@@ -66,18 +70,30 @@ def _response_hook(span, request: "RequestInfo", response: "ResponseInfo"):
 async def _async_response_hook(
     span: "Span", request: "RequestInfo", response: "ResponseInfo"
 ):
+    # httpx < 0.20.0 url is a tuple of len 4 and not a httpx.URL
+    is_url_tuple = isinstance(request[1], tuple) and len(request[1]) == 4
+    if not is_url_tuple:
+        assert isinstance(request.url, httpx.URL)
     span.set_attribute(
         HTTP_RESPONSE_BODY,
         b"".join([part async for part in response[2]]),
     )
 
 
 def _request_hook(span: "Span", request: "RequestInfo"):
+    # httpx < 0.20.0 url is a tuple of len 4 and not a httpx.URL
+    is_url_tuple = isinstance(request[1], tuple) and len(request[1]) == 4
+    if not is_url_tuple:
+        assert isinstance(request.url, httpx.URL)
     url = httpx.URL(request[1])
     span.update_name("GET" + str(url))
 
 
 async def _async_request_hook(span: "Span", request: "RequestInfo"):
+    # httpx < 0.20.0 url is a tuple of len 4 and not a httpx.URL
+    is_url_tuple = isinstance(request[1], tuple) and len(request[1]) == 4
+    if not is_url_tuple:
+        assert isinstance(request.url, httpx.URL)
     url = httpx.URL(request[1])
     span.update_name("GET" + str(url))