From c88cb147776a54b06c21525cbf36cbc515af7426 Mon Sep 17 00:00:00 2001 From: jornshen Date: Sat, 23 Jan 2021 16:19:26 +0800 Subject: [PATCH] combine volumn latency and error metrics --- pkg/volume/util/metrics.go | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/pkg/volume/util/metrics.go b/pkg/volume/util/metrics.go index 67b3e9790a5..c25a8cb05d9 100644 --- a/pkg/volume/util/metrics.go +++ b/pkg/volume/util/metrics.go @@ -47,16 +47,7 @@ var storageOperationMetric = metrics.NewHistogramVec( Buckets: []float64{.1, .25, .5, 1, 2.5, 5, 10, 15, 25, 50, 120, 300, 600}, StabilityLevel: metrics.ALPHA, }, - []string{"volume_plugin", "operation_name"}, -) - -var storageOperationErrorMetric = metrics.NewCounterVec( - &metrics.CounterOpts{ - Name: "storage_operation_errors_total", - Help: "Storage operation errors", - StabilityLevel: metrics.ALPHA, - }, - []string{"volume_plugin", "operation_name"}, + []string{"volume_plugin", "operation_name", "status"}, ) var storageOperationStatusMetric = metrics.NewCounterVec( @@ -86,7 +77,6 @@ func registerMetrics() { // legacyregistry is the internal k8s wrapper around the prometheus // global registry, used specifically for metric stability enforcement legacyregistry.MustRegister(storageOperationMetric) - legacyregistry.MustRegister(storageOperationErrorMetric) legacyregistry.MustRegister(storageOperationStatusMetric) legacyregistry.MustRegister(storageOperationEndToEndLatencyMetric) } @@ -102,10 +92,8 @@ func OperationCompleteHook(plugin, operationName string) func(*error) { // TODO: Establish well-known error codes to be able to distinguish // user configuration errors from system errors. status = statusFailUnknown - storageOperationErrorMetric.WithLabelValues(plugin, operationName).Inc() - } else { - storageOperationMetric.WithLabelValues(plugin, operationName).Observe(timeTaken) } + storageOperationMetric.WithLabelValues(plugin, operationName, status).Observe(timeTaken) storageOperationStatusMetric.WithLabelValues(plugin, operationName, status).Inc() } return opComplete