From f223b900907b71431d7b6ceefa1642bb44fd9d84 Mon Sep 17 00:00:00 2001 From: Han Kang Date: Wed, 1 Jun 2022 11:55:14 -0700 Subject: [PATCH] cleanup deprecated metrics and usages --- .../apiserver/pkg/endpoints/handlers/watch.go | 2 -- .../pkg/endpoints/metrics/metrics.go | 28 ------------------- .../pkg/endpoints/metrics/metrics_test.go | 12 -------- .../filters/priority-and-fairness_test.go | 4 +-- .../pkg/storage/etcd3/metrics/metrics.go | 13 +-------- 5 files changed, 3 insertions(+), 56 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/watch.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/watch.go index c155b925f78..9b8917caafc 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/watch.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/watch.go @@ -163,8 +163,6 @@ type WatchServer struct { // or over a websocket connection. func (s *WatchServer) ServeHTTP(w http.ResponseWriter, req *http.Request) { kind := s.Scope.Kind - metrics.RegisteredWatchers.WithContext(req.Context()).WithLabelValues(kind.Group, kind.Version, kind.Kind).Inc() - defer metrics.RegisteredWatchers.WithContext(req.Context()).WithLabelValues(kind.Group, kind.Version, kind.Kind).Dec() if wsstream.IsWebSocketRequest(req) { w.Header().Set("Content-Type", s.MediaType) diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/metrics/metrics.go b/staging/src/k8s.io/apiserver/pkg/endpoints/metrics/metrics.go index d89249ff860..cb37ae21a1e 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/metrics/metrics.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/metrics/metrics.go @@ -136,16 +136,6 @@ var ( }, []string{"verb", "group", "version", "resource", "subresource", "scope", "component"}, ) - // droppedRequests is a number of requests dropped with 'Try again later' response" - droppedRequests = compbasemetrics.NewCounterVec( - &compbasemetrics.CounterOpts{ - 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"}, - ) // TLSHandshakeErrors is a number of requests dropped with 'TLS handshake error from' error TLSHandshakeErrors = compbasemetrics.NewCounter( &compbasemetrics.CounterOpts{ @@ -154,16 +144,6 @@ var ( StabilityLevel: compbasemetrics.ALPHA, }, ) - // RegisteredWatchers is a number of currently registered watchers splitted by resource. - RegisteredWatchers = compbasemetrics.NewGaugeVec( - &compbasemetrics.GaugeOpts{ - Name: "apiserver_registered_watchers", - Help: "Number of currently registered watchers for a given resources", - StabilityLevel: compbasemetrics.ALPHA, - DeprecatedVersion: "1.23.0", - }, - []string{"group", "version", "kind"}, - ) WatchEvents = compbasemetrics.NewCounterVec( &compbasemetrics.CounterOpts{ Name: "apiserver_watch_events_total", @@ -266,9 +246,7 @@ var ( requestSloLatencies, fieldValidationRequestLatencies, responseSizes, - droppedRequests, TLSHandshakeErrors, - RegisteredWatchers, WatchEvents, WatchEventsSizes, currentInflightRequests, @@ -427,12 +405,6 @@ func RecordDroppedRequest(req *http.Request, requestInfo *request.RequestInfo, c } else { requestCounter.WithContext(req.Context()).WithLabelValues(reportedVerb, dryRun, "", "", "", requestInfo.Subresource, scope, component, codeToString(http.StatusTooManyRequests)).Inc() } - - if isMutatingRequest { - droppedRequests.WithContext(req.Context()).WithLabelValues(MutatingKind).Inc() - } else { - droppedRequests.WithContext(req.Context()).WithLabelValues(ReadOnlyKind).Inc() - } } // RecordRequestTermination records that the request was terminated early as part of a resource diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/metrics/metrics_test.go b/staging/src/k8s.io/apiserver/pkg/endpoints/metrics/metrics_test.go index dc94bf74dba..c7f36086d05 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/metrics/metrics_test.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/metrics/metrics_test.go @@ -283,7 +283,6 @@ func TestResponseWriterDecorator(t *testing.T) { func TestRecordDroppedRequests(t *testing.T) { testedMetrics := []string{ "apiserver_request_total", - "apiserver_dropped_requests_total", } testCases := []struct { @@ -310,9 +309,6 @@ func TestRecordDroppedRequests(t *testing.T) { }, isMutating: false, want: ` - # 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. # TYPE apiserver_request_total counter apiserver_request_total{code="429",component="apiserver",dry_run="",group="",resource="pods",scope="cluster",subresource="",verb="LIST",version="v1"} 1 @@ -335,9 +331,6 @@ func TestRecordDroppedRequests(t *testing.T) { }, isMutating: true, want: ` - # 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. # TYPE apiserver_request_total counter apiserver_request_total{code="429",component="apiserver",dry_run="",group="",resource="pods",scope="resource",subresource="",verb="POST",version="v1"} 1 @@ -363,9 +356,6 @@ func TestRecordDroppedRequests(t *testing.T) { }, isMutating: true, want: ` - # 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. # TYPE apiserver_request_total counter apiserver_request_total{code="429",component="apiserver",dry_run="All",group="batch",resource="jobs",scope="resource",subresource="status",verb="PATCH",version="v1"} 1 @@ -378,12 +368,10 @@ func TestRecordDroppedRequests(t *testing.T) { // This also implies that we can't run this test in parallel with other tests. Register() requestCounter.Reset() - droppedRequests.Reset() for _, test := range testCases { t.Run(test.desc, func(t *testing.T) { defer requestCounter.Reset() - defer droppedRequests.Reset() RecordDroppedRequest(test.request, test.requestInfo, APIServerComponent, test.isMutating) diff --git a/staging/src/k8s.io/apiserver/pkg/server/filters/priority-and-fairness_test.go b/staging/src/k8s.io/apiserver/pkg/server/filters/priority-and-fairness_test.go index 42673aae5af..50b282f844c 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/filters/priority-and-fairness_test.go +++ b/staging/src/k8s.io/apiserver/pkg/server/filters/priority-and-fairness_test.go @@ -217,7 +217,7 @@ func TestApfRejectRequest(t *testing.T) { checkForExpectedMetrics(t, []string{ "apiserver_request_terminations_total", - "apiserver_dropped_requests_total", + "apiserver_request_total", }) } @@ -367,7 +367,7 @@ func TestApfCancelWaitRequest(t *testing.T) { checkForExpectedMetrics(t, []string{ "apiserver_current_inflight_requests", "apiserver_request_terminations_total", - "apiserver_dropped_requests_total", + "apiserver_request_total", }) } diff --git a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/metrics/metrics.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/metrics/metrics.go index dc9917cef91..1fb3ec37323 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/metrics/metrics.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/metrics/metrics.go @@ -43,15 +43,6 @@ var ( }, []string{"operation", "type"}, ) - etcdObjectCounts = compbasemetrics.NewGaugeVec( - &compbasemetrics.GaugeOpts{ - Name: "etcd_object_counts", - DeprecatedVersion: "1.22.0", - Help: "Number of stored objects at the time of last check split by kind. This metric is replaced by apiserver_storage_object_counts.", - StabilityLevel: compbasemetrics.ALPHA, - }, - []string{"resource"}, - ) objectCounts = compbasemetrics.NewGaugeVec( &compbasemetrics.GaugeOpts{ Name: "apiserver_storage_objects", @@ -127,7 +118,6 @@ func Register() { registerMetrics.Do(func() { legacyregistry.MustRegister(etcdRequestLatency) legacyregistry.MustRegister(objectCounts) - legacyregistry.MustRegister(etcdObjectCounts) legacyregistry.MustRegister(dbTotalSize) legacyregistry.MustRegister(etcdBookmarkCounts) legacyregistry.MustRegister(etcdLeaseObjectCounts) @@ -138,10 +128,9 @@ func Register() { }) } -// UpdateObjectCount sets the apiserver_storage_object_counts and etcd_object_counts (deprecated) metric. +// UpdateObjectCount sets the apiserver_storage_object_counts metric. func UpdateObjectCount(resourcePrefix string, count int64) { objectCounts.WithLabelValues(resourcePrefix).Set(float64(count)) - etcdObjectCounts.WithLabelValues(resourcePrefix).Set(float64(count)) } // RecordEtcdRequestLatency sets the etcd_request_duration_seconds metrics.