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

Commit

Permalink
Add metrics to track rate limiter queue timing
Browse files Browse the repository at this point in the history
Related to:

 - #13534
 - #13541
  • Loading branch information
MadLittleMods committed Aug 16, 2022
1 parent 0a4efbc commit e6c2b24
Showing 1 changed file with 30 additions and 0 deletions.
30 changes: 30 additions & 0 deletions synapse/util/ratelimitutils.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
run_in_background,
)
from synapse.logging.opentracing import start_active_span
from synapse.metrics import Histogram
from synapse.util import Clock

if typing.TYPE_CHECKING:
Expand All @@ -36,6 +37,29 @@
logger = logging.getLogger(__name__)


queue_wait_timer = Histogram(
"synapse_rate_limit_queue_wait_time_seconds",
"sec",
[],
buckets=(
0.005,
0.01,
0.025,
0.05,
0.1,
0.25,
0.5,
0.75,
1.0,
2.5,
5.0,
10.0,
20.0,
"+Inf",
),
)


class FederationRateLimiter:
def __init__(self, clock: Clock, config: FederationRatelimitSettings):
def new_limiter() -> "_PerHostRatelimiter":
Expand Down Expand Up @@ -178,10 +202,16 @@ def on_both(r: object) -> object:
self.sleeping_requests.discard(request_id)
self.ready_request_queue.pop(request_id, None)
wait_span_scope.__exit__(None, None, None)
wait_timer_cm.__exit__(None, None, None)
return r

# Tracing
wait_span_scope = start_active_span("ratelimit wait")
wait_span_scope.__enter__()
# Metrics
wait_timer_cm = queue_wait_timer.time()
wait_timer_cm.__enter__()

ret_defer.addCallbacks(on_start, on_err)
ret_defer.addBoth(on_both)
return make_deferred_yieldable(ret_defer)
Expand Down

0 comments on commit e6c2b24

Please sign in to comment.