diff options
| author | John Cai <jcai@gitlab.com> | 2022-03-28 18:29:23 +0300 |
|---|---|---|
| committer | John Cai <jcai@gitlab.com> | 2022-04-05 20:57:43 +0300 |
| commit | add9d6e101635199301391518726a8113394e968 (patch) | |
| tree | 89b25c1f7990d8fdd82fd2f78eb1b937ac4a6925 | |
| parent | 31259d9d793cce6f62a1b1f8e6a4649072742c00 (diff) | |
limithandler: Change metric name for concurrency limiting
Before, concurrency limiting was the only limiting middleware. The name
of the metric had gitaly_rate_limiting in it, which was a bit of a
misnomer since rate was never part of the equation. Now that we are
actually adding a rate limiter to Gitaly, the concurrency metrics will
be mistaken for rate limiting metrics.
Change the name of these by replacing rate_limiting with
concurrency_limiting.
Changelog: changed
| -rw-r--r-- | internal/middleware/limithandler/concurrency_limiter.go | 6 | ||||
| -rw-r--r-- | internal/middleware/limithandler/middleware_test.go | 20 |
2 files changed, 13 insertions, 13 deletions
diff --git a/internal/middleware/limithandler/concurrency_limiter.go b/internal/middleware/limithandler/concurrency_limiter.go index 92802634f..f6587554a 100644 --- a/internal/middleware/limithandler/concurrency_limiter.go +++ b/internal/middleware/limithandler/concurrency_limiter.go @@ -196,7 +196,7 @@ func WithConcurrencyLimiters(cfg config.Cfg, middleware *LimiterMiddleware) { acquiringSecondsMetric := prometheus.NewHistogramVec( prometheus.HistogramOpts{ Namespace: "gitaly", - Subsystem: "rate_limiting", + Subsystem: "concurrency_limiting", Name: "acquiring_seconds", Help: "Histogram of time calls are rate limited (in seconds)", Buckets: cfg.Prometheus.GRPCLatencyBuckets, @@ -206,7 +206,7 @@ func WithConcurrencyLimiters(cfg config.Cfg, middleware *LimiterMiddleware) { inProgressMetric := prometheus.NewGaugeVec( prometheus.GaugeOpts{ Namespace: "gitaly", - Subsystem: "rate_limiting", + Subsystem: "concurrency_limiting", Name: "in_progress", Help: "Gauge of number of concurrent in-progress calls", }, @@ -215,7 +215,7 @@ func WithConcurrencyLimiters(cfg config.Cfg, middleware *LimiterMiddleware) { queuedMetric := prometheus.NewGaugeVec( prometheus.GaugeOpts{ Namespace: "gitaly", - Subsystem: "rate_limiting", + Subsystem: "concurrency_limiting", Name: "queued", Help: "Gauge of number of queued calls", }, diff --git a/internal/middleware/limithandler/middleware_test.go b/internal/middleware/limithandler/middleware_test.go index 610475a30..beebb3d54 100644 --- a/internal/middleware/limithandler/middleware_test.go +++ b/internal/middleware/limithandler/middleware_test.go @@ -290,22 +290,22 @@ func TestConcurrencyLimitHandlerMetrics(t *testing.T) { } } - expectedMetrics := `# HELP gitaly_rate_limiting_in_progress Gauge of number of concurrent in-progress calls -# TYPE gitaly_rate_limiting_in_progress gauge -gitaly_rate_limiting_in_progress{grpc_method="ReplicateRepository",grpc_service="gitaly.RepositoryService",system="gitaly"} 0 -gitaly_rate_limiting_in_progress{grpc_method="Unary",grpc_service="test.limithandler.Test",system="gitaly"} 1 -# HELP gitaly_rate_limiting_queued Gauge of number of queued calls -# TYPE gitaly_rate_limiting_queued gauge -gitaly_rate_limiting_queued{grpc_method="ReplicateRepository",grpc_service="gitaly.RepositoryService",system="gitaly"} 0 -gitaly_rate_limiting_queued{grpc_method="Unary",grpc_service="test.limithandler.Test",system="gitaly"} 1 + expectedMetrics := `# HELP gitaly_concurrency_limiting_in_progress Gauge of number of concurrent in-progress calls +# TYPE gitaly_concurrency_limiting_in_progress gauge +gitaly_concurrency_limiting_in_progress{grpc_method="ReplicateRepository",grpc_service="gitaly.RepositoryService",system="gitaly"} 0 +gitaly_concurrency_limiting_in_progress{grpc_method="Unary",grpc_service="test.limithandler.Test",system="gitaly"} 1 +# HELP gitaly_concurrency_limiting_queued Gauge of number of queued calls +# TYPE gitaly_concurrency_limiting_queued gauge +gitaly_concurrency_limiting_queued{grpc_method="ReplicateRepository",grpc_service="gitaly.RepositoryService",system="gitaly"} 0 +gitaly_concurrency_limiting_queued{grpc_method="Unary",grpc_service="test.limithandler.Test",system="gitaly"} 1 # HELP gitaly_requests_dropped_total Number of requests dropped from the queue # TYPE gitaly_requests_dropped_total counter gitaly_requests_dropped_total{grpc_method="Unary",grpc_service="test.limithandler.Test",reason="max_size",system="gitaly"} 9 ` assert.NoError(t, promtest.CollectAndCompare(lh, bytes.NewBufferString(expectedMetrics), - "gitaly_rate_limiting_queued", + "gitaly_concurrency_limiting_queued", "gitaly_requests_dropped_total", - "gitaly_rate_limiting_in_progress")) + "gitaly_concurrency_limiting_in_progress")) close(s.blockCh) <-s.reqArrivedCh |