Merge lp:~bloodearnest/txstatsd/multi-metric-packets into lp:txstatsd

[Simon Davy]

Support newline separated multiple metrics in single packet, like statsd proper.

Support newline separated multiple metrics in single packet, like statsd proper.

[Wes Mason (wesmason)]

https://media.giphy.com/media/OCvcnbMctsUpy/giphy.gif

review: Approve

=== modified file 'txstatsd/server/processor.py'
--- txstatsd/server/processor.py	2014-10-03 19:52:29 +0000
+++ txstatsd/server/processor.py	2016-04-18 10:21:39 +0000
@@ -51,20 +51,24 @@
     def process(self, message):
         """
         """
-        if not ":" in message:
-            return self.fail(message)
-
-        key, data = message.strip().split(":", 1)
-        if not "|" in data:
-            return self.fail(message)
-
-        fields = data.split("|")
-        if len(fields) < 2 or len(fields) > 3:
-            return self.fail(message)
-
-        key = normalize_key(key)
-        metric_type = fields[1]
-        return self.process_message(message, metric_type, key, fields)
+        for msg in message.strip().split('\n'):
+            if ":" not in msg:
+                self.fail(msg)
+                continue
+
+            key, data = msg.strip().split(":", 1)
+            if "|" not in data:
+                self.fail(msg)
+                continue
+
+            fields = data.split("|")
+            if len(fields) < 2 or len(fields) > 3:
+                self.fail(msg)
+                continue
+
+            key = normalize_key(key)
+            metric_type = fields[1]
+            self.process_message(msg, metric_type, key, fields)
 
     def rebuild_message(self, metric_type, key, fields):
         return key + ":" + "|".join(fields)

=== modified file 'txstatsd/tests/test_processor.py'
--- txstatsd/tests/test_processor.py	2014-10-03 19:52:29 +0000
+++ txstatsd/tests/test_processor.py	2016-04-18 10:21:39 +0000
@@ -236,6 +236,33 @@
         self.assertEqual(0, len(self.processor.counter_metrics))
         self.assertEqual(["gorets:1|c|@0.1|yay"], self.processor.failures)
 
+    def test_receive_traling_newline(self):
+        self.processor.process("gorets:1|c\n")
+        self.assertEqual(1, len(self.processor.counter_metrics))
+        self.assertEqual([], self.processor.failures)
+
+    def test_multimetric_message(self):
+        self.processor.process("foo:1|c\nbar:100|ms\nbaz:10|g")
+        self.assertEqual(1, len(self.processor.counter_metrics))
+        self.assertEqual(1.0, self.processor.counter_metrics["foo"])
+        self.assertEqual(1, len(self.processor.timer_metrics))
+        self.assertEqual([100], self.processor.timer_metrics["bar"])
+        self.assertEqual(1, len(self.processor.gauge_metrics))
+        self.assertEqual(
+            [10.0, 'baz'],
+            self.processor.gauge_metrics.pop())
+
+    def test_multimetric_bad_value(self):
+        self.processor.process("foo:1|c\nbar:|ms\nbaz:10|g")
+        self.assertEqual(1, len(self.processor.counter_metrics))
+        self.assertEqual(1.0, self.processor.counter_metrics["foo"])
+        self.assertEqual(["bar:|ms"], self.processor.failures)
+        self.assertEqual(1, len(self.processor.gauge_metrics))
+        self.assertEqual(
+            [10.0, 'baz'],
+            self.processor.gauge_metrics.pop())
+
+
 
 class ProcessorStatsTest(TestCase):