From eafd103fc70bc7d479bf80271b4f03144424d5fa Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Date: Thu, 14 May 2020 17:01:34 +0100
Subject: [PATCH] Fix b'GET' in prometheus metrics (#7503)
---
changelog.d/7503.bugfix | 1 +
synapse/http/matrixfederationclient.py | 6 ++++--
2 files changed, 5 insertions(+), 2 deletions(-)
create mode 100644 changelog.d/7503.bugfix
diff --git a/changelog.d/7503.bugfix b/changelog.d/7503.bugfix
new file mode 100644
index 0000000000..d33d26dcbf
--- /dev/null
+++ b/changelog.d/7503.bugfix
@@ -0,0 +1 @@
+Fix incorrect `method` label on `synapse_http_matrixfederationclient_{requests,responses}` prometheus metrics.
diff --git a/synapse/http/matrixfederationclient.py b/synapse/http/matrixfederationclient.py
index 6b0a532c05..225a47e3c3 100644
--- a/synapse/http/matrixfederationclient.py
+++ b/synapse/http/matrixfederationclient.py
@@ -408,7 +408,7 @@ class MatrixFederationHttpClient(object):
_sec_timeout,
)
- outgoing_requests_counter.labels(method_bytes).inc()
+ outgoing_requests_counter.labels(request.method).inc()
try:
with Measure(self.clock, "outbound_request"):
@@ -434,7 +434,9 @@ class MatrixFederationHttpClient(object):
logger.info("Failed to send request: %s", e)
raise_from(RequestSendFailed(e, can_retry=True), e)
- incoming_responses_counter.labels(method_bytes, response.code).inc()
+ incoming_responses_counter.labels(
+ request.method, response.code
+ ).inc()
set_tag(tags.HTTP_STATUS_CODE, response.code)
--
GitLab