From 1f9ab1b85c5560a155b1702d1b5d28aa2d95a1b7 Mon Sep 17 00:00:00 2001 From: RainbowMango Date: Thu, 12 Sep 2019 17:10:44 +0800 Subject: [PATCH 1/2] Migrate prometheus bucket functionality to metrics stability framework. --- .../pkg/apiserver/conversion/metrics.go | 4 +--- .../k8s.io/apiserver/pkg/endpoints/metrics/metrics.go | 7 +++---- .../src/k8s.io/apiserver/pkg/storage/value/metrics.go | 9 ++++----- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/conversion/metrics.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/conversion/metrics.go index dcd96232a5c..39ba4e08ef0 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/conversion/metrics.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/conversion/metrics.go @@ -22,8 +22,6 @@ import ( "sync" "time" - "github.com/prometheus/client_golang/prometheus" - "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/component-base/metrics" @@ -31,7 +29,7 @@ import ( ) var ( - latencyBuckets = prometheus.ExponentialBuckets(0.001, 2, 15) + latencyBuckets = metrics.ExponentialBuckets(0.001, 2, 15) ) // converterMetricFactory holds metrics for all CRD converters 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 30ce24a4bd8..31d1c8a07e1 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/metrics/metrics.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/metrics/metrics.go @@ -28,7 +28,6 @@ import ( "time" restful "github.com/emicklei/go-restful" - "github.com/prometheus/client_golang/prometheus" "k8s.io/apimachinery/pkg/apis/meta/v1/validation" "k8s.io/apimachinery/pkg/types" @@ -109,7 +108,7 @@ var ( Name: "apiserver_request_latencies", Help: "(Deprecated) Response latency distribution in microseconds for each verb, group, version, resource, subresource, scope and component.", // Use buckets ranging from 125 ms to 8 seconds. - Buckets: prometheus.ExponentialBuckets(125000, 2.0, 7), + Buckets: compbasemetrics.ExponentialBuckets(125000, 2.0, 7), StabilityLevel: compbasemetrics.ALPHA, }, []string{"verb", "group", "version", "resource", "subresource", "scope", "component"}, @@ -130,7 +129,7 @@ var ( Name: "apiserver_response_sizes", Help: "Response size distribution in bytes for each group, version, verb, resource, subresource, scope and component.", // Use buckets ranging from 1000 bytes (1KB) to 10^9 bytes (1GB). - Buckets: prometheus.ExponentialBuckets(1000, 10.0, 7), + Buckets: compbasemetrics.ExponentialBuckets(1000, 10.0, 7), StabilityLevel: compbasemetrics.ALPHA, }, []string{"verb", "group", "version", "resource", "subresource", "scope", "component"}, @@ -173,7 +172,7 @@ var ( &compbasemetrics.HistogramOpts{ Name: "apiserver_watch_events_sizes", Help: "Watch event size distribution in bytes", - Buckets: prometheus.ExponentialBuckets(1024, 2.0, 8), // 1K, 2K, 4K, 8K, ..., 128K. + Buckets: compbasemetrics.ExponentialBuckets(1024, 2.0, 8), // 1K, 2K, 4K, 8K, ..., 128K. StabilityLevel: compbasemetrics.ALPHA, }, []string{"group", "version", "kind"}, 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 f35994688bc..80d706c8e1a 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/value/metrics.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/value/metrics.go @@ -20,7 +20,6 @@ import ( "sync" "time" - "github.com/prometheus/client_golang/prometheus" "google.golang.org/grpc/status" "k8s.io/component-base/metrics" @@ -49,7 +48,7 @@ var ( 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. - Buckets: prometheus.ExponentialBuckets(5e-6, 2, 14), + Buckets: metrics.ExponentialBuckets(5e-6, 2, 14), StabilityLevel: metrics.ALPHA, }, []string{"transformation_type"}, @@ -62,7 +61,7 @@ var ( Help: "(Deprecated) Latencies in microseconds 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. - Buckets: prometheus.ExponentialBuckets(5, 2, 14), + Buckets: metrics.ExponentialBuckets(5, 2, 14), StabilityLevel: metrics.ALPHA, }, []string{"transformation_type"}, @@ -106,7 +105,7 @@ var ( Subsystem: subsystem, Name: "data_key_generation_duration_seconds", Help: "Latencies in seconds of data encryption key(DEK) generation operations.", - Buckets: prometheus.ExponentialBuckets(5e-6, 2, 14), + Buckets: metrics.ExponentialBuckets(5e-6, 2, 14), StabilityLevel: metrics.ALPHA, }, ) @@ -116,7 +115,7 @@ var ( Subsystem: subsystem, Name: "data_key_generation_latencies_microseconds", Help: "(Deprecated) Latencies in microseconds of data encryption key(DEK) generation operations.", - Buckets: prometheus.ExponentialBuckets(5, 2, 14), + Buckets: metrics.ExponentialBuckets(5, 2, 14), StabilityLevel: metrics.ALPHA, }, ) From 764e6a66f35e2360f45cc1d2d27b13f3d711b994 Mon Sep 17 00:00:00 2001 From: RainbowMango Date: Tue, 24 Sep 2019 16:54:05 +0800 Subject: [PATCH 2/2] Update bazel by hack/update-bazel.sh Update vendor by hack/update-vendor.sh --- staging/src/k8s.io/apiextensions-apiserver/go.mod | 1 - .../apiextensions-apiserver/pkg/apiserver/conversion/BUILD | 1 - staging/src/k8s.io/apiserver/pkg/endpoints/metrics/BUILD | 1 - staging/src/k8s.io/apiserver/pkg/storage/value/BUILD | 1 - 4 files changed, 4 deletions(-) diff --git a/staging/src/k8s.io/apiextensions-apiserver/go.mod b/staging/src/k8s.io/apiextensions-apiserver/go.mod index 624eab6831b..e0f3413147e 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/go.mod +++ b/staging/src/k8s.io/apiextensions-apiserver/go.mod @@ -16,7 +16,6 @@ require ( github.com/google/gofuzz v1.0.0 github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d github.com/pborman/uuid v1.2.0 - github.com/prometheus/client_golang v0.9.4 github.com/spf13/cobra v0.0.5 github.com/spf13/pflag v1.0.3 github.com/stretchr/testify v1.3.0 diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/conversion/BUILD b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/conversion/BUILD index 244f0064950..75569190fe0 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/conversion/BUILD +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/conversion/BUILD @@ -32,7 +32,6 @@ go_library( "//staging/src/k8s.io/client-go/rest: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", "//vendor/k8s.io/utils/trace:go_default_library", ], ) diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/metrics/BUILD b/staging/src/k8s.io/apiserver/pkg/endpoints/metrics/BUILD index 95e8093e922..8d13a34eadc 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/metrics/BUILD +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/metrics/BUILD @@ -28,7 +28,6 @@ go_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/emicklei/go-restful:go_default_library", - "//vendor/github.com/prometheus/client_golang/prometheus:go_default_library", ], ) diff --git a/staging/src/k8s.io/apiserver/pkg/storage/value/BUILD b/staging/src/k8s.io/apiserver/pkg/storage/value/BUILD index 48e48840892..ed48a59fc7b 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/value/BUILD +++ b/staging/src/k8s.io/apiserver/pkg/storage/value/BUILD @@ -33,7 +33,6 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/util/errors: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", "//vendor/google.golang.org/grpc/status:go_default_library", ], )