summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2020-07-01 15:23:58 +0100
committerGitHub <noreply@github.com>2020-07-01 15:23:58 +0100
commit1e03513f9aa0b266a4bd4a7bcd1c26b22c43a2eb (patch)
tree5d102644202d2353909ceb89b745408e1ebe75e5
parentPin link in CHANGES.md (diff)
downloadsynapse-1e03513f9aa0b266a4bd4a7bcd1c26b22c43a2eb.tar.xz
Fix new metric where we used ms instead of seconds (#7771)
Introduced in #7755, not yet released.
-rw-r--r--changelog.d/7771.misc1
-rw-r--r--synapse/federation/sender/__init__.py2
-rw-r--r--synapse/handlers/appservice.py2
3 files changed, 3 insertions, 2 deletions
diff --git a/changelog.d/7771.misc b/changelog.d/7771.misc
new file mode 100644
index 0000000000..1fc29206ac
--- /dev/null
+++ b/changelog.d/7771.misc
@@ -0,0 +1 @@
+Add some metrics for inbound and outbound federation latencies: `synapse_federation_server_pdu_process_time` and `synapse_event_processing_lag_by_event`.
diff --git a/synapse/federation/sender/__init__.py b/synapse/federation/sender/__init__.py
index 23fb515683..464d7a41de 100644
--- a/synapse/federation/sender/__init__.py
+++ b/synapse/federation/sender/__init__.py
@@ -209,7 +209,7 @@ class FederationSender(object):
 
                         synapse.metrics.event_processing_lag_by_event.labels(
                             "federation_sender"
-                        ).observe(now - ts)
+                        ).observe((now - ts) / 1000)
 
                 async def handle_room_events(events: Iterable[EventBase]) -> None:
                     with Measure(self.clock, "handle_room_events"):
diff --git a/synapse/handlers/appservice.py b/synapse/handlers/appservice.py
index f7d9fd621e..904c96eeec 100644
--- a/synapse/handlers/appservice.py
+++ b/synapse/handlers/appservice.py
@@ -118,7 +118,7 @@ class ApplicationServicesHandler(object):
                         ts = yield self.store.get_received_ts(event.event_id)
                         synapse.metrics.event_processing_lag_by_event.labels(
                             "appservice_sender"
-                        ).observe(now - ts)
+                        ).observe((now - ts) / 1000)
 
                     @defer.inlineCallbacks
                     def handle_room_events(events):