Merge pull request #154 from tuukkamustonen/135-provide-elapsed

Provide elapsed time from _TimedContextManagerDecorator

datadog/dogstatsd/base.py

@@ -192,6 +192,7 @@ def __init__(self, statsd, metric=None, tags=None, sample_rate=1, use_ms=None):
             self.tags = tags
             self.sample_rate = sample_rate
             self.use_ms = use_ms
+            self.elapsed = None
 
         def __call__(self, func):
             """Decorator which returns the elapsed time of the function call."""
@@ -223,6 +224,7 @@ def _send(self, start):
             use_ms = self.use_ms if self.use_ms is not None else self.statsd.use_ms
             elapsed = int(round(1000 * elapsed)) if use_ms else elapsed
             self.statsd.timing(self.metric, elapsed, self.tags, self.sample_rate)
+            self.elapsed = elapsed
 
     def timed(self, metric=None, tags=None, sample_rate=1, use_ms=None):
         """

tests/unit/dogstatsd/test_statsd.py

@@ -324,9 +324,10 @@ def test_timed_context(self):
         t.assert_equal('ms', type_)
         t.assert_equal('timed_context.test', name)
         self.assert_almost_equal(0.5, float(value), 0.1)
+        self.assert_almost_equal(0.5, timer.elapsed, 0.1)
 
         # In milliseconds
-        with self.statsd.timed('timed_context.test', use_ms=True):
+        with self.statsd.timed('timed_context.test', use_ms=True) as timer:
             time.sleep(0.5)
 
         packet = self.recv()
@@ -336,6 +337,7 @@ def test_timed_context(self):
         t.assert_equal('ms', type_)
         t.assert_equal('timed_context.test', name)
         self.assert_almost_equal(500, float(value), 100)
+        self.assert_almost_equal(500, timer.elapsed, 100)
 
     def test_timed_context_exception(self):
         """