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

Pin to prometheus_client<0.4 to avoid renaming all of our metrics
matrix-org · Oct 3, 2018 · e5f080d · e5f080d
2 parents 055fe35 + a59d899
commit e5f080d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/changelog.d/4002.misc b/changelog.d/4002.misc
@@ -0,0 +1 @@
+Pin to prometheus_client<0.4 to avoid renaming all of our metrics
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py
@@ -58,7 +58,10 @@
     "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"],
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Pin to prometheus_client<0.4 to avoid renaming all of our metrics