Remove more spurious `PreserveLoggingContext`s

Remove `PreserveLoggingContext` around calls to `Notifier.on_new_room_event`;
there is no problem if the logcontext is set when calling it.

synapse/handlers/federation.py

@@ -28,7 +28,7 @@ from synapse.api.constants import EventTypes, Membership, RejectedReason
 from synapse.events.validator import EventValidator
 from synapse.util import unwrapFirstError
 from synapse.util.logcontext import (
-    PreserveLoggingContext, preserve_fn, preserve_context_over_deferred
+    preserve_fn, preserve_context_over_deferred
 )
 from synapse.util.metrics import measure_func
 from synapse.util.logutils import log_function
@@ -394,7 +394,6 @@ class FederationHandler(BaseHandler):
             target_user = UserID.from_string(target_user_id)
             extra_users.append(target_user)
 
-        with PreserveLoggingContext():
         self.notifier.on_new_room_event(
             event, event_stream_id, max_stream_id,
             extra_users=extra_users
@@ -916,7 +915,6 @@ class FederationHandler(BaseHandler):
                 origin, auth_chain, state, event
             )
 
-            with PreserveLoggingContext():
             self.notifier.on_new_room_event(
                 event, event_stream_id, max_stream_id,
                 extra_users=[joinee]
@@ -1025,7 +1023,6 @@ class FederationHandler(BaseHandler):
             target_user = UserID.from_string(target_user_id)
             extra_users.append(target_user)
 
-        with PreserveLoggingContext():
         self.notifier.on_new_room_event(
             event, event_stream_id, max_stream_id, extra_users=extra_users
         )
@@ -1074,7 +1071,6 @@ class FederationHandler(BaseHandler):
         )
 
         target_user = UserID.from_string(event.state_key)
-        with PreserveLoggingContext():
         self.notifier.on_new_room_event(
             event, event_stream_id, max_stream_id,
             extra_users=[target_user],
@@ -1236,7 +1232,6 @@ class FederationHandler(BaseHandler):
             target_user = UserID.from_string(target_user_id)
             extra_users.append(target_user)
 
-        with PreserveLoggingContext():
         self.notifier.on_new_room_event(
             event, event_stream_id, max_stream_id, extra_users=extra_users
         )