Skip to content

Convert MetricFamily labels -> list #184

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brian-brazil merged 2 commits into from
Aug 7, 2017
Merged

Convert MetricFamily labels -> list #184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4abab35
Ensure MetricFamily labels is a tuple
manics Aug 7, 2017
df72333
Test MetricFamily labels are a tuple
manics Aug 7, 2017
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
8 changes: 4 additions & 4 deletions prometheus_client/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ def __init__(self, name, documentation, value=None, labels=None):
raise ValueError('Can only specify at most one of value and labels.')
if labels is None:
labels = []
self._labelnames = labels
self._labelnames = tuple(labels)
if value is not None:
self.add_metric([], value)

Expand All @@ -212,7 +212,7 @@ def __init__(self, name, documentation, value=None, labels=None):
raise ValueError('Can only specify at most one of value and labels.')
if labels is None:
labels = []
self._labelnames = labels
self._labelnames = tuple(labels)
if value is not None:
self.add_metric([], value)

Expand All @@ -239,7 +239,7 @@ def __init__(self, name, documentation, count_value=None, sum_value=None, labels
raise ValueError('Can only specify at most one of value and labels.')
if labels is None:
labels = []
self._labelnames = labels
self._labelnames = tuple(labels)
if count_value is not None:
self.add_metric([], count_value, sum_value)

Expand Down Expand Up @@ -268,7 +268,7 @@ def __init__(self, name, documentation, buckets=None, sum_value=None, labels=Non
raise ValueError('Can only specify at most one of buckets and labels.')
if labels is None:
labels = []
self._labelnames = labels
self._labelnames = tuple(labels)
if buckets is not None:
self.add_metric([], buckets, sum_value)

Expand Down
10 changes: 10 additions & 0 deletions tests/test_core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,16 @@ def test_bad_constructors(self):
self.assertRaises(ValueError, HistogramMetricFamily, 'h', 'help', buckets={}, sum_value=1, labels=['a'])
self.assertRaises(KeyError, HistogramMetricFamily, 'h', 'help', buckets={}, sum_value=1)

def test_labelnames(self):
cmf = CounterMetricFamily('c', 'help', labels=iter(['a']))
self.assertEqual(('a',), cmf._labelnames)
gmf = GaugeMetricFamily('g', 'help', labels=iter(['a']))
self.assertEqual(('a',), gmf._labelnames)
smf = SummaryMetricFamily('s', 'help', labels=iter(['a']))
self.assertEqual(('a',), smf._labelnames)
hmf = HistogramMetricFamily('h', 'help', labels=iter(['a']))
self.assertEqual(('a',), hmf._labelnames)


class TestCollectorRegistry(unittest.TestCase):
def test_duplicate_metrics_raises(self):
Expand Down