From 23c7d60c29c85f0e2df5307b764b0bfbd2a9797e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wojciech=20Tyczy=C5=84ski?= Date: Fri, 25 Mar 2022 14:58:41 +0100 Subject: [PATCH] Deprecate apiserver_dropped_requests_total metric Kubernetes-commit: b106b2621c454b8f38b9dc28935994c33426ee75 --- pkg/endpoints/metrics/metrics.go | 10 ++++------ pkg/endpoints/metrics/metrics_test.go | 6 +++--- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/pkg/endpoints/metrics/metrics.go b/pkg/endpoints/metrics/metrics.go index 4f4b1786b..2a612e021 100644 --- a/pkg/endpoints/metrics/metrics.go +++ b/pkg/endpoints/metrics/metrics.go @@ -133,14 +133,12 @@ var ( []string{"verb", "group", "version", "resource", "subresource", "scope", "component"}, ) // droppedRequests is a number of requests dropped with 'Try again later' response" - // - // TODO(wojtek-t): This metric can be inferred both from requestTerminationsTotal as well as - // from requestCounter. We should deprecate and remove it. droppedRequests = compbasemetrics.NewCounterVec( &compbasemetrics.CounterOpts{ - Name: "apiserver_dropped_requests_total", - Help: "Number of requests dropped with 'Try again later' response", - StabilityLevel: compbasemetrics.ALPHA, + Name: "apiserver_dropped_requests_total", + Help: "Number of requests dropped with 'Try again later' response. Use apiserver_request_total and/or apiserver_request_terminations_total metrics instead.", + StabilityLevel: compbasemetrics.ALPHA, + DeprecatedVersion: "1.24.0", }, []string{"request_kind"}, ) diff --git a/pkg/endpoints/metrics/metrics_test.go b/pkg/endpoints/metrics/metrics_test.go index 7c810dee6..8403f1c3a 100644 --- a/pkg/endpoints/metrics/metrics_test.go +++ b/pkg/endpoints/metrics/metrics_test.go @@ -244,7 +244,7 @@ func TestRecordDroppedRequests(t *testing.T) { }, isMutating: false, want: ` - # HELP apiserver_dropped_requests_total [ALPHA] Number of requests dropped with 'Try again later' response + # HELP apiserver_dropped_requests_total [ALPHA] Number of requests dropped with 'Try again later' response. Use apiserver_request_total and/or apiserver_request_terminations_total metrics instead. # TYPE apiserver_dropped_requests_total counter apiserver_dropped_requests_total{request_kind="readOnly"} 1 # HELP apiserver_request_total [STABLE] Counter of apiserver requests broken out for each verb, dry run value, group, version, resource, scope, component, and HTTP response code. @@ -268,7 +268,7 @@ func TestRecordDroppedRequests(t *testing.T) { }, isMutating: true, want: ` - # HELP apiserver_dropped_requests_total [ALPHA] Number of requests dropped with 'Try again later' response + # HELP apiserver_dropped_requests_total [ALPHA] Number of requests dropped with 'Try again later' response. Use apiserver_request_total and/or apiserver_request_terminations_total metrics instead. # TYPE apiserver_dropped_requests_total counter apiserver_dropped_requests_total{request_kind="mutating"} 1 # HELP apiserver_request_total [STABLE] Counter of apiserver requests broken out for each verb, dry run value, group, version, resource, scope, component, and HTTP response code. @@ -294,7 +294,7 @@ func TestRecordDroppedRequests(t *testing.T) { }, isMutating: true, want: ` - # HELP apiserver_dropped_requests_total [ALPHA] Number of requests dropped with 'Try again later' response + # HELP apiserver_dropped_requests_total [ALPHA] Number of requests dropped with 'Try again later' response. Use apiserver_request_total and/or apiserver_request_terminations_total metrics instead. # TYPE apiserver_dropped_requests_total counter apiserver_dropped_requests_total{request_kind="mutating"} 1 # HELP apiserver_request_total [STABLE] Counter of apiserver requests broken out for each verb, dry run value, group, version, resource, scope, component, and HTTP response code.