requests: code review feedback

Author: clutchski

ddtrace/contrib/autopatch.py

@@ -41,6 +41,3 @@ def patch_module(path):
     func()
     log.debug("patched")
     return True
-
-if __name__ == '__main__':
-    autopatch()

ddtrace/contrib/requests/__init__.py

@@ -1,9 +1,5 @@
-
-
 """
-To trace HTTP calls from the request's library with or without monkeypatching.
-To automatically trace all requests, do the following:
-
+To trace all HTTP calls from the requests library, patch the library like so::
 
     # Patch the requests library.
     from ddtrace.contrib.requests import patch
@@ -12,9 +8,8 @@
     import requests
     requests.get("http://www.datadog.com")
 
-If you would prefer finer grained control, use a TracedSession object
-as you would a requests.Session:
-
+If you would prefer finer grained control without monkeypatching the requests'
+code, use a TracedSession object as you would a requests.Session::
 
     from ddtrace.contrib.requests import TracedSession
 

ddtrace/contrib/requests/patch.py

@@ -34,7 +34,6 @@ def _traced_request_func(func, instance, args, kwargs):
     if not tracer.enabled:
         return func(*args, **kwargs)
 
-    # FIXME[matt] be a bit less brittle here.
     method = kwargs.get('method') or args[0]
     url = kwargs.get('url') or args[1]
 

tests/contrib/requests/test_requests.py

@@ -106,7 +106,7 @@ def test_non_existant_url():
         tracer, session = get_traced_session()
 
         try:
-            session.get('http://i.hope.this.will.never.ever.exist.purple.monkey.dishwasher')
+            session.get('http://doesnotexist.google.com')
         except Exception:
             pass
         else: