Add total time to Timer (#30)

cyberdelia · Sep 20, 2016 · 316461d · 316461d
1 parent 81de86b
commit 316461d
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 7 deletions.
diff --git a/metrology/instruments/histogram.py b/metrology/instruments/histogram.py
@@ -80,6 +80,11 @@ def set_min(self, potential_min):
 
     min = property(get_min, set_min, doc="""Returns the minimum value.""")
 
+    @property
+    def total(self):
+        """Returns the total value."""
+        return self.sum.value
+
     @property
     def mean(self):
         """Returns the mean value."""

diff --git a/metrology/instruments/timer.py b/metrology/instruments/timer.py
@@ -47,6 +47,11 @@ def __exit__(self, type, value, callback):
         duration = self.interval.stop()
         self.update(duration)
 
+    @property
+    def total_time(self):
+        """Returns the number of measurements that have been made."""
+        return self.histogram.total
+
     @property
     def count(self):
         """Returns the number of measurements that have been made."""

diff --git a/metrology/reporter/graphite.py b/metrology/reporter/graphite.py
@@ -71,7 +71,7 @@ def write(self):
                 ])
             if isinstance(metric, Timer):
                 self.send_metric(name, 'timer', metric, [
-                    'count', 'one_minute_rate', 'five_minute_rate',
+                    'count', 'total_time', 'one_minute_rate', 'five_minute_rate',
                     'fifteen_minute_rate', 'mean_rate',
                     'min', 'max', 'mean', 'stddev'
                 ], [

diff --git a/metrology/reporter/librato.py b/metrology/reporter/librato.py
@@ -61,7 +61,7 @@ def list_metrics(self):
                 ])
             if isinstance(metric, Timer):
                 yield self.prepare_metric(name, 'timer', metric, [
-                    'count', 'one_minute_rate', 'five_minute_rate',
+                    'count', 'total_time', 'one_minute_rate', 'five_minute_rate',
                     'fifteen_minute_rate', 'mean_rate',
                     'min', 'max', 'mean', 'stddev'
                 ], [

diff --git a/metrology/reporter/logger.py b/metrology/reporter/logger.py
@@ -46,7 +46,7 @@ def write(self):
                 ])
             if isinstance(metric, Timer):
                 self.log_metric(name, 'timer', metric, [
-                    'count', 'one_minute_rate', 'five_minute_rate',
+                    'count', 'total_time', 'one_minute_rate', 'five_minute_rate',
                     'fifteen_minute_rate', 'mean_rate',
                     'min', 'max', 'mean', 'stddev'
                 ], [

diff --git a/tests/instruments/test_histogram.py b/tests/instruments/test_histogram.py
@@ -7,6 +7,12 @@
 
 
 class HistogramTest(TestCase):
+    def test_uniform_sample_min(self):
+        histogram = HistogramUniform()
+        histogram.update(5)
+        histogram.update(10)
+        self.assertEqual(15, histogram.total)
+
     def test_uniform_sample_min(self):
         histogram = HistogramUniform()
         histogram.update(5)

diff --git a/tests/instruments/test_timer.py b/tests/instruments/test_timer.py
@@ -16,6 +16,7 @@ def test_timer(self):
         for i in range(3):
             with self.timer:
                 time.sleep(0.1)
+        self.assertAlmostEqual(300, self.timer.total_time, delta=20)
         self.assertAlmostEqual(100, self.timer.mean, delta=10)
         self.assertAlmostEqual(100, self.timer.snapshot.median, delta=10)
 

diff --git a/tests/reporter/test_graphite.py b/tests/reporter/test_graphite.py
@@ -26,7 +26,7 @@ def test_send_nobatch(self, mock):
         Metrology.histogram('histogram').update(5)
         self.reporter.write()
         self.assertTrue(mock.sendall.called)
-        self.assertEqual(58, len(mock.sendall.call_args_list))
+        self.assertEqual(60, len(mock.sendall.call_args_list))
         self.reporter.stop()
 
     @patch.object(GraphiteReporter, 'socket')
@@ -40,5 +40,5 @@ def test_send_batch(self, mock):
         Metrology.histogram('histogram').update(5)
         self.reporter.write()
         self.assertTrue(mock.sendall.called)
-        self.assertEqual(29, len(mock.sendall.call_args_list))
+        self.assertEqual(30, len(mock.sendall.call_args_list))
         self.reporter.stop()
diff --git a/tests/reporter/test_graphite_pickle.py b/tests/reporter/test_graphite_pickle.py
@@ -26,7 +26,7 @@ def test_send_nobatch(self, mock):
         Metrology.histogram('histogram').update(5)
         self.reporter.write()
         self.assertTrue(mock.sendall.called)
-        self.assertEqual(58, len(mock.sendall.call_args_list))
+        self.assertEqual(60, len(mock.sendall.call_args_list))
         self.reporter.stop()
 
     @patch.object(GraphiteReporter, 'socket')
@@ -40,5 +40,5 @@ def test_send_batch(self, mock):
         Metrology.histogram('histogram').update(5)
         self.reporter.write()
         self.assertTrue(mock.sendall.called)
-        self.assertEqual(29, len(mock.sendall.call_args_list))
+        self.assertEqual(30, len(mock.sendall.call_args_list))
         self.reporter.stop()