Add measure blocks to notifier

synapse/notifier.py

@@ -20,6 +20,7 @@ from synapse.api.errors import AuthError
 from synapse.util.logutils import log_function
 from synapse.util.async import ObservableDeferred
 from synapse.util.logcontext import PreserveLoggingContext
+from synapse.util.metrics import Measure
 from synapse.types import StreamToken
 from synapse.visibility import filter_events_for_client
 import synapse.metrics
@@ -231,6 +232,7 @@ class Notifier(object):
         Will wake up all listeners for the given users and rooms.
         """
         with PreserveLoggingContext():
+            with Measure(self.clock, "on_new_event"):
                 user_streams = set()
 
                 for user in users:
@@ -254,6 +256,7 @@ class Notifier(object):
         """Used to inform replication listeners that something has happend
         without waking up any of the normal user event streams"""
         with PreserveLoggingContext():
+            with Measure(self.clock, "on_new_replication_data"):
                 self.notify_replication()
 
     @defer.inlineCallbacks