OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #4002 from matrix-org/rav/pin_prometheus 

Pin to prometheus_client<0.4 to avoid renaming all of our metrics
release-v0.33.6
Richard van der Hoff 2018-10-03 17:42:08 +01:00 committed by GitHub
parent 055fe3589e a59d899668
commit e5f080d6a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/4002.misc Normal file
View File

@ -0,0 +1 @@
Pin to prometheus_client<0.4 to avoid renaming all of our metrics

5
synapse/python_dependencies.py
View File

@ -58,7 +58,10 @@ REQUIREMENTS = {
"msgpack-python>=0.3.0": ["msgpack"],
"phonenumbers>=8.2.0": ["phonenumbers"],
"six>=1.10": ["six"],
"prometheus_client>=0.0.18": ["prometheus_client"],
# prometheus_client 0.4.0 changed the format of counter metrics
# (cf https://github.com/matrix-org/synapse/issues/4001)
"prometheus_client>=0.0.18,<0.4.0": ["prometheus_client"],
# we use attr.s(slots), which arrived in 16.0.0
"attrs>=16.0.0": ["attr>=16.0.0"],