Add _created to Counter/Summary/Histogram

brian-brazil · brian-brazil · commit 6718eb59b5a5 · 2018-09-07T17:17:03.000+01:00
Signed-off-by: Brian Brazil &lt;brian.brazil@robustperception.io&gt;
diff --git a/prometheus_client/core.py b/prometheus_client/core.py
@@ -761,6 +761,7 @@ def __init__(self, name, labelnames, labelvalues):
         if name.endswith('_total'):
            name = name[:-6]
         self._value = _ValueClass(self._type, name, name + '_total', labelnames, labelvalues)
+        self._created = time.time()
 
     def inc(self, amount=1):
         '''Increment counter by the given amount.'''
@@ -778,7 +779,8 @@ def count_exceptions(self, exception=Exception):
         return _ExceptionCounter(self, exception)
 
     def _samples(self):
-        return (('_total', {}, self._value.get()), )
+        return (('_total', {}, self._value.get()),
+                ('_created', {}, self._created))
 
 
 @_MetricWrapper
@@ -914,6 +916,7 @@ def create_response(request):
     def __init__(self, name, labelnames, labelvalues):
         self._count = _ValueClass(self._type, name, name + '_count', labelnames, labelvalues)
         self._sum = _ValueClass(self._type, name, name + '_sum', labelnames, labelvalues)
+        self._created = time.time()
 
     def observe(self, amount):
         '''Observe the given amount.'''
@@ -930,7 +933,8 @@ def time(self):
     def _samples(self):
         return (
             ('_count', {}, self._count.get()),
-            ('_sum', {}, self._sum.get()))
+            ('_sum', {}, self._sum.get()),
+            ('_created', {}, self._created))
 
 
 def _floatToGoString(d):
@@ -986,6 +990,7 @@ def create_response(request):
     _reserved_labelnames = ['le']
 
     def __init__(self, name, labelnames, labelvalues, buckets=(.005, .01, .025, .05, .075, .1, .25, .5, .75, 1.0, 2.5, 5.0, 7.5, 10.0, _INF)):
+        self._created = time.time()
         self._sum = _ValueClass(self._type, name, name + '_sum', labelnames, labelvalues)
         buckets = [float(b) for b in buckets]
         if buckets != sorted(buckets):
@@ -1025,6 +1030,7 @@ def _samples(self):
             samples.append(('_bucket', {'le': _floatToGoString(bound)}, acc))
         samples.append(('_count', {}, acc))
         samples.append(('_sum', {}, self._sum.get()))
+        samples.append(('_created', {}, self._created))
         return tuple(samples)
 
 
diff --git a/tests/test_graphite_bridge.py b/tests/test_graphite_bridge.py
@@ -5,7 +5,7 @@
 except ImportError:
     import socketserver as SocketServer
 
-from prometheus_client import Counter, CollectorRegistry
+from prometheus_client import Gauge, CollectorRegistry
 from prometheus_client.bridge.graphite import GraphiteBridge
 
 
@@ -38,37 +38,37 @@ def run(self):
         self.gb = GraphiteBridge(address, self.registry, _timer=fake_timer)
 
     def test_nolabels(self):
-        counter = Counter('c', 'help', registry=self.registry)
-        counter.inc()
+        gauge = Gauge('g', 'help', registry=self.registry)
+        gauge.inc()
 
         self.gb.push()
         self.t.join()
 
-        self.assertEqual(b'c_total 1.0 1434898897\n', self.data)
+        self.assertEqual(b'g 1.0 1434898897\n', self.data)
 
     def test_labels(self):
-        labels = Counter('labels', 'help', ['a', 'b'], registry=self.registry)
+        labels = Gauge('labels', 'help', ['a', 'b'], registry=self.registry)
         labels.labels('c', 'd').inc()
 
         self.gb.push()
         self.t.join()
 
-        self.assertEqual(b'labels_total.a.c.b.d 1.0 1434898897\n', self.data)
+        self.assertEqual(b'labels.a.c.b.d 1.0 1434898897\n', self.data)
 
     def test_prefix(self):
-        labels = Counter('labels', 'help', ['a', 'b'], registry=self.registry)
+        labels = Gauge('labels', 'help', ['a', 'b'], registry=self.registry)
         labels.labels('c', 'd').inc()
 
         self.gb.push(prefix='pre.fix')
         self.t.join()
 
-        self.assertEqual(b'pre.fix.labels_total.a.c.b.d 1.0 1434898897\n', self.data)
+        self.assertEqual(b'pre.fix.labels.a.c.b.d 1.0 1434898897\n', self.data)
 
     def test_sanitizing(self):
-        labels = Counter('labels', 'help', ['a'], registry=self.registry)
+        labels = Gauge('labels', 'help', ['a'], registry=self.registry)
         labels.labels('c.:8').inc()
 
         self.gb.push()
         self.t.join()
 
-        self.assertEqual(b'labels_total.a.c__8 1.0 1434898897\n', self.data)
+        self.assertEqual(b'labels.a.c__8 1.0 1434898897\n', self.data)
