[bug] fix requests.request (#573)

- test case

close #572

.devcontainer/Dockerfile

@@ -73,4 +73,5 @@ RUN wget https://go.dev/dl/go1.18.10.linux-amd64.tar.gz -O /home/pinpoint/go1.18
 RUN rm -rf /usr/local/go && cd /home/pinpoint/ && tar -C /usr/local -xzf go1.18.10.linux-amd64.tar.gz
 ENV PATH=$PATH:/usr/local/go/bin
 ENV PATH=$PATH:/home/pinpoint/go/bin
+ENV GO111MODULE="on" 
 RUN go install google.golang.org/protobuf/cmd/[email protected] && go install google.golang.org/grpc/cmd/[email protected]

.devcontainer/docker-compose.yaml

@@ -41,8 +41,6 @@ services:
     image: kennethreitz/httpbin:latest
     container_name: httpbin
     hostname: httpbin
-    # ports:
-      # - 8999:80
     volumes:
       - ..:/workspace:cached      
 

plugins/PY/pinpointPy/libs/_requests/__init__.py

@@ -28,7 +28,8 @@ def monkey_patch():
         from .NextSpanPlugin import NextSpanPlugin
 
         Interceptors = [
-            Interceptor(requests.api, 'request', NextSpanPlugin)
+            Interceptor(requests.api, 'request', NextSpanPlugin),
+            Interceptor(requests, 'request', NextSpanPlugin)
         ]
 
         for interceptor in Interceptors:

plugins/PY/pinpointPy/libs/_requests/test_case.py

@@ -35,6 +35,13 @@ def test_patch(self):
         httpbin = create_http_bin_response(body.text)
         self.assertIn(Defines.PP_HEADER_PINPOINT_SPANID, httpbin.headers)
 
+    @PinTransaction("testcase", GenTestHeader())
+    def test_request(self):
+        import requests
+        body = requests.request("POST", 'http://httpbin/anything', data='abc')
+        httpbin = create_http_bin_response(body.text)
+        self.assertIn(Defines.PP_HEADER_PINPOINT_SPANID, httpbin.headers)
+
 
 if __name__ == '__main__':
     unittest.main()