From 77b3241df80cea3c144def97d0152c8970a32b5a Mon Sep 17 00:00:00 2001 From: RainbowMango Date: Fri, 27 Sep 2019 11:11:26 +0800 Subject: [PATCH 1/2] Remove direct reference to Prometheus.Label for vsphere --- .../vsphere/vclib/vsphere_metrics.go | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/vsphere_metrics.go b/staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/vsphere_metrics.go index 5baafc4ff0e..4b25a811078 100644 --- a/staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/vsphere_metrics.go +++ b/staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/vsphere_metrics.go @@ -19,8 +19,6 @@ package vclib import ( "time" - "github.com/prometheus/client_golang/prometheus" - "k8s.io/component-base/metrics" "k8s.io/component-base/metrics/legacyregistry" ) @@ -103,17 +101,17 @@ func RecordvSphereMetric(actionName string, requestTime time.Time, err error) { func recordvSphereAPIMetric(actionName string, requestTime time.Time, err error) { if err != nil { - vsphereAPIErrorMetric.With(prometheus.Labels{"request": actionName}).Inc() + vsphereAPIErrorMetric.With(metrics.Labels{"request": actionName}).Inc() } else { - vsphereAPIMetric.With(prometheus.Labels{"request": actionName}).Observe(calculateTimeTaken(requestTime)) + vsphereAPIMetric.With(metrics.Labels{"request": actionName}).Observe(calculateTimeTaken(requestTime)) } } func recordvSphereOperationMetric(actionName string, requestTime time.Time, err error) { if err != nil { - vsphereOperationErrorMetric.With(prometheus.Labels{"operation": actionName}).Inc() + vsphereOperationErrorMetric.With(metrics.Labels{"operation": actionName}).Inc() } else { - vsphereOperationMetric.With(prometheus.Labels{"operation": actionName}).Observe(calculateTimeTaken(requestTime)) + vsphereOperationMetric.With(metrics.Labels{"operation": actionName}).Observe(calculateTimeTaken(requestTime)) } } From b915774a23ef0ac413d317c8ab5f34e68504ce31 Mon Sep 17 00:00:00 2001 From: RainbowMango Date: Fri, 27 Sep 2019 11:13:41 +0800 Subject: [PATCH 2/2] Update bazel by hack/update-bazel.sh --- staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/BUILD | 1 - 1 file changed, 1 deletion(-) diff --git a/staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/BUILD b/staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/BUILD index 794192566d5..b1297ec4df0 100644 --- a/staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/BUILD +++ b/staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/BUILD @@ -29,7 +29,6 @@ go_library( "//staging/src/k8s.io/client-go/pkg/version: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/github.com/vmware/govmomi/find:go_default_library", "//vendor/github.com/vmware/govmomi/object:go_default_library", "//vendor/github.com/vmware/govmomi/pbm:go_default_library",