Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Fix incorrect juggling of logging contexts in _PerHostRatelimiter #13554

Merged
merged 9 commits into from
Aug 18, 2022
Prev Previous commit
Next Next commit
fixup: small tidup, suggested by clokep
Sean Quah committed Aug 18, 2022

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 92456469763b4455fe92d1c11ae18f6bf37bf4ce
5 changes: 2 additions & 3 deletions synapse/util/ratelimitutils.py
Original file line number Diff line number Diff line change
@@ -242,9 +242,8 @@ async def _trace_wait(self, d: "defer.Deferred[None]") -> None:
d: The `Deferred` to wait for. Must not follow the Synapse logging context
rules.
"""
with start_active_span("ratelimit wait"):
with queue_wait_timer.time():
await make_deferred_yieldable(d)
with start_active_span("ratelimit wait"), queue_wait_timer.time():
await make_deferred_yieldable(d)

def _on_exit(self, request_id: object) -> None:
logger.debug("Ratelimit(%s) [%s]: Processed req", self.host, id(request_id))