opentelemetry-instrumentation-httpx: make instrument_client a staticmethod again

Author: xrmx

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

@@ -938,8 +938,8 @@ async def _handle_async_request_wrapper(  # pylint: disable=too-many-locals
 
         return response
 
+    @staticmethod
     def instrument_client(
-        self,
         client: typing.Union[httpx.Client, httpx.AsyncClient],
         tracer_provider: TracerProvider = None,
         request_hook: typing.Union[
@@ -996,7 +996,7 @@ def instrument_client(
                 client._transport,
                 "handle_request",
                 partial(
-                    self._handle_request_wrapper,
+                    HTTPXClientInstrumentor._handle_request_wrapper,
                     tracer=tracer,
                     sem_conv_opt_in_mode=sem_conv_opt_in_mode,
                     request_hook=request_hook,
@@ -1008,7 +1008,7 @@ def instrument_client(
                     transport,
                     "handle_request",
                     partial(
-                        self._handle_request_wrapper,
+                        HTTPXClientInstrumentor._handle_request_wrapper,
                         tracer=tracer,
                         sem_conv_opt_in_mode=sem_conv_opt_in_mode,
                         request_hook=request_hook,
@@ -1021,7 +1021,7 @@ def instrument_client(
                 client._transport,
                 "handle_async_request",
                 partial(
-                    self._handle_async_request_wrapper,
+                    HTTPXClientInstrumentor._handle_async_request_wrapper,
                     tracer=tracer,
                     sem_conv_opt_in_mode=sem_conv_opt_in_mode,
                     async_request_hook=async_request_hook,
@@ -1033,7 +1033,7 @@ def instrument_client(
                     transport,
                     "handle_async_request",
                     partial(
-                        self._handle_async_request_wrapper,
+                        HTTPXClientInstrumentor._handle_async_request_wrapper,
                         tracer=tracer,
                         sem_conv_opt_in_mode=sem_conv_opt_in_mode,
                         async_request_hook=async_request_hook,

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

@@ -917,6 +917,13 @@ def test_instrument_client(self):
             self.assertEqual(result.text, "Hello!")
             self.assert_span(num_spans=1)
 
+        def test_instrument_client_a_static_method(self):
+            client = self.create_client()
+            HTTPXClientInstrumentor.instrument_client(client)
+            result = self.perform_request(self.URL, client=client)
+            self.assertEqual(result.text, "Hello!")
+            self.assert_span(num_spans=1)
+
         def test_instrumentation_without_client(self):
             HTTPXClientInstrumentor().instrument()
             results = [