Renamed and tagged metrics

deliveryhero · Mar 1, 2016 · 7ba9bc8 · 7ba9bc8
1 parent f342f7d
commit 7ba9bc8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/lymph/core/container.py b/lymph/core/container.py
@@ -239,10 +239,10 @@ def join(self):
     def lookup(self, address, version=None):
         if '://' not in address:
             service = self.service_registry.get(address)
-            metric_name = 'rpc-servers.%s.instances' % address
-            if metric_name not in self.metrics:
-                self.metrics.add(metrics.Callable(metric_name,
-                                                  lambda: len(self.service_registry.get(address))))
+            if not self.metrics.has_metric('known_instances', tags={address: address}):
+                self.metrics.add(metrics.Callable('known_instances',
+                                                  lambda: len(self.service_registry.get(address)),
+                                                  tags={'address': address}))
         else:
             instance = ServiceInstance(address)
             service = Service(address, instances=[instance])

diff --git a/lymph/core/monitoring/metrics.py b/lymph/core/monitoring/metrics.py
@@ -61,10 +61,10 @@ def add(self, metric):
         self._metrics.append(metric)
         return metric
 
-    def __contains__(self, key):
+    def has_metric(self, name, tags=None):
         for metric in self._metrics:
-            for name, value, tags in metric:
-                if name == key:
+            for i_name, i_value, i_tags in metric:
+                if name == i_name and tags <= i_tags:
                     return True
         return False