diff options
author | feistel <6742251-feistel@users.noreply.gitlab.com> | 2021-11-01 20:50:01 +0300 |
---|---|---|
committer | feistel <6742251-feistel@users.noreply.gitlab.com> | 2021-11-01 20:50:01 +0300 |
commit | 35c52c2476db8524f5d4e3c2c402522e449d74ef (patch) | |
tree | 566d35e2e84817beaa103ca6e77461846460c604 /app.go | |
parent | 2b5f9c3202c73306a6d7bafb58b7570b7dfec87d (diff) |
refactor: make internal/lru and internal/ratelimiter metrics optional
Diffstat (limited to 'app.go')
-rw-r--r-- | app.go | 11 |
1 files changed, 8 insertions, 3 deletions
@@ -31,6 +31,7 @@ import ( "gitlab.com/gitlab-org/gitlab-pages/internal/handlers" "gitlab.com/gitlab-org/gitlab-pages/internal/httperrors" "gitlab.com/gitlab-org/gitlab-pages/internal/logging" + "gitlab.com/gitlab-org/gitlab-pages/internal/lru" "gitlab.com/gitlab-org/gitlab-pages/internal/netutil" "gitlab.com/gitlab-org/gitlab-pages/internal/ratelimiter" "gitlab.com/gitlab-org/gitlab-pages/internal/rejectmethods" @@ -265,9 +266,13 @@ func (a *theApp) buildHandlerPipeline() (http.Handler, error) { if a.config.RateLimit.SourceIPLimitPerSecond > 0 { rl := ratelimiter.New( - metrics.RateLimitSourceIPBlockedCount, - metrics.RateLimitSourceIPCachedEntries, - metrics.RateLimitSourceIPCacheRequests, + lru.New("source_ip", + lru.DefaultSourceIPItems, + lru.DefaultSourceIPExpirationInterval, + lru.WithCachedEntriesMetric(metrics.RateLimitSourceIPCachedEntries), + lru.WithCachedRequestsMetric(metrics.RateLimitSourceIPCacheRequests), + ), + ratelimiter.WithBlockedCountMetric(metrics.RateLimitSourceIPBlockedCount), ratelimiter.WithSourceIPLimitPerSecond(a.config.RateLimit.SourceIPLimitPerSecond), ratelimiter.WithSourceIPBurstSize(a.config.RateLimit.SourceIPBurst), ) |