Measure some /sync related things

synapse/handlers/sync.py

@@ -19,6 +19,7 @@ from synapse.streams.config import PaginationConfig
 from synapse.api.constants import Membership, EventTypes
 from synapse.util import unwrapFirstError
 from synapse.util.logcontext import LoggingContext, PreserveLoggingContext
+from synapse.util.metrics import Measure
 
 from twisted.internet import defer
 
@@ -368,6 +369,7 @@ class SyncHandler(BaseHandler):
             typing events for that room.
         """
 
+        with Measure(self.clock, "ephemeral_by_room"):
             typing_key = since_token.typing_key if since_token else "0"
 
             rooms = yield self.store.get_rooms_for_user(sync_config.user.to_string())
@@ -619,6 +621,7 @@ class SyncHandler(BaseHandler):
         """
         :returns a Deferred TimelineBatch
         """
+        with Measure(self.clock, "load_filtered_recents"):
             filtering_factor = 2
             timeline_limit = sync_config.filter_collection.timeline_limit()
             load_limit = max(timeline_limit * filtering_factor, 10)
@@ -649,7 +652,9 @@ class SyncHandler(BaseHandler):
                     from_key=since_key,
                     to_key=end_key,
                 )
-            loaded_recents = sync_config.filter_collection.filter_room_timeline(events)
+                loaded_recents = sync_config.filter_collection.filter_room_timeline(
+                    events
+                )
                 loaded_recents = yield self._filter_events_for_client(
                     sync_config.user.to_string(),
                     loaded_recents,
@@ -831,9 +836,12 @@ class SyncHandler(BaseHandler):
         # updates even if they occured logically before the previous event.
         # TODO(mjark) Check for new redactions in the state events.
 
+        with Measure(self.clock, "compute_state_delta"):
             if full_state:
                 if batch:
-                state = yield self.store.get_state_for_event(batch.events[0].event_id)
+                    state = yield self.store.get_state_for_event(
+                        batch.events[0].event_id
+                    )
                 else:
                     state = yield self.get_state_at(
                         room_id, stream_position=now_token
@@ -896,6 +904,7 @@ class SyncHandler(BaseHandler):
 
     @defer.inlineCallbacks
     def unread_notifs_for_room_id(self, room_id, sync_config, ephemeral_by_room):
+        with Measure(self.clock, "unread_notifs_for_room_id"):
             last_unread_event_id = self.last_read_event_id_for_room_and_user(
                 room_id, sync_config.user.to_string(), ephemeral_by_room
             )

synapse/handlers/typing.py

@@ -19,6 +19,7 @@ from ._base import BaseHandler
 
 from synapse.api.errors import SynapseError, AuthError
 from synapse.util.logcontext import PreserveLoggingContext
+from synapse.util.metrics import Measure
 from synapse.types import UserID
 
 import logging
@@ -222,6 +223,7 @@ class TypingNotificationHandler(BaseHandler):
 class TypingNotificationEventSource(object):
     def __init__(self, hs):
         self.hs = hs
+        self.clock = hs.get_clock()
         self._handler = None
         self._room_member_handler = None
 
@@ -247,6 +249,7 @@ class TypingNotificationEventSource(object):
         }
 
     def get_new_events(self, from_key, room_ids, **kwargs):
+        with Measure(self.clock, "typing.get_new_events"):
             from_key = int(from_key)
             handler = self.handler()