From 5e652fe12605027509870d5d7f821390f20b1cee Mon Sep 17 00:00:00 2001 From: Han Kang Date: Tue, 8 Oct 2019 15:49:12 -0700 Subject: [PATCH] pluralize error metric name Change-Id: I12eb94f41ded20ed5a16332ada13a7b34f75de18 --- .../apiserver/pkg/endpoints/metrics/metrics.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 e092e3e55f3..192d991bd33 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/metrics/metrics.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/metrics/metrics.go @@ -189,10 +189,10 @@ var ( []string{"requestKind"}, ) - requestErrorTotal = compbasemetrics.NewCounterVec( + requestErrorsTotal = compbasemetrics.NewCounterVec( &compbasemetrics.CounterOpts{ - Name: "apiserver_request_error_total", - Help: "Number of requests which have resulted in an apiserver response error", + Name: "apiserver_request_errors_total", + Help: "Number of requests which have resulted in an apiserver response error.", StabilityLevel: compbasemetrics.ALPHA, }, []string{"verb", "group", "version", "resource", "subresource", "scope", "component", "code"}, @@ -213,7 +213,7 @@ var ( WatchEvents, WatchEventsSizes, currentInflightRequests, - requestErrorTotal, + requestErrorsTotal, } ) @@ -261,9 +261,9 @@ func RecordRequestError(req *http.Request, requestInfo *request.RequestInfo, com // However, we need to tweak it e.g. to differentiate GET from LIST. verb := canonicalVerb(strings.ToUpper(req.Method), scope) if requestInfo.IsResourceRequest { - requestErrorTotal.WithLabelValues(cleanVerb(verb, req), requestInfo.APIGroup, requestInfo.APIVersion, requestInfo.Resource, requestInfo.Subresource, scope, component, codeToString(code)).Inc() + requestErrorsTotal.WithLabelValues(cleanVerb(verb, req), requestInfo.APIGroup, requestInfo.APIVersion, requestInfo.Resource, requestInfo.Subresource, scope, component, codeToString(code)).Inc() } else { - requestErrorTotal.WithLabelValues(cleanVerb(verb, req), "", "", "", requestInfo.Path, scope, component, codeToString(code)).Inc() + requestErrorsTotal.WithLabelValues(cleanVerb(verb, req), "", "", "", requestInfo.Path, scope, component, codeToString(code)).Inc() } }