maxmustermann/synapse
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #4317 from de-vri-es/test-metric-prometheus-0.5

Browse source 
Fix test_metrics.py compatibility prometheus_client 0.5
This commit is contained in:
Richard van der Hoff 2018-12-23 00:14:47 +01:00 committed by GitHub
parent 597dafb5e8 48b7ff7a35
commit 3355c1a9ec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/4317.bugfix Normal file
View file

@ -0,0 +1 @@
Fix test_metric.py compatibility with prometheus_client 0.5. Contributed by Maarten de Vries <maarten@de-vri.es>.

24
tests/test_metrics.py
View file

@ -19,6 +19,28 @@ from synapse.metrics import InFlightGauge
from tests import unittest
def get_sample_labels_value(sample):
""" Extract the labels and values of a sample.
prometheus_client 0.5 changed the sample type to a named tuple with more
members than the plain tuple had in 0.4 and earlier. This function can
extract the labels and value from the sample for both sample types.
Args:
sample: The sample to get the labels and value from.
Returns:
A tuple of (labels, value) from the sample.
"""
# If the sample has a labels and value attribute, use those.
if hasattr(sample, "labels") and hasattr(sample, "value"):
return sample.labels, sample.value
# Otherwise fall back to treating it as a plain 3 tuple.
else:
_, labels, value = sample
return labels, value
class TestMauLimit(unittest.TestCase):
def test_basic(self):
gauge = InFlightGauge(
@ -75,7 +97,7 @@ class TestMauLimit(unittest.TestCase):
for r in gauge.collect():
results[r.name] = {
tuple(labels[x] for x in gauge.labels): value
for _, labels, value in r.samples
for labels, value in map(get_sample_labels_value, r.samples)
}
return results