[requests] add a test to check requests module proxy is correctly instrumented

Author: Emanuele Palazzetti

ddtrace/contrib/requests/connection.py

@@ -53,7 +53,7 @@ def _wrap_request(func, instance, args, kwargs):
         span.service = _extract_service_name(instance, span)
 
         # propagate distributed tracing headers
-        if config.get_from(instance)['distributed_tracing']:
+        if config.get_from(instance).get('distributed_tracing'):
             propagator = HTTPPropagator()
             propagator.inject(span.context, headers)
             kwargs['headers'] = headers
@@ -64,11 +64,11 @@ def _wrap_request(func, instance, args, kwargs):
             return response
         finally:
             try:
-                span.set_tag(http.METHOD, method)
+                span.set_tag(http.METHOD, method.upper())
                 span.set_tag(http.URL, url)
                 if response is not None:
                     span.set_tag(http.STATUS_CODE, response.status_code)
                     # `span.error` must be an integer
                     span.error = int(500 <= response.status_code)
             except Exception:
-                log.debug("error patching tags", exc_info=True)
+                log.debug("requests: error adding tags", exc_info=True)

tests/contrib/requests/test_requests.py

@@ -1,4 +1,5 @@
 import unittest
+import requests
 
 from requests import Session
 from nose.tools import eq_
@@ -7,6 +8,7 @@
 from ddtrace.ext import http, errors
 from ddtrace.contrib.requests import patch, unpatch
 
+from ...util import override_global_tracer
 from ...test_tracer import get_dummy_tracer
 
 # socket name comes from https://english.stackexchange.com/a/44048
@@ -51,9 +53,9 @@ def test_args_kwargs(self):
         url = URL_200
         method = 'GET'
         inputs = [
-                ([], {'method': method, 'url': url}),
-                ([method], {'url': url}),
-                ([method, url], {}),
+            ([], {'method': method, 'url': url}),
+            ([method], {'url': url}),
+            ([method, url], {}),
         ]
 
         for args, kwargs in inputs:
@@ -101,6 +103,21 @@ def test_200(self):
         eq_(s.error, 0)
         eq_(s.span_type, http.TYPE)
 
+    def test_requests_module_200(self):
+        # ensure the requests API is instrumented even without
+        # using a `Session` directly
+        with override_global_tracer(self.tracer):
+            out = requests.get(URL_200)
+            eq_(out.status_code, 200)
+            # validation
+            spans = self.tracer.writer.pop()
+            eq_(len(spans), 1)
+            s = spans[0]
+            eq_(s.get_tag(http.METHOD), 'GET')
+            eq_(s.get_tag(http.STATUS_CODE), '200')
+            eq_(s.error, 0)
+            eq_(s.span_type, http.TYPE)
+
     def test_post_500(self):
         out = self.session.post(URL_500)
         # validation

tests/contrib/requests/test_requests_distributed.py

@@ -40,8 +40,7 @@ def matcher(request):
             eq_('bar', resp.text)
 
     def test_propagation_true(self):
-        # [Backward compatibility]: ensure users can switch the distributed
-        # tracing flag using the `Session` attribute
+        # ensure distributed tracing can be enabled
         cfg = config.get_from(self.session)
         cfg['distributed_tracing'] = True
         adapter = Adapter()
@@ -63,8 +62,7 @@ def matcher(request):
         eq_(root.span_id, req.parent_id)
 
     def test_propagation_false(self):
-        # [Backward compatibility]: ensure users can switch the distributed
-        # tracing flag using the `Session` attribute
+        # ensure distributed tracing can be disabled
         cfg = config.get_from(self.session)
         cfg['distributed_tracing'] = False
         adapter = Adapter()