8000 Make metric fields public. · Syncano/client_python@854b401 · GitHub
[go: up one dir, main page]
Skip to content

Commit 854b401

Browse files
brian-brazilbrian-brazil
committed
Make metric fields public.
1 parent c9d89ba commit 854b401

File tree

3 files changed

+29
-29
lines changed

3 files changed

+29
-29
lines changed

‎prometheus_client/bridge/graphite.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -50,19 +50,19 @@ def __init__(self, address, registry=core.REGISTRY, timeout_seconds=30, _time=ti
5050
self._time = _time
5151

5252
def push(self):
53-
now = int(self._time.time())
54-
output = []
55-
for metric in self._registry.collect():
56-
for name, labels, value in metric._samples:
57-
if labels:
58-
labelstr = '.' + '.'.join(
59-
['{0}.{1}'.format(
60-
_sanitize(k), _sanitize(v))
61-
for k, v in sorted(labels.items())])
62-
else:
63-
labelstr = ''
64-
output.append('{0}{1} {2} {3}\n'.format(
65-
_sanitize(name), labelstr, float(value), now))
53+
now = int(self._time.time())
54+
output = []
55+
for metric in self._registry.collect():
56+
for name, labels, value in metric.samples:
57+
if labels:
58+
labelstr = '.' + '.'.join(
59+
['{0}.{1}'.format(
60+
_sanitize(k), _sanitize(v))
61+
for k, v in sorted(labels.items())])
62+
else:
63+
labelstr = ''
64+
output.append('{0}{1} {2} {3}\n'.format(
65+
_sanitize(name), labelstr, float(value), now))
6666

6767
conn = socket.create_connection(self._address, self._timeout)
6868
conn.sendall(''.join(output).encode('ascii'))

‎prometheus_client/core.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def get_sample_value(self, name, labels=None):
6161
if labels is None:
6262
labels = {}
6363
for metric in self.collect():
64-
for n, l, value in metric._samples:
64+
for n, l, value in metric.samples:
6565
if n == name and l == labels:
6666
return value
6767
return None
@@ -82,18 +82,18 @@ class Metric(object):
8282
and SummaryMetricFamily instead.
8383
'''
8484
def __init__(self, name, documentation, typ):
85-
self._name = name
86-
self._documentation = documentation
85+
self.name = name
86+
self.documentation = documentation
8787
if typ not in _METRIC_TYPES:
8888
raise ValueError('Invalid metric type: ' + typ)
89-
self._type = typ
90-
self._samples = []
89+
self.type = typ
90+
self.samples = []
9191

9292
def add_sample(self, name, labels, value):
9393
'''Add a sample to the metric.
9494
9595
Internal-only, do not use.'''
96-
self._samples.append((name, labels, value))
96+
self.samples.append((name, labels, value))
9797

9898

9999
class CounterMetricFamily(Metric):
@@ -118,7 +118,7 @@ def add_metric(self, labels, value):
118118
labels: A list of label values
119119
value: The value of the metric.
120120
'''
121-
self._samples.append((self._name, dict(zip(self._labelnames, labels)), value))
121+
self.samples.append((self.name, dict(zip(self._labelnames, labels)), value))
122122

123123

124124
class GaugeMetricFamily(Metric):
@@ -143,7 +143,7 @@ def add_metric(self, labels, value):
143143
labels: A list of label values
144144
value: A float
145145
'''
146-
self._samples.append((self._name, dict(zip(self._labelnames, labels)), value))
146+
self.samples.append((self.name, dict(zip(self._labelnames, labels)), value))
147147

148148

149149
class SummaryMetricFamily(Metric):
@@ -171,8 +171,8 @@ def add_metric(self, labels, count_value, sum_value):
171171
count_value: The count value of the metric.
172172
sum_value: The sum value of the metric.
173173
'''
174-
self._samples.append((self._name + u'_count', dict(zip(self._labelnames, labels)), count_value))
175-
self._samples.append((self._name + u'_sum', dict(zip(self._labelnames, labels)), sum_value))
174+
self.samples.append((self.name + '_count', dict(zip(self._labelnames, labels)), count_value))
175+
self.samples.append((self.name + '_sum', dict(zip(self._labelnames, labels)), sum_value))
176176

177177

178178
class HistogramMetricFamily(Metric):
@@ -202,10 +202,10 @@ def add_metric(self, labels, buckets, sum_value):
202202
sum_value: The sum value of the metric.
203203
'''
204204
for bucket, value in buckets:
205-
self._samples.append((self._name + u'_bucket', dict(zip(self._labelnames, labels) + [(u'le', bucket)]), value))
205+
self.samples.append((self.name + '_bucket', dict(list(zip(self._labelnames, labels)) + [('le', bucket)]), value))
206206
# +Inf is last and provides the count value.
207-
self._samples.appen B41A d((self._name + u'_count', dict(zip(self._labelnames, labels)), buckets[-1][1]))
208-
self._samples.append((self._name + u'_sum', dict(zip(self._labelnames, labels)), sum_value))
207+
self.samples.append((self.name + '_count', dict(zip(self._labelnames, labels)), buckets[-1][1]))
208+
self.samples.append((self.name + '_sum', dict(zip(self._labelnames, labels)), sum_value))
209209

210210

211211
class _MutexValue(object):

‎prometheus_client/exposition.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ def generate_latest(registry=core.REGISTRY):
3131
output = []
3232
for metric in registry.collect():
3333
output.append('# HELP {0} {1}'.format(
34-
metric._name, metric._documentation.replace('\\', r'\\').replace('\n', r'\n')))
35-
output.append('\n# TYPE {0} {1}\n'.format(metric._name, metric._type))
36-
for name, labels, value in metric._samples:
34+
metric.name, metric.documentation.replace('\\', r'\\').replace('\n', r'\n')))
35+
output.append('\n# TYPE {0} {1}\n'.format(metric.name, metric.type))
36+
for name, labels, value in metric.samples:
3737
if labels:
3838
labelstr = '{{{0}}}'.format(','.join(
3939
['{0}="{1}"'.format(

0 commit comments

Comments
 (0)
0