summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-04-12 11:18:19 +0100
committerErik Johnston <erik@matrix.org>2018-04-12 11:18:19 +0100
commitf67e906e189cb528cab18cb5190be352dcc8914b (patch)
tree068855c9368538c37ba3c161a5b291c299db7a0e /synapse
parentFix tests (diff)
downloadsynapse-f67e906e189cb528cab18cb5190be352dcc8914b.tar.xz
Set all metrics at the same time
Diffstat (limited to 'synapse')
-rw-r--r--synapse/federation/transaction_queue.py12
-rw-r--r--synapse/handlers/appservice.py8
2 files changed, 10 insertions, 10 deletions
diff --git a/synapse/federation/transaction_queue.py b/synapse/federation/transaction_queue.py
index 1c466cbded..963d938edd 100644
--- a/synapse/federation/transaction_queue.py
+++ b/synapse/federation/transaction_queue.py
@@ -233,16 +233,10 @@ class TransactionQueue(object):
                     consumeErrors=True
                 ))
 
-                events_processed_counter.inc_by(len(events))
-
                 yield self.store.update_federation_out_pos(
                     "events", next_token
                 )
 
-                synapse.metrics.event_processing_positions.set(
-                    next_token, "federation_sender",
-                )
-
                 if events:
                     now = self.clock.time_msec()
                     ts = yield self.store.get_received_ts(events[-1].event_id)
@@ -254,6 +248,12 @@ class TransactionQueue(object):
                         ts, "federation_sender",
                     )
 
+                events_processed_counter.inc_by(len(events))
+
+                synapse.metrics.event_processing_positions.set(
+                    next_token, "federation_sender",
+                )
+
         finally:
             self._is_processing = False
 
diff --git a/synapse/handlers/appservice.py b/synapse/handlers/appservice.py
index fcc1246bee..ce0814bc25 100644
--- a/synapse/handlers/appservice.py
+++ b/synapse/handlers/appservice.py
@@ -108,16 +108,16 @@ class ApplicationServicesHandler(object):
                                 service, event
                             )
 
-                    events_processed_counter.inc_by(len(events))
-
                     yield self.store.set_appservice_last_pos(upper_bound)
 
+                    now = self.clock.time_msec()
+                    ts = yield self.store.get_received_ts(events[-1].event_id)
+
                     synapse.metrics.event_processing_positions.set(
                         upper_bound, "appservice_sender",
                     )
 
-                    now = self.clock.time_msec()
-                    ts = yield self.store.get_received_ts(events[-1].event_id)
+                    events_processed_counter.inc_by(len(events))
 
                     synapse.metrics.event_processing_lag.set(
                         now - ts, "appservice_sender",