diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-10-03 17:42:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-03 17:42:08 +0100 |
| commit | e5f080d6a7d75654e0ee7d87385554da77b630c1 (patch) | |
| tree | fd33b2893cb3bb41302850340e1870e108a2a1fb | |
| parent | Merge pull request #3998 from matrix-org/michaelkaye/build_docker_images_of_r... (diff) | |
| parent | Pin to prometheus_client<0.4 to avoid renaming all of our metrics (diff) | |
| download | synapse-e5f080d6a7d75654e0ee7d87385554da77b630c1.tar.xz | |
Merge pull request #4002 from matrix-org/rav/pin_prometheus
Pin to prometheus_client<0.4 to avoid renaming all of our metrics
| -rw-r--r-- | changelog.d/4002.misc | 1 | ||||
| -rw-r--r-- | synapse/python_dependencies.py | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/changelog.d/4002.misc b/changelog.d/4002.misc new file mode 100644 index 0000000000..545abe5d58 --- /dev/null +++ b/changelog.d/4002.misc @@ -0,0 +1 @@ +Pin to prometheus_client<0.4 to avoid renaming all of our metrics \ No newline at end of file diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 0f339a0320..d4d983b00a 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -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"], |