From 4ba8a9fee10905000f0db3f828b4903d1c096eb6 Mon Sep 17 00:00:00 2001 From: RainbowMango Date: Mon, 16 Sep 2019 11:05:38 +0800 Subject: [PATCH 1/2] Migrate prometheus bucket functionality to metrics stability framework. --- pkg/proxy/winkernel/metrics.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkg/proxy/winkernel/metrics.go b/pkg/proxy/winkernel/metrics.go index 8f34daeffdd..ec21460063e 100644 --- a/pkg/proxy/winkernel/metrics.go +++ b/pkg/proxy/winkernel/metrics.go @@ -20,8 +20,6 @@ import ( "sync" "time" - "github.com/prometheus/client_golang/prometheus" - "k8s.io/component-base/metrics" "k8s.io/component-base/metrics/legacyregistry" ) @@ -34,7 +32,7 @@ var ( Subsystem: kubeProxySubsystem, Name: "sync_proxy_rules_duration_seconds", Help: "SyncProxyRules latency in seconds", - Buckets: prometheus.ExponentialBuckets(0.001, 2, 15), + Buckets: metrics.ExponentialBuckets(0.001, 2, 15), StabilityLevel: metrics.ALPHA, }, ) @@ -44,7 +42,7 @@ var ( Subsystem: kubeProxySubsystem, Name: "sync_proxy_rules_latency_microseconds", Help: "(Deprecated) SyncProxyRules latency in microseconds", - Buckets: prometheus.ExponentialBuckets(1000, 2, 15), + Buckets: metrics.ExponentialBuckets(1000, 2, 15), StabilityLevel: metrics.ALPHA, }, ) From d36c27a1068e172c7d87d7b9a0a6c25f2e313bdd Mon Sep 17 00:00:00 2001 From: RainbowMango Date: Mon, 16 Sep 2019 11:07:05 +0800 Subject: [PATCH 2/2] Update bazel by hack/update-bazel.sh --- pkg/proxy/winkernel/BUILD | 1 - 1 file changed, 1 deletion(-) diff --git a/pkg/proxy/winkernel/BUILD b/pkg/proxy/winkernel/BUILD index 7ea992e6fef..127d854b88c 100644 --- a/pkg/proxy/winkernel/BUILD +++ b/pkg/proxy/winkernel/BUILD @@ -13,7 +13,6 @@ go_library( deps = [ "//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", ] + select({ "@io_bazel_rules_go//go/platform:windows": [ "//pkg/api/v1/service:go_default_library",