Merge branch 'master' into vickenty/transport

datadog/dogstatsd/base.py

@@ -935,11 +935,19 @@ def _reset_telemetry(self):
         self.bytes_dropped_queue = 0
         self.bytes_dropped_writer = 0
         self.packets_sent = 0
-        self.packets_dropped = 0
         self.packets_dropped_queue = 0
         self.packets_dropped_writer = 0
         self._last_flush_time = time.time()
 
+    # Aliases for backwards compatibility.
+    @property
+    def packets_dropped(self):
+        return self.packets_dropped_queue + self.packets_dropped_writer
+
+    @property
+    def bytes_dropped(self):
+        return self.bytes_dropped_queue + self.bytes_dropped_writer
+
     def _flush_telemetry(self):
         tags = self._client_tags[:]
         tags.append("client_transport:{}".format(self._transport))

tests/unit/dogstatsd/test_statsd.py

@@ -1936,3 +1936,18 @@ def test_set_socket_timeout(self):
         statsd.set_socket_timeout(1)
         self.assertEqual(statsd.socket.timeout, 1)
         self.assertEqual(statsd.socket_timeout, 1)
+
+    def test_telemetry_api(self):
+        statsd = DogStatsd(disable_background_sender=False)
+
+        self.assertEqual(statsd.metrics_count, 0)
+        self.assertEqual(statsd.events_count, 0)
+        self.assertEqual(statsd.service_checks_count, 0)
+        self.assertEqual(statsd.bytes_sent, 0)
+        self.assertEqual(statsd.bytes_dropped, 0)
+        self.assertEqual(statsd.bytes_dropped_queue, 0)
+        self.assertEqual(statsd.bytes_dropped_writer, 0)
+        self.assertEqual(statsd.packets_sent, 0)
+        self.assertEqual(statsd.packets_dropped, 0)
+        self.assertEqual(statsd.packets_dropped_queue, 0)
+        self.assertEqual(statsd.packets_dropped_writer, 0)