kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #109018 from wojtek-t/deprecate_dropped_requests 

Deprecate apiserver_dropped_requests_total metric

Kubernetes-commit: 24cb73bb9027b089e05d27cc29be0987ab8153ae
This commit is contained in:
Kubernetes Publisher 2022-03-28 13:01:33 -07:00
parent 0bdbab6e34 23c7d60c29
commit d0f7a9b250
4 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
go.mod
View File

@ -45,7 +45,7 @@ require (
gopkg.in/natefinch/lumberjack.v2 v2.0.0
gopkg.in/square/go-jose.v2 v2.2.2
k8s.io/api v0.0.0-20220328211228-e43e442d69ae
k8s.io/apimachinery v0.0.0-20220327010740-1992dccd17de
k8s.io/apimachinery v0.0.0-20220328200121-3b8fb46ed6f1
k8s.io/client-go v0.0.0-20220327011239-402aa66c5cad
k8s.io/component-base v0.0.0-20220328131428-cf687172c5c1
k8s.io/klog/v2 v2.60.1
@ -59,7 +59,7 @@ require (
replace (
k8s.io/api => k8s.io/api v0.0.0-20220328211228-e43e442d69ae
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220327010740-1992dccd17de
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220328200121-3b8fb46ed6f1
k8s.io/client-go => k8s.io/client-go v0.0.0-20220327011239-402aa66c5cad
k8s.io/component-base => k8s.io/component-base v0.0.0-20220328131428-cf687172c5c1
)

4
go.sum
View File

@ -956,8 +956,8 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20220328211228-e43e442d69ae h1:+fTlmPHEkWNRmZXwTXjYOO3s8vE7jDc95lnVBo04VOg=
k8s.io/api v0.0.0-20220328211228-e43e442d69ae/go.mod h1:B54F1cQefRZjrzjwT8tJgapXYrUho8Lr/KcTpdLWhyU=
k8s.io/apimachinery v0.0.0-20220327010740-1992dccd17de h1:YQ7cVEFpw9qaBjGa5/JYzHq/Xi/mKBAeUmEt6NwljMc=
k8s.io/apimachinery v0.0.0-20220327010740-1992dccd17de/go.mod h1:WkN7hnr/sIpKTK8v3BZKqLkdqTMz00TBdMWqE0M0O7Q=
k8s.io/apimachinery v0.0.0-20220328200121-3b8fb46ed6f1 h1:VaUIEA4wzN15Ak47QL3NBB4pdwQKe5tCztCLTK+8Fnw=
k8s.io/apimachinery v0.0.0-20220328200121-3b8fb46ed6f1/go.mod h1:WkN7hnr/sIpKTK8v3BZKqLkdqTMz00TBdMWqE0M0O7Q=
k8s.io/client-go v0.0.0-20220327011239-402aa66c5cad h1:v2udgOBdg/+3kM7nGJtQfjvnlsjgA0wdR9sJjiX7UfQ=
k8s.io/client-go v0.0.0-20220327011239-402aa66c5cad/go.mod h1:HCq7QlEN/lEZ7hg4X9ldPo4rbktT3jtB83/5IJmurlw=
k8s.io/component-base v0.0.0-20220328131428-cf687172c5c1 h1:u12RSj/wUOlBMijVItJMa5oFTamtWwcJGpl0m64M3Vc=

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