fix: correctly handle excluded_urls from kwargs in HTTPXClientInstrumentor

Author: nhtgl

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

@@ -714,9 +714,11 @@ def _instrument(self, **kwargs: typing.Any):
             else None
         )
 
+        excluded_urls_raw = kwargs.get("excluded_urls")
+        
         excluded_urls = (
-            parse_excluded_urls(excluded_urls) 
-            if kwargs.get("excluded_urls") 
+            parse_excluded_urls(excluded_urls_raw) 
+            if excluded_urls_raw
             else _excluded_urls_from_env
         )
 

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

@@ -155,6 +155,7 @@ def setUp(self):
             self.env_patch = mock.patch.dict(
                 "os.environ",
                 {
+                    "OTEL_PYTHON_HTTPX_EXCLUDED_URLS": "http://localhost/env_excluded_arg/123,env_excluded_noarg",
                     OTEL_SEMCONV_STABILITY_OPT_IN: sem_conv_mode,
                 },
             )
@@ -749,22 +750,8 @@ def get_transport_handler(self, transport):
 
         def setUp(self):
             super().setUp()
-            self.env_patch = mock.patch.dict(
-                "os.environ",
-                {
-                    "OTEL_PYTHON_HTTPX_EXCLUDED_URLS": "http://localhost/env_excluded_arg/123,env_excluded_noarg"
-                },
-            )
-            self.env_patch.start()
-
-            self.exclude_patch = mock.patch(
-                "opentelemetry.instrumentation.httpx._excluded_urls_from_env",
-                get_excluded_urls("HTTPX"),
-            )
-            self.exclude_patch.start()
             self.client = self.create_client()
             HTTPXClientInstrumentor().instrument_client(self.client)
-            self.env_patch.stop()
 
         def tearDown(self):
             HTTPXClientInstrumentor().uninstrument()
@@ -973,31 +960,22 @@ def test_uninstrument(self):
 
         def test_excluded_urls_explicit(self):
             url_404 = "http://mock/status/404"
-            httpretty.register_uri(
-                httpretty.GET,
-                url_404,
-                status=404,
-            )
+            respx.get(url_404).mock(httpx.Response(404))
 
             HTTPXClientInstrumentor().instrument(excluded_urls=".*/404")
             client = self.create_client()
-            self.perform_request(self.URL)
-            self.perform_request(url_404)
+            self.perform_request(self.URL, client=client)
+            self.perform_request(url_404, client=client)
 
             self.assert_span(num_spans=1)
 
         def test_excluded_urls_from_env(self):
             url = "http://localhost/env_excluded_arg/123"
-            httpretty.register_uri(
-                httpretty.GET,
-                url,
-                status=200,
-            )
-
+            respx.get(url=url).mock(httpx.Response(200))
             HTTPXClientInstrumentor().instrument()
             client = self.create_client()
-            self.perform_request(self.URL)
-            self.perform_request(url)
+            self.perform_request(self.URL, client=client)
+            self.perform_request(url, client=client)
 
             self.assert_span(num_spans=1)