Merge lp:~theiw/txstatsd/txstatsd-fix-871735 into lp:txstatsd

[Ian Wilkinson]

Ensure the prefix is applied to the metrics summary.

Ensure the prefix is applied to the metrics summary.

[Sidnei da Silva (sidnei)]

Looks good. +1!

review: Approve

=== modified file 'txstatsd/server/configurableprocessor.py'
--- txstatsd/server/configurableprocessor.py	2011-10-01 04:05:34 +0000
+++ txstatsd/server/configurableprocessor.py	2011-10-10 16:12:32 +0000
@@ -22,10 +22,19 @@
       duration statistics, plus throughput statistics.
     """
 
+    METRICS_SUMMARY = "statsd.numStats %s %s\n"
+
     def __init__(self, time_function=time.time, message_prefix=""):
         super(ConfigurableMessageProcessor, self).__init__(
             time_function=time_function)
 
+        if message_prefix:
+            self.metrics_summary = message_prefix + '.' + \
+                ConfigurableMessageProcessor.METRICS_SUMMARY
+        else:
+            self.metrics_summary = \
+                ConfigurableMessageProcessor.METRICS_SUMMARY
+
         self.message_prefix = message_prefix
         self.gauge_metrics = {}
 
@@ -92,6 +101,9 @@
 
         return (metrics, events)
 
+    def flush_metrics_summary(self, messages, num_stats, timestamp):
+        messages.append(self.metrics_summary % (num_stats, timestamp))
+
     def update_metrics(self):
         super(ConfigurableMessageProcessor, self).update_metrics()
 
 
=== modified file 'txstatsd/server/processor.py'
--- txstatsd/server/processor.py	2011-10-07 19:44:10 +0000
+++ txstatsd/server/processor.py	2011-10-10 16:12:32 +0000
@@ -192,7 +192,7 @@
             messages.extend(meter_metrics)
             num_stats += events
 
-        messages.append("statsd.numStats %s %s\n" % (num_stats, timestamp))
+        self.flush_metrics_summary(messages, num_stats, timestamp)
         return messages
 
     def flush_counter_metrics(self, interval, timestamp):
@@ -278,6 +278,9 @@
 
         return (metrics, events)
 
+    def flush_metrics_summary(self, messages, num_stats, timestamp):
+        messages.append("statsd.numStats %s %s\n" % (num_stats, timestamp))
+
     def update_metrics(self):
         for metric in self.meter_metrics.itervalues():
             metric.tick()
 
=== modified file 'txstatsd/tests/test_configurableprocessor.py'
--- txstatsd/tests/test_configurableprocessor.py	2011-10-07 19:49:25 +0000
+++ txstatsd/tests/test_configurableprocessor.py	2011-10-10 16:12:32 +0000
@@ -34,7 +34,8 @@
         self.assertEqual(2, len(messages))
         counters = messages[0].splitlines()
         self.assertEqual("test.metric.gorets.count 17 42", counters[0])
-        self.assertEqual("statsd.numStats 1 42", messages[1].splitlines()[0])
+        self.assertEqual("test.metric.statsd.numStats 1 42",
+                         messages[1].splitlines()[0])
 
     def test_flush_single_timer_single_time(self):
         """
@@ -138,5 +139,5 @@
             "test.metric.gorets.15min_rate 0.0 %s" % self.time_now,
             meter_metric[4])
         self.assertEqual(
-            "statsd.numStats 1 %s" % self.time_now,
+            "test.metric.statsd.numStats 1 %s" % self.time_now,
             messages[1].splitlines()[0])
 
=== modified file 'txstatsd/version.py'
--- txstatsd/version.py	2011-10-01 04:05:34 +0000
+++ txstatsd/version.py	2011-10-10 16:12:32 +0000
@@ -1,1 +1,1 @@
-txstatsd = "0.6.0"
+txstatsd = "0.6.2"