From 7e3498cc8b26d185651b7ff07f3d2b65aa7feb8d Mon Sep 17 00:00:00 2001 From: RainbowMango Date: Mon, 16 Sep 2019 14:51:32 +0800 Subject: [PATCH 1/2] Migrate prometheus bucket functionality to metrics stability framework. --- .../component-base/metrics/prometheus/restclient/metrics.go | 6 ++---- .../component-base/metrics/prometheus/workqueue/metrics.go | 6 ++---- 2 files changed, 4 insertions(+), 8 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 805ef722ef7..a511b112dab 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 @@ -20,8 +20,6 @@ import ( "net/url" "time" - "github.com/prometheus/client_golang/prometheus" - "k8s.io/client-go/tools/metrics" k8smetrics "k8s.io/component-base/metrics" "k8s.io/component-base/metrics/legacyregistry" @@ -34,7 +32,7 @@ var ( &k8smetrics.HistogramOpts{ Name: "rest_client_request_duration_seconds", Help: "Request latency in seconds. Broken down by verb and URL.", - Buckets: prometheus.ExponentialBuckets(0.001, 2, 10), + Buckets: k8smetrics.ExponentialBuckets(0.001, 2, 10), }, []string{"verb", "url"}, ) @@ -44,7 +42,7 @@ var ( &k8smetrics.HistogramOpts{ Name: "rest_client_request_latency_seconds", Help: "(Deprecated) Request latency in seconds. Broken down by verb and URL.", - Buckets: prometheus.ExponentialBuckets(0.001, 2, 10), + Buckets: k8smetrics.ExponentialBuckets(0.001, 2, 10), }, []string{"verb", "url"}, ) diff --git a/staging/src/k8s.io/component-base/metrics/prometheus/workqueue/metrics.go b/staging/src/k8s.io/component-base/metrics/prometheus/workqueue/metrics.go index bd9e6d11f05..a0192acb07e 100644 --- a/staging/src/k8s.io/component-base/metrics/prometheus/workqueue/metrics.go +++ b/staging/src/k8s.io/component-base/metrics/prometheus/workqueue/metrics.go @@ -17,8 +17,6 @@ limitations under the License. package workqueue import ( - "github.com/prometheus/client_golang/prometheus" - "k8s.io/client-go/util/workqueue" k8smetrics "k8s.io/component-base/metrics" "k8s.io/component-base/metrics/legacyregistry" @@ -56,14 +54,14 @@ var ( Subsystem: WorkQueueSubsystem, Name: QueueLatencyKey, Help: "How long in seconds an item stays in workqueue before being requested.", - Buckets: prometheus.ExponentialBuckets(10e-9, 10, 10), + Buckets: k8smetrics.ExponentialBuckets(10e-9, 10, 10), }, []string{"name"}) workDuration = k8smetrics.NewHistogramVec(&k8smetrics.HistogramOpts{ Subsystem: WorkQueueSubsystem, Name: WorkDurationKey, Help: "How long in seconds processing an item from workqueue takes.", - Buckets: prometheus.ExponentialBuckets(10e-9, 10, 10), + Buckets: k8smetrics.ExponentialBuckets(10e-9, 10, 10), }, []string{"name"}) unfinished = k8smetrics.NewGaugeVec(&k8smetrics.GaugeOpts{ From 65a57d863462d107bfc9472418a58046c3cd5550 Mon Sep 17 00:00:00 2001 From: RainbowMango Date: Mon, 16 Sep 2019 16:49:29 +0800 Subject: [PATCH 2/2] Update bazel by hack/update-bazel.sh --- .../k8s.io/component-base/metrics/prometheus/restclient/BUILD | 1 - .../src/k8s.io/component-base/metrics/prometheus/workqueue/BUILD | 1 - 2 files changed, 2 deletions(-) diff --git a/staging/src/k8s.io/component-base/metrics/prometheus/restclient/BUILD b/staging/src/k8s.io/component-base/metrics/prometheus/restclient/BUILD index 85098adcaa6..4b43a0b0e1d 100644 --- a/staging/src/k8s.io/component-base/metrics/prometheus/restclient/BUILD +++ b/staging/src/k8s.io/component-base/metrics/prometheus/restclient/BUILD @@ -14,7 +14,6 @@ go_library( "//staging/src/k8s.io/client-go/tools/metrics:go_default_library", "//staging/src/k8s.io/component-base/metrics:go_default_library", "//staging/src/k8s.io/component-base/metrics/legacyregistry:go_default_library", - "//vendor/github.com/prometheus/client_golang/prometheus:go_default_library", ], ) diff --git a/staging/src/k8s.io/component-base/metrics/prometheus/workqueue/BUILD b/staging/src/k8s.io/component-base/metrics/prometheus/workqueue/BUILD index 9b32cc0661e..3b46b1f8c57 100644 --- a/staging/src/k8s.io/component-base/metrics/prometheus/workqueue/BUILD +++ b/staging/src/k8s.io/component-base/metrics/prometheus/workqueue/BUILD @@ -10,7 +10,6 @@ go_library( "//staging/src/k8s.io/client-go/util/workqueue:go_default_library", "//staging/src/k8s.io/component-base/metrics:go_default_library", "//staging/src/k8s.io/component-base/metrics/legacyregistry:go_default_library", - "//vendor/github.com/prometheus/client_golang/prometheus:go_default_library", ], )