github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 06:54:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #109018 from wojtek-t/deprecate_dropped_requests

Browse Source 
Deprecate apiserver_dropped_requests_total metric
This commit is contained in:
Kubernetes Prow Robot 2022-03-28 13:01:33 -07:00 committed by GitHub
commit 24cb73bb90
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
staging/src/k8s.io/apiserver/pkg/endpoints/metrics/metrics.go
View File

@ -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"},
)

6
staging/src/k8s.io/apiserver/pkg/endpoints/metrics/metrics_test.go
View File

@ -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.