Merge lp:~lucio.torre/txstatsd/add-list-metrics into lp:txstatsd

[Lucio Torre]

add the /list_metrics url resource so we know what metrics each instance knows about

add the /list_metrics url resource so we know what metrics each instance knows about

[Sidnei da Silva (sidnei)]

review: Approve

=== modified file 'txstatsd/server/httpinfo.py'
--- txstatsd/server/httpinfo.py	2012-02-08 22:19:54 +0000
+++ txstatsd/server/httpinfo.py	2012-04-26 19:38:18 +0000
@@ -27,6 +27,17 @@
         return json.dumps(data)
 
 
+class ListMetrics(resource.Resource):
+
+    def __init__(self, processor):
+        resource.Resource.__init__(self)
+        self.processor = processor
+
+    def render_GET(self, request):
+        data = dict(names=self.processor.get_metric_names())
+        return json.dumps(data)
+
+
 class Metrics(resource.Resource):
 
     def __init__(self, processor):
@@ -55,6 +66,7 @@
     root = resource.Resource()
     root.putChild("status", Status(processor, statsd_service))
     root.putChild("metrics", Metrics(processor))
+    root.putChild("list_metrics", ListMetrics(processor))
     site = server.Site(root)
     s = internet.TCPServer(int(options["http-port"]), site)
     return s

=== modified file 'txstatsd/server/processor.py'
--- txstatsd/server/processor.py	2012-02-07 21:11:42 +0000
+++ txstatsd/server/processor.py	2012-04-26 19:38:18 +0000
@@ -88,6 +88,16 @@
             for plugin in plugins:
                 self.plugins[plugin.metric_type] = plugin
 
+    def get_metric_names(self):
+        """Return the names of all seen metrics."""
+        metrics = set()
+        metrics.update(self.timer_metrics.keys())
+        metrics.update(self.counter_metrics.keys())
+        metrics.update(v for k, v in self.gauge_metrics)
+        metrics.update(self.meter_metrics.keys())
+        metrics.update(self.plugin_metrics.keys())
+        return list(metrics)
+
     def process_message(self, message, metric_type, key, fields):
         """
         Process a single entry, adding it to either C{counters}, C{timers},

=== modified file 'txstatsd/tests/test_httpinfo.py'
--- txstatsd/tests/test_httpinfo.py	2012-02-08 23:18:27 +0000
+++ txstatsd/tests/test_httpinfo.py	2012-04-26 19:38:18 +0000
@@ -17,6 +17,11 @@
     last_flush_duration = 3
     last_process_duration = 2
 
+    metric_names = ["one", "two", "three"]
+
+    def get_metric_names(self):
+        return self.metric_names
+
 
 class ResponseCollector(protocol.Protocol):
 
@@ -73,6 +78,11 @@
             self.service.stopService()
 
     @defer.inlineCallbacks
+    def test_httpinfo_metric_names(self):
+        data = yield self.get_results("list_metrics")
+        self.assertEquals(Dummy.metric_names, json.loads(data)["names"])
+
+    @defer.inlineCallbacks
     def test_httpinfo_ok(self):
         data = yield self.get_results("status")
         self.assertEquals(json.loads(data)["status"], "OK")

=== modified file 'txstatsd/tests/test_processor.py'
--- txstatsd/tests/test_processor.py	2012-01-30 22:38:47 +0000
+++ txstatsd/tests/test_processor.py	2012-04-26 19:38:18 +0000
@@ -42,6 +42,13 @@
             self.processor.rebuild_message("c", "gorets", ["1", "c"]),
             "gorets:1|c")
 
+    def test_metric_names(self):
+        """We return the names of all seen metrics."""
+        kinds = set(["ms", "c", "g", "pd"])
+        for kind in kinds:
+            self.processor.process("%s:1|%s" % (kind, kind))
+        self.assertEquals(kinds, set(self.processor.get_metric_names()))
+
     def test_receive_counter(self):
         """
         A counter message takes the format 'gorets:1|c', where 'gorets' is the