Revert "TEMPORARY Subdivide _resolve_events Measure blocks"

This reverts commit f3db863420.

synapse/state/v2.py

@@ -38,7 +38,6 @@ from synapse.api.errors import AuthError
 from synapse.api.room_versions import RoomVersion
 from synapse.events import EventBase
 from synapse.types import MutableStateMap, StateMap, StrCollection
-from synapse.util.metrics import Measure
 
 logger = logging.getLogger(__name__)
 
@@ -105,7 +104,7 @@ async def resolve_events_with_store(
     Returns:
         A map from (type, state_key) to event_id.
     """
-    with Measure(clock, "rei_state_res:rews2_a"):  # TODO temporary (rei)
+
     logger.debug("Computing conflicted state")
 
     # We use event_map as a cache, so if its None we need to initialize it
@@ -127,7 +126,6 @@ async def resolve_events_with_store(
         room_id, state_sets, event_map, state_res_store
     )
 
-    with Measure(clock, "rei_state_res:rews2_b"):  # TODO temporary (rei)
     full_conflicted_set = set(
         itertools.chain(
             itertools.chain.from_iterable(conflicted_state.values()), auth_diff
@@ -140,7 +138,6 @@ async def resolve_events_with_store(
     )
     event_map.update(events)
 
-    with Measure(clock, "rei_state_res:rews2_c"):  # TODO temporary (rei)
     # everything in the event map should be in the right room
     for event in event_map.values():
         if event.room_id != room_id:
@@ -162,19 +159,12 @@ async def resolve_events_with_store(
         eid for eid in full_conflicted_set if _is_power_event(event_map[eid])
     )
 
-    with Measure(clock, "rei_state_res:rews2_d"):  # TODO temporary (rei)
     sorted_power_events = await _reverse_topological_power_sort(
-            clock,
-            room_id,
-            power_events,
-            event_map,
-            state_res_store,
-            full_conflicted_set,
+        clock, room_id, power_events, event_map, state_res_store, full_conflicted_set
     )
 
     logger.debug("sorted %d power events", len(sorted_power_events))
 
-    with Measure(clock, "rei_state_res:rews2_e"):  # TODO temporary (rei)
     # Now sequentially auth each one
     resolved_state = await _iterative_auth_checks(
         clock,
@@ -188,7 +178,6 @@ async def resolve_events_with_store(
 
     logger.debug("resolved power events")
 
-    with Measure(clock, "rei_state_res:rews2_f"):  # TODO temporary (rei)
     # OK, so we've now resolved the power events. Now sort the remaining
     # events using the mainline of the resolved power level.
 
@@ -199,13 +188,11 @@ async def resolve_events_with_store(
 
     logger.debug("sorting %d remaining events", len(leftover_events))
 
-    with Measure(clock, "rei_state_res:rews2_g"):  # TODO temporary (rei)
     pl = resolved_state.get((EventTypes.PowerLevels, ""), None)
     leftover_events = await _mainline_sort(
         clock, room_id, leftover_events, pl, event_map, state_res_store
     )
 
-    with Measure(clock, "rei_state_res:rews2_h"):  # TODO temporary (rei)
     logger.debug("resolving remaining events")
 
     resolved_state = await _iterative_auth_checks(