Merge lp:~james-w/txstatsd/delta-configurable-processor into lp:txstatsd

[James Westby]

Fix gauge delta support in ConfigurableMessageProcessor.

[lp:~james-w/txstatsd/delta-configurable-processor]

112. By James Westby on 2014-10-16

Fix indentation.

[Ricardo Kirkner (ricardokirkner)]

LGTM

review: Approve

=== modified file 'txstatsd/server/configurableprocessor.py'
--- txstatsd/server/configurableprocessor.py	2013-06-07 21:25:55 +0000
+++ txstatsd/server/configurableprocessor.py	2014-10-16 11:29:36 +0000
@@ -80,11 +80,11 @@
             self.counter_metrics[key] = metric
         self.counter_metrics[key].mark(value)
 
-    def compose_gauge_metric(self, key, value):
+    def compose_gauge_metric(self, key, value, delta=False):
         if not key in self.gauge_metrics:
             metric = GaugeMetricReporter(key, prefix=self.message_prefix)
             self.gauge_metrics[key] = metric
-        self.gauge_metrics[key].mark(value)
+        self.gauge_metrics[key].mark(value, delta=delta)
 
     def compose_meter_metric(self, key, value):
         if not key in self.meter_metrics:
 
=== modified file 'txstatsd/tests/test_configurableprocessor.py'
--- txstatsd/tests/test_configurableprocessor.py	2013-06-07 21:25:55 +0000
+++ txstatsd/tests/test_configurableprocessor.py	2014-10-16 11:29:36 +0000
@@ -174,3 +174,21 @@
                          messages[0])
         self.assertEqual(("test.metric.gorets.rate", 3.0, self.time_now),
                          messages[1])
+
+
+class ComposeTests(TestCase):
+
+    def test_compose_gauge_metric(self):
+        configurable_processor = ConfigurableMessageProcessor()
+        configurable_processor.compose_gauge_metric('a', 1)
+        self.assertEqual(
+            configurable_processor.gauge_metrics['a'].value,
+            1)
+
+    def test_compose_gauge_metric_delta(self):
+        configurable_processor = ConfigurableMessageProcessor()
+        configurable_processor.compose_gauge_metric('a', 1)
+        configurable_processor.compose_gauge_metric('a', 1, delta=True)
+        self.assertEqual(
+            configurable_processor.gauge_metrics['a'].value,
+            2)