diff options
Diffstat (limited to 'internal/handlers/ratelimiter.go')
| -rw-r--r-- | internal/handlers/ratelimiter.go | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/internal/handlers/ratelimiter.go b/internal/handlers/ratelimiter.go index 52281f6e..a8eee005 100644 --- a/internal/handlers/ratelimiter.go +++ b/internal/handlers/ratelimiter.go @@ -14,11 +14,11 @@ import ( // TODO: make this unexported once https://gitlab.com/gitlab-org/gitlab-pages/-/issues/670 is done func Ratelimiter(handler http.Handler, config *config.RateLimit) http.Handler { sourceIPLimiter := ratelimiter.New( - "source_ip", + "http_requests_by_source_ip", ratelimiter.WithCacheMaxSize(ratelimiter.DefaultSourceIPCacheSize), - ratelimiter.WithCachedEntriesMetric(metrics.RateLimitSourceIPCachedEntries), - ratelimiter.WithCachedRequestsMetric(metrics.RateLimitSourceIPCacheRequests), - ratelimiter.WithBlockedCountMetric(metrics.RateLimitSourceIPBlockedCount), + ratelimiter.WithCachedEntriesMetric(metrics.RateLimitCachedEntries), + ratelimiter.WithCachedRequestsMetric(metrics.RateLimitCacheRequests), + ratelimiter.WithBlockedCountMetric(metrics.RateLimitBlockedCount), ratelimiter.WithLimitPerSecond(config.SourceIPLimitPerSecond), ratelimiter.WithBurstSize(config.SourceIPBurst), ratelimiter.WithEnforce(feature.EnforceIPRateLimits.Enabled()), @@ -27,12 +27,12 @@ func Ratelimiter(handler http.Handler, config *config.RateLimit) http.Handler { handler = sourceIPLimiter.Middleware(handler) domainLimiter := ratelimiter.New( - "domain", + "http_requests_by_domain", ratelimiter.WithCacheMaxSize(ratelimiter.DefaultDomainCacheSize), ratelimiter.WithKeyFunc(request.GetHostWithoutPort), - ratelimiter.WithCachedEntriesMetric(metrics.RateLimitDomainCachedEntries), - ratelimiter.WithCachedRequestsMetric(metrics.RateLimitDomainCacheRequests), - ratelimiter.WithBlockedCountMetric(metrics.RateLimitDomainBlockedCount), + ratelimiter.WithCachedEntriesMetric(metrics.RateLimitCachedEntries), + ratelimiter.WithCachedRequestsMetric(metrics.RateLimitCacheRequests), + ratelimiter.WithBlockedCountMetric(metrics.RateLimitBlockedCount), ratelimiter.WithLimitPerSecond(config.DomainLimitPerSecond), ratelimiter.WithBurstSize(config.DomainBurst), ratelimiter.WithEnforce(feature.EnforceDomainRateLimits.Enabled()), |