From c525d329effc6c6460cda947d1bf8092a927c2d3 Mon Sep 17 00:00:00 2001 From: danielqsj Date: Fri, 22 Feb 2019 22:19:57 +0800 Subject: [PATCH] convert latencies in mertics name to duration --- .../pkg/admission/metrics/metrics.go | 4 ++-- .../pkg/admission/metrics/metrics_test.go | 22 +++++++++---------- .../apiserver/pkg/storage/value/metrics.go | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/admission/metrics/metrics.go b/staging/src/k8s.io/apiserver/pkg/admission/metrics/metrics.go index e5f0a6e3ab..e445e2abdb 100644 --- a/staging/src/k8s.io/apiserver/pkg/admission/metrics/metrics.go +++ b/staging/src/k8s.io/apiserver/pkg/admission/metrics/metrics.go @@ -166,7 +166,7 @@ func newMetricSet(name string, labels []string, helpTemplate string, hasSummary prometheus.SummaryOpts{ Namespace: namespace, Subsystem: subsystem, - Name: fmt.Sprintf("%s_admission_latencies_seconds_summary", name), + Name: fmt.Sprintf("%s_admission_duration_seconds_summary", name), Help: fmt.Sprintf(helpTemplate, "latency summary in seconds"), MaxAge: latencySummaryMaxAge, }, @@ -189,7 +189,7 @@ func newMetricSet(name string, labels []string, helpTemplate string, hasSummary prometheus.HistogramOpts{ Namespace: namespace, Subsystem: subsystem, - Name: fmt.Sprintf("%s_admission_latencies_seconds", name), + Name: fmt.Sprintf("%s_admission_duration_seconds", name), Help: fmt.Sprintf(helpTemplate, "latency histogram in seconds"), Buckets: latencyBuckets, }, diff --git a/staging/src/k8s.io/apiserver/pkg/admission/metrics/metrics_test.go b/staging/src/k8s.io/apiserver/pkg/admission/metrics/metrics_test.go index 94527ef3c0..c0ce0bc1ef 100644 --- a/staging/src/k8s.io/apiserver/pkg/admission/metrics/metrics_test.go +++ b/staging/src/k8s.io/apiserver/pkg/admission/metrics/metrics_test.go @@ -41,12 +41,12 @@ func TestObserveAdmissionStep(t *testing.T) { "type": "admit", "rejected": "false", } - expectHistogramCountTotal(t, "apiserver_admission_step_admission_latencies_seconds", wantLabels, 1) - expectFindMetric(t, "apiserver_admission_step_admission_latencies_seconds_summary", wantLabels) + expectHistogramCountTotal(t, "apiserver_admission_step_admission_duration_seconds", wantLabels, 1) + expectFindMetric(t, "apiserver_admission_step_admission_duration_seconds_summary", wantLabels) wantLabels["type"] = "validate" - expectHistogramCountTotal(t, "apiserver_admission_step_admission_latencies_seconds", wantLabels, 1) - expectFindMetric(t, "apiserver_admission_step_admission_latencies_seconds_summary", wantLabels) + expectHistogramCountTotal(t, "apiserver_admission_step_admission_duration_seconds", wantLabels, 1) + expectFindMetric(t, "apiserver_admission_step_admission_duration_seconds_summary", wantLabels) } func TestObserveAdmissionController(t *testing.T) { @@ -60,10 +60,10 @@ func TestObserveAdmissionController(t *testing.T) { "type": "admit", "rejected": "false", } - expectHistogramCountTotal(t, "apiserver_admission_controller_admission_latencies_seconds", wantLabels, 1) + expectHistogramCountTotal(t, "apiserver_admission_controller_admission_duration_seconds", wantLabels, 1) wantLabels["type"] = "validate" - expectHistogramCountTotal(t, "apiserver_admission_controller_admission_latencies_seconds", wantLabels, 1) + expectHistogramCountTotal(t, "apiserver_admission_controller_admission_duration_seconds", wantLabels, 1) } func TestObserveWebhook(t *testing.T) { @@ -75,7 +75,7 @@ func TestObserveWebhook(t *testing.T) { "type": "admit", "rejected": "false", } - expectHistogramCountTotal(t, "apiserver_admission_webhook_admission_latencies_seconds", wantLabels, 1) + expectHistogramCountTotal(t, "apiserver_admission_webhook_admission_duration_seconds", wantLabels, 1) } func TestWithMetrics(t *testing.T) { @@ -158,9 +158,9 @@ func TestWithMetrics(t *testing.T) { filter["rejected"] = "true" } if _, mutating := test.handler.(admission.MutationInterface); mutating { - expectHistogramCountTotal(t, "apiserver_admission_controller_admission_latencies_seconds", filter, 1) + expectHistogramCountTotal(t, "apiserver_admission_controller_admission_duration_seconds", filter, 1) } else { - expectHistogramCountTotal(t, "apiserver_admission_controller_admission_latencies_seconds", filter, 0) + expectHistogramCountTotal(t, "apiserver_admission_controller_admission_duration_seconds", filter, 0) } if err != nil { @@ -183,9 +183,9 @@ func TestWithMetrics(t *testing.T) { filter["rejected"] = "true" } if _, validating := test.handler.(admission.ValidationInterface); validating { - expectHistogramCountTotal(t, "apiserver_admission_controller_admission_latencies_seconds", filter, 1) + expectHistogramCountTotal(t, "apiserver_admission_controller_admission_duration_seconds", filter, 1) } else { - expectHistogramCountTotal(t, "apiserver_admission_controller_admission_latencies_seconds", filter, 0) + expectHistogramCountTotal(t, "apiserver_admission_controller_admission_duration_seconds", filter, 0) } } } diff --git a/staging/src/k8s.io/apiserver/pkg/storage/value/metrics.go b/staging/src/k8s.io/apiserver/pkg/storage/value/metrics.go index 17961ad075..c9dc66a8f3 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/value/metrics.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/value/metrics.go @@ -33,7 +33,7 @@ var ( prometheus.HistogramOpts{ Namespace: namespace, Subsystem: subsystem, - Name: "transformation_latencies_seconds", + Name: "transformation_duration_seconds", Help: "Latencies in seconds of value transformation operations.", // In-process transformations (ex. AES CBC) complete on the order of 20 microseconds. However, when // external KMS is involved latencies may climb into milliseconds. @@ -76,7 +76,7 @@ var ( prometheus.HistogramOpts{ Namespace: namespace, Subsystem: subsystem, - Name: "data_key_generation_latencies_seconds", + Name: "data_key_generation_duration_seconds", Help: "Latencies in seconds of data encryption key(DEK) generation operations.", Buckets: prometheus.ExponentialBuckets(5e-6, 2, 14), },