Merge pull request #6 from Lightricks/fix/blank_requests

Blank requests: Avoid sending blank metrics.

Author: ilya-lt

pyformance/__version__.py

@@ -1 +1 @@
-__version__ = "1.0.5"
+__version__ = "1.0.6"

pyformance/reporters/influx.py

@@ -89,9 +89,13 @@ def report_now(self, registry=None, timestamp=None):
             self._create_database()
         timestamp = timestamp or int(round(self.clock.time()))
         metrics = (registry or self.registry).dump_metrics(key_is_metric=True)
-        post_data = "\n".join(self._get_influx_protocol_lines(metrics, timestamp))
-        url = self._get_url()
-        self._try_send(url, post_data)
+
+        influx_lines = self._get_influx_protocol_lines(metrics, timestamp)
+        # If you don't have anything nice to say than don't say nothing
+        if influx_lines:
+            post_data = "\n".join(influx_lines)
+            url = self._get_url()
+            self._try_send(url, post_data)
 
     def _get_table_name(self, metric_key):
         if not self.prefix:

tests/test__influx_reporter.py

@@ -21,20 +21,20 @@ def setUp(self):
     def tearDown(self):
         super(TestInfluxReporter, self).tearDown()
 
-    def test_report_now(self):
+    def test_not_called_on_blank(self):
         influx_reporter = InfluxReporter(registry=self.registry)
 
         with mock.patch("pyformance.reporters.influx.urlopen") as patch:
             influx_reporter.report_now()
-            patch.assert_called()
+            patch.assert_not_called()
 
     def test_create_database(self):
         r1 = InfluxReporter(registry=self.registry, autocreate_database=True)
         with mock.patch("pyformance.reporters.influx.urlopen") as patch:
             r1.report_now()
-            if patch.call_count != 2:
+            if patch.call_count != 1:
                 raise AssertionError(
-                    "Expected 2 calls to 'urlopen'. Received: {}".format(
+                    "Expected 1 calls to 'urlopen'. Received: {}".format(
                         patch.call_count
                     )
                 )
@@ -47,8 +47,7 @@ def test_gauge_without_tags(self):
             autocreate_database=False
         )
 
-        with mock.patch.object(influx_reporter, "_try_send",
-                               wraps=influx_reporter._try_send) as send_mock:
+        with mock.patch.object(influx_reporter, "_try_send") as send_mock:
             influx_reporter.report_now()
 
             expected_url = "http://127.0.0.1:8086/write?db=metrics&precision=s"
@@ -64,8 +63,7 @@ def test_gauge_with_tags(self):
             autocreate_database=False
         )
 
-        with mock.patch.object(influx_reporter, "_try_send",
-                               wraps=influx_reporter._try_send) as send_mock:
+        with mock.patch.object(influx_reporter, "_try_send") as send_mock:
             influx_reporter.report_now()
 
             expected_url = "http://127.0.0.1:8086/write?db=metrics&precision=s"
@@ -83,8 +81,7 @@ def test_gauge_with_global_tags(self):
             global_tags={"stage": "dev", "region": "override"}
         )
 
-        with mock.patch.object(influx_reporter, "_try_send",
-                               wraps=influx_reporter._try_send) as send_mock:
+        with mock.patch.object(influx_reporter, "_try_send") as send_mock:
             influx_reporter.report_now()
 
             expected_url = "http://127.0.0.1:8086/write?db=metrics&precision=s"
@@ -105,8 +102,7 @@ def test_counter_with_tags(self):
             autocreate_database=False
         )
 
-        with mock.patch.object(influx_reporter, "_try_send",
-                               wraps=influx_reporter._try_send) as send_mock:
+        with mock.patch.object(influx_reporter, "_try_send") as send_mock:
             influx_reporter.report_now()
 
             expected_url = "http://127.0.0.1:8086/write?db=metrics&precision=s"
@@ -127,8 +123,7 @@ def test_events_with_tags(self):
             autocreate_database=False
         )
 
-        with mock.patch.object(influx_reporter, "_try_send",
-                               wraps=influx_reporter._try_send) as send_mock:
+        with mock.patch.object(influx_reporter, "_try_send") as send_mock:
             influx_reporter.report_now()
 
             expected_url = "http://127.0.0.1:8086/write?db=metrics&precision=s"
@@ -152,8 +147,7 @@ def test_combined_events_with_counter(self):
             autocreate_database=False
         )
 
-        with mock.patch.object(influx_reporter, "_try_send",
-                               wraps=influx_reporter._try_send) as send_mock:
+        with mock.patch.object(influx_reporter, "_try_send") as send_mock:
             influx_reporter.report_now()
 
             expected_url = "http://127.0.0.1:8086/write?db=metrics&precision=s"
@@ -177,8 +171,7 @@ def test_count_calls_with_tags(self):
             autocreate_database=False
         )
 
-        with mock.patch.object(influx_reporter, "_try_send",
-                               wraps=influx_reporter._try_send) as send_mock:
+        with mock.patch.object(influx_reporter, "_try_send") as send_mock:
             influx_reporter.report_now()
 
             expected_url = "http://127.0.0.1:8086/write?db=metrics&precision=s"