Merge lp:~lucio.torre/txstatsd/timers-also-measure-rate into lp:txstatsd

[Lucio Torre]

Reduce number of datapoints generated from timers. Timers now also measure rate.

reduce number of datapoints generated from timers
timers now also measure rate

[Sidnei da Silva (sidnei)]

Looks good. +1!

review: Approve

=== modified file 'txstatsd/metrics/metermetric.py'
--- txstatsd/metrics/metermetric.py	2011-12-02 17:09:32 +0000
+++ txstatsd/metrics/metermetric.py	2012-02-08 23:33:07 +0000
@@ -82,7 +82,7 @@
                  ".15min_rate": self.fifteen_minute_rate()}
 
         for item, value in items.iteritems():
-            metrics.append((self.prefix  + self.name + item,
+            metrics.append((self.prefix + self.name + item,
                             round(value, 6), timestamp))
         return metrics
 

=== modified file 'txstatsd/metrics/timermetric.py'
--- txstatsd/metrics/timermetric.py	2012-02-08 22:19:54 +0000
+++ txstatsd/metrics/timermetric.py	2012-02-08 23:33:07 +0000
@@ -148,12 +148,12 @@
                  ".max": self.max(),
                  ".mean": self.mean(),
                  ".stddev": self.std_dev(),
-                 ".median": percentiles[0],
-                 ".75percentile": percentiles[1],
-                 ".95percentile": percentiles[2],
-                 ".98percentile": percentiles[3],
                  ".99percentile": percentiles[4],
-                 ".999percentile": percentiles[5]}
+                 ".999percentile": percentiles[5],
+                 ".count": self.meter.count,
+                 ".1min_rate": self.meter.one_minute_rate(),
+                 ".5min_rate": self.meter.five_minute_rate(),
+                 ".15min_rate": self.meter.fifteen_minute_rate()}
 
         for item, value in items.iteritems():
             metrics.append((self.prefix + self.name + item,

=== modified file 'txstatsd/tests/test_configurableprocessor.py'
--- txstatsd/tests/test_configurableprocessor.py	2012-01-30 22:38:47 +0000
+++ txstatsd/tests/test_configurableprocessor.py	2012-02-08 23:33:07 +0000
@@ -46,7 +46,7 @@
         self.assertEqual(("test.metric.gorets.count", 17, 42), messages[0])
         self.assertEqual(("statsd.foo.numStats", 1, 42),
                          messages[1])
-        
+
     def test_flush_plugin(self):
         """
         Ensure the prefix features if one is supplied.
@@ -57,7 +57,7 @@
         configurable_processor.process("gorets:17|pd")
         messages = configurable_processor.flush()
         self.assertEquals(("test.metric.gorets.count", 1, 42), messages[0])
-        
+
     def test_flush_single_timer_single_time(self):
         """
         If a single timer with a single data point is present, all
@@ -69,14 +69,14 @@
         configurable_processor.process("glork:24|ms")
         messages = configurable_processor.flush()
 
-        self.assertEqual(("glork.75percentile", 24.0, 42), messages[0])
-        self.assertEqual(("glork.95percentile", 24.0, 42), messages[1])
-        self.assertEqual(("glork.98percentile", 24.0, 42), messages[2])
+        self.assertEqual(('glork.15min_rate', 0.0, 42), messages[0])
+        self.assertEqual(('glork.1min_rate', 0.0, 42), messages[1])
+        self.assertEqual(('glork.5min_rate', 0.0, 42), messages[2])
         self.assertEqual(("glork.999percentile", 24.0, 42), messages[3])
         self.assertEqual(("glork.99percentile", 24.0, 42), messages[4])
-        self.assertEqual(("glork.max", 24.0, 42), messages[5])
-        self.assertEqual(("glork.mean", 24.0, 42), messages[6])
-        self.assertEqual(("glork.median", 24.0, 42), messages[7])
+        self.assertEqual(("glork.count", 1., 42), messages[5])
+        self.assertEqual(("glork.max", 24.0, 42), messages[6])
+        self.assertEqual(("glork.mean", 24.0, 42), messages[7])
         self.assertEqual(("glork.min", 24.0, 42), messages[8])
         self.assertEqual(("glork.stddev", 0.0, 42), messages[9])
 
@@ -101,14 +101,18 @@
         configurable_processor.update_metrics()
 
         messages = configurable_processor.flush()
-        self.assertEqual(("glork.75percentile", 27.75, 42), messages[0])
-        self.assertEqual(("glork.95percentile", 42.0, 42), messages[1])
-        self.assertEqual(("glork.98percentile", 42.0, 42), messages[2])
+
+        self.assertEqual(('glork.15min_rate', 0.20000000000000001, 42),
+            messages[0])
+        self.assertEqual(('glork.1min_rate', 0.20000000000000001, 42),
+            messages[1])
+        self.assertEqual(('glork.5min_rate', 0.20000000000000001, 42),
+            messages[2])
         self.assertEqual(("glork.999percentile", 42.0, 42), messages[3])
         self.assertEqual(("glork.99percentile", 42.0, 42), messages[4])
-        self.assertEqual(("glork.max", 42.0, 42), messages[5])
-        self.assertEqual(("glork.mean", 18.0, 42), messages[6])
-        self.assertEqual(("glork.median", 15.5, 42), messages[7])
+        self.assertEqual(('glork.count', 6.0, 42), messages[5])
+        self.assertEqual(("glork.max", 42.0, 42), messages[6])
+        self.assertEqual(("glork.mean", 18.0, 42), messages[7])
         self.assertEqual(("glork.min", 4.0, 42), messages[8])
         self.assertEqual(("glork.stddev", 13.490738, 42), messages[9])