Merge lp:~james-w/requestsplus/optional-elapsed into lp:requestsplus

[James Westby]

Don't rely on requests providing the elapsed attribute.

[lp:~james-w/requestsplus/optional-elapsed]

12. By James Westby on 2014-10-24

Only set elapsed if requests doesn't.

[Michael Nelson (michael.nelson)]

LGTM

review: Approve

=== modified file 'requestsplus/__init__.py'
--- requestsplus/__init__.py	2014-10-22 19:19:54 +0000
+++ requestsplus/__init__.py	2014-10-24 13:47:34 +0000
@@ -1,4 +1,5 @@
 from contextlib import contextmanager
+from datetime import datetime
 
 from requests import Session as _Session
 
@@ -36,7 +37,13 @@
         kwargs.setdefault('headers', {})
         kwargs['headers'][REQUEST_ID_HEADER] = request_id
         with maybe_timeline(self.timeline_factory, method, url) as action:
+            start_time = datetime.utcnow()
             resp = super(Session, self).request(method, url, **kwargs)
+            if getattr(resp, 'elapsed', None) is None:
+                # Older requests doesn't record elapsed, so we fake it.
+                # We can drop this when we make requests 1.2 the minimum
+                # version
+                resp.elapsed = datetime.utcnow() - start_time
             if action is not None:
                 action.detail += " {}".format(resp.status_code)
         if self.logger:
@@ -90,11 +97,11 @@
 
     logger.info(
         "%(method)s %(url)s returned %(status_code)s "
-        "in %(duration)s %(extra)s",
+        "in %(duration)sms %(extra)s",
         dict(method=request.method,
              url=request.url,
              status_code=response.status_code,
-             duration=str(response.elapsed),
+             duration=int(response.elapsed.total_seconds()*1000),
              extra=["{}={}".format(key, value)
                     for key, value in sorted(extra.items())],
              )
 
=== modified file 'requestsplus/tests/__init__.py'
--- requestsplus/tests/__init__.py	2014-10-22 19:19:54 +0000
+++ requestsplus/tests/__init__.py	2014-10-24 13:47:34 +0000
@@ -8,6 +8,7 @@
     Request,
     Response,
 )
+from requests.adapters import HTTPAdapter
 from timeline import Timeline
 
 from .. import (
@@ -192,6 +193,14 @@
         self.assertEqual(request_id, get_request_id(request))
 
 
+class NoElapsedAdapter(HTTPAdapter):
+
+    def build_response(self, req, resp):
+        resp = super(NoElapsedAdapter, self).build_response(req, resp)
+        del resp.elapsed
+        return resp
+
+
 class SessionTests(TestCase):
 
     def test_sends_request_id_header(self):
@@ -253,7 +262,7 @@
             s.get('http://localhost')
         self.assertEqual(
             "GET http://localhost/ returned 200 "
-            "in 0:00:00 ['Content-Type=text/plain']\n",
+            "in 0ms ['Content-Type=text/plain']\n",
             log_capture.output)
 
     def test_uses_timeline_factory(self):
@@ -280,3 +289,16 @@
         with responses:
             s.get(url)
         self.assertEqual(4, len(statsd.timings))
+
+    def test_missing_elapsed_attr(self):
+        # Old versions of requests don't have response.elapsed
+        # so we have to work around it.
+        statsd = MockStatsd()
+        s = Session(statsd=statsd, statsd_prefix='a')
+        s.mount('http://', NoElapsedAdapter())
+        responses = RequestsMock()
+        url = 'http://localhost'
+        responses.add('GET', url)
+        with responses:
+            s.get(url)
+        self.assertEqual(4, len(statsd.timings))