summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2020-01-28 18:59:48 +0000
committerGitHub <noreply@github.com>2020-01-28 18:59:48 +0000
commitfcfb591b312d6ec124c67aef2136a2d5948cadbe (patch)
tree935754b763338b48fb20034053fe04c36bae0533
parentMerge pull request #6787 from matrix-org/rav/msc2260 (diff)
downloadsynapse-fcfb591b312d6ec124c67aef2136a2d5948cadbe.tar.xz
Fix outbound federation request metrics (#6795)
-rw-r--r--changelog.d/6795.bugfix1
-rw-r--r--synapse/http/matrixfederationclient.py4
2 files changed, 5 insertions, 0 deletions
diff --git a/changelog.d/6795.bugfix b/changelog.d/6795.bugfix
new file mode 100644
index 0000000000..d1585653b1
--- /dev/null
+++ b/changelog.d/6795.bugfix
@@ -0,0 +1 @@
+Fix outbound federation request metrics.
diff --git a/synapse/http/matrixfederationclient.py b/synapse/http/matrixfederationclient.py
index 16765d54e0..6f1bb04d8b 100644
--- a/synapse/http/matrixfederationclient.py
+++ b/synapse/http/matrixfederationclient.py
@@ -408,6 +408,8 @@ class MatrixFederationHttpClient(object):
                         _sec_timeout,
                     )
 
+                    outgoing_requests_counter.labels(method_bytes).inc()
+
                     try:
                         with Measure(self.clock, "outbound_request"):
                             # we don't want all the fancy cookie and redirect handling
@@ -440,6 +442,8 @@ class MatrixFederationHttpClient(object):
                         response.phrase.decode("ascii", errors="replace"),
                     )
 
+                    incoming_responses_counter.labels(method_bytes, response.code).inc()
+
                     set_tag(tags.HTTP_STATUS_CODE, response.code)
 
                     if 200 <= response.code < 300: