From 437c9d9ab225a9a39a730bb71be9af289745fec2 Mon Sep 17 00:00:00 2001 From: Damien Grisonnet Date: Wed, 15 Feb 2023 20:08:13 +0100 Subject: [PATCH 1/2] Revert "restclient: rename "method" label to "verb"" This reverts commit c9944709bce8ee8254c34ef48959e81f50140dea. --- .../component-base/metrics/prometheus/restclient/metrics.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/staging/src/k8s.io/component-base/metrics/prometheus/restclient/metrics.go b/staging/src/k8s.io/component-base/metrics/prometheus/restclient/metrics.go index ccc3cb8f039..aa7cabea2b3 100644 --- a/staging/src/k8s.io/component-base/metrics/prometheus/restclient/metrics.go +++ b/staging/src/k8s.io/component-base/metrics/prometheus/restclient/metrics.go @@ -77,9 +77,9 @@ var ( &k8smetrics.CounterOpts{ Name: "rest_client_requests_total", StabilityLevel: k8smetrics.ALPHA, - Help: "Number of HTTP requests, partitioned by status code, verb, and host.", + Help: "Number of HTTP requests, partitioned by status code, method, and host.", }, - []string{"code", "verb", "host"}, + []string{"code", "method", "host"}, ) requestRetry = k8smetrics.NewCounterVec( From 51ae7265ae62cc2559028d5c177493d7c6ac94c2 Mon Sep 17 00:00:00 2001 From: Damien Grisonnet Date: Wed, 15 Feb 2023 20:30:35 +0100 Subject: [PATCH 2/2] restclient: revert metrics test to use old label Signed-off-by: Damien Grisonnet --- .../metrics/prometheus/restclient/metrics_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/staging/src/k8s.io/component-base/metrics/prometheus/restclient/metrics_test.go b/staging/src/k8s.io/component-base/metrics/prometheus/restclient/metrics_test.go index 6a2bb923d24..577476f36ad 100644 --- a/staging/src/k8s.io/component-base/metrics/prometheus/restclient/metrics_test.go +++ b/staging/src/k8s.io/component-base/metrics/prometheus/restclient/metrics_test.go @@ -42,9 +42,9 @@ func TestClientGOMetrics(t *testing.T) { metrics.RequestResult.Increment(context.TODO(), "200", "POST", "www.foo.com") }, want: ` - # HELP rest_client_requests_total [ALPHA] Number of HTTP requests, partitioned by status code, verb, and host. + # HELP rest_client_requests_total [ALPHA] Number of HTTP requests, partitioned by status code, method, and host. # TYPE rest_client_requests_total counter - rest_client_requests_total{code="200",host="www.foo.com",verb="POST"} 1 + rest_client_requests_total{code="200",host="www.foo.com",method="POST"} 1 `, }, {