Make metric fields public.

brian-brazil · brian-brazil · commit 854b401cf395 · 2015-10-08T16:06:05.000+01:00
diff --git a/prometheus_client/bridge/graphite.py b/prometheus_client/bridge/graphite.py
@@ -50,19 +50,19 @@ def __init__(self, address, registry=core.REGISTRY, timeout_seconds=30, _time=ti
         self._time = _time
 
     def push(self):
-        now = int(self._time.time())
-        output = []
-        for metric in self._registry.collect():
-            for name, labels, value in metric._samples:
-                if labels:
-                    labelstr = '.' + '.'.join(
-                        ['{0}.{1}'.format(
-                            _sanitize(k), _sanitize(v))
-                         for k, v in sorted(labels.items())])
-                else:
-                    labelstr = ''
-                output.append('{0}{1} {2} {3}\n'.format(
-                    _sanitize(name), labelstr, float(value), now))
+          now = int(self._time.time())
+          output = []
+          for metric in self._registry.collect():
+              for name, labels, value in metric.samples:
+                  if labels:
+                      labelstr = '.' + '.'.join(
+                          ['{0}.{1}'.format(
+                               _sanitize(k), _sanitize(v))
+                               for k, v in sorted(labels.items())])
+                  else:
+                      labelstr = ''
+                  output.append('{0}{1} {2} {3}\n'.format(
+                      _sanitize(name), labelstr, float(value), now))
 
         conn = socket.create_connection(self._address, self._timeout)
         conn.sendall(''.join(output).encode('ascii'))
diff --git a/prometheus_client/core.py b/prometheus_client/core.py
@@ -61,7 +61,7 @@ def get_sample_value(self, name, labels=None):
         if labels is None:
             labels = {}
         for metric in self.collect():
-            for n, l, value in metric._samples:
+            for n, l, value in metric.samples:
                 if n == name and l == labels:
                     return value
         return None
@@ -82,18 +82,18 @@ class Metric(object):
     and SummaryMetricFamily instead.
     '''
     def __init__(self, name, documentation, typ):
-        self._name = name
-        self._documentation = documentation
+        self.name = name
+        self.documentation = documentation
         if typ not in _METRIC_TYPES:
             raise ValueError('Invalid metric type: ' + typ)
-        self._type = typ
-        self._samples = []
+        self.type = typ
+        self.samples = []
 
     def add_sample(self, name, labels, value):
         '''Add a sample to the metric.
 
         Internal-only, do not use.'''
-        self._samples.append((name, labels, value))
+        self.samples.append((name, labels, value))
 
 
 class CounterMetricFamily(Metric):
@@ -118,7 +118,7 @@ def add_metric(self, labels, value):
           labels: A list of label values
           value: The value of the metric.
         '''
-        self._samples.append((self._name, dict(zip(self._labelnames, labels)), value))
+        self.samples.append((self.name, dict(zip(self._labelnames, labels)), value))
 
 
 class GaugeMetricFamily(Metric):
@@ -143,7 +143,7 @@ def add_metric(self, labels, value):
           labels: A list of label values
           value: A float
         '''
-        self._samples.append((self._name, dict(zip(self._labelnames, labels)), value))
+        self.samples.append((self.name, dict(zip(self._labelnames, labels)), value))
 
 
 class SummaryMetricFamily(Metric):
@@ -171,8 +171,8 @@ def add_metric(self, labels, count_value, sum_value):
           count_value: The count value of the metric.
           sum_value: The sum value of the metric.
         '''
-        self._samples.append((self._name + u'_count', dict(zip(self._labelnames, labels)), count_value))
-        self._samples.append((self._name + u'_sum', dict(zip(self._labelnames, labels)), sum_value))
+        self.samples.append((self.name + '_count', dict(zip(self._labelnames, labels)), count_value))
+        self.samples.append((self.name + '_sum', dict(zip(self._labelnames, labels)), sum_value))
 
 
 class HistogramMetricFamily(Metric):
@@ -202,10 +202,10 @@ def add_metric(self, labels, buckets, sum_value):
           sum_value: The sum value of the metric.
         '''
         for bucket, value in buckets:
-          self._samples.append((self._name + u'_bucket', dict(zip(self._labelnames, labels) + [(u'le', bucket)]), value))
+          self.samples.append((self.name + '_bucket', dict(list(zip(self._labelnames, labels)) + [('le', bucket)]), value))
         # +Inf is last and provides the count value.
-        self._samples.append((self._name + u'_count', dict(zip(self._labelnames, labels)), buckets[-1][1]))
-        self._samples.append((self._name + u'_sum', dict(zip(self._labelnames, labels)), sum_value))
+        self.samples.append((self.name + '_count', dict(zip(self._labelnames, labels)), buckets[-1][1]))
+        self.samples.append((self.name + '_sum', dict(zip(self._labelnames, labels)), sum_value))
 
 
 class _MutexValue(object):
diff --git a/prometheus_client/exposition.py b/prometheus_client/exposition.py
@@ -31,9 +31,9 @@ def generate_latest(registry=core.REGISTRY):
     output = []
     for metric in registry.collect():
         output.append('# HELP {0} {1}'.format(
-            metric._name, metric._documentation.replace('\\', r'\\').replace('\n', r'\n')))
-        output.append('\n# TYPE {0} {1}\n'.format(metric._name, metric._type))
-        for name, labels, value in metric._samples:
+            metric.name, metric.documentation.replace('\\', r'\\').replace('\n', r'\n')))
+        output.append('\n# TYPE {0} {1}\n'.format(metric.name, metric.type))
+        for name, labels, value in metric.samples:
             if labels:
                 labelstr = '{{{0}}}'.format(','.join(
                     ['{0}="{1}"'.format(
