Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions prometheus_client/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,11 @@ def register(self, collector):
'''Add a collector to the registry.'''
with self._lock:
names = self._get_names(collector)
for name in names:
if name in self._names_to_collectors:
raise ValueError('Timeseries already present '
'in CollectorRegistry: ' + name)
duplicates = set(self._names_to_collectors).intersection(names)
if duplicates:
raise ValueError(
'Duplicated timeseries in CollectorRegistry: {}'.format(
duplicates))
for name in names:
self._names_to_collectors[name] = collector
self._collector_to_names[collector] = names
Expand Down Expand Up @@ -444,7 +445,8 @@ def __reset(self):
file_prefix = typ
if file_prefix not in files:
filename = os.path.join(
os.environ['prometheus_multiproc_dir'], '{0}_{1}.db'.format(file_prefix, pid['value']))
os.environ['prometheus_multiproc_dir'],
'{0}_{1}.db'.format(file_prefix, pid['value']))
files[file_prefix] = _MmapedDict(filename)
self._file = files[file_prefix]
self._key = json.dumps((metric_name, name, labelnames, labelvalues))
Expand Down Expand Up @@ -710,8 +712,9 @@ def __init__(self, name, labelnames, labelvalues, multiprocess_mode='all'):
if (_ValueClass._multiprocess
and multiprocess_mode not in ['min', 'max', 'livesum', 'liveall', 'all']):
raise ValueError('Invalid multiprocess mode: ' + multiprocess_mode)
self._value = _ValueClass(self._type, name, name, labelnames,
labelvalues, multiprocess_mode=multiprocess_mode)
self._value = _ValueClass(
self._type, name, name, labelnames, labelvalues,
multiprocess_mode=multiprocess_mode)

def inc(self, amount=1):
'''Increment gauge by the given amount.'''
Expand Down
5 changes: 3 additions & 2 deletions prometheus_client/exposition.py
Original file line number Diff line number Diff line change
Expand Up @@ -286,8 +286,9 @@ def _use_gateway(method, gateway, job, registry, grouping_key, timeout, handler)

if grouping_key is None:
grouping_key = {}
url = url + ''.join(['/{0}/{1}'.format(quote_plus(str(k)), quote_plus(str(v)))
for k, v in sorted(grouping_key.items())])
url += ''.join(
'/{0}/{1}'.format(quote_plus(str(k)), quote_plus(str(v)))
for k, v in sorted(grouping_key.items()))

headers=[('Content-Type', CONTENT_TYPE_LATEST)]
handler(url=url, method=method, timeout=timeout,
Expand Down
5 changes: 3 additions & 2 deletions tests/test_multiprocess.py
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,9 @@ def test_multi_expansion(self):
self.d.write_value('abc', 42.0)
self.d.write_value(key, 123.0)
self.d.write_value('def', 17.0)
self.assertEqual([('abc', 42.0), (key, 123.0), ('def', 17.0)],
list(self.d.read_all_values()))
self.assertEqual(
[('abc', 42.0), (key, 123.0), ('def', 17.0)],
list(self.d.read_all_values()))

def tearDown(self):
os.unlink(self.tempfile)
Expand Down
3 changes: 0 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,6 @@ ignore =
E111,
E114,
E123,
E126,
E127,
E128,
E231,
E222,
E225,
Expand Down