From b8395a50eeece05fef805ff7d8b444eaeda8b797 Mon Sep 17 00:00:00 2001 From: RainbowMango Date: Sat, 28 Sep 2019 21:27:56 +0800 Subject: [PATCH 1/2] Remove direct reference to Prometheus from openstack --- .../legacy-cloud-providers/openstack/openstack_volumes.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/staging/src/k8s.io/legacy-cloud-providers/openstack/openstack_volumes.go b/staging/src/k8s.io/legacy-cloud-providers/openstack/openstack_volumes.go index 6bc266d7bca..95e38854912 100644 --- a/staging/src/k8s.io/legacy-cloud-providers/openstack/openstack_volumes.go +++ b/staging/src/k8s.io/legacy-cloud-providers/openstack/openstack_volumes.go @@ -35,6 +35,7 @@ import ( cloudvolume "k8s.io/cloud-provider/volume" volerr "k8s.io/cloud-provider/volume/errors" volumehelpers "k8s.io/cloud-provider/volume/helpers" + "k8s.io/component-base/metrics" "github.com/gophercloud/gophercloud" volumeexpand "github.com/gophercloud/gophercloud/openstack/blockstorage/extensions/volumeactions" @@ -42,8 +43,6 @@ import ( volumes_v2 "github.com/gophercloud/gophercloud/openstack/blockstorage/v2/volumes" volumes_v3 "github.com/gophercloud/gophercloud/openstack/blockstorage/v3/volumes" "github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/volumeattach" - "github.com/prometheus/client_golang/prometheus" - "k8s.io/klog" ) @@ -745,8 +744,8 @@ func (os *OpenStack) GetLabelsForVolume(ctx context.Context, pv *v1.PersistentVo // recordOpenstackOperationMetric records openstack operation metrics func recordOpenstackOperationMetric(operation string, timeTaken float64, err error) { if err != nil { - openstackAPIRequestErrors.With(prometheus.Labels{"request": operation}).Inc() + openstackAPIRequestErrors.With(metrics.Labels{"request": operation}).Inc() } else { - openstackOperationsLatency.With(prometheus.Labels{"request": operation}).Observe(timeTaken) + openstackOperationsLatency.With(metrics.Labels{"request": operation}).Observe(timeTaken) } } From 1c2ccc4197267c738cf4fb1d8ad66f7b0264cafe Mon Sep 17 00:00:00 2001 From: RainbowMango Date: Sat, 28 Sep 2019 21:29:56 +0800 Subject: [PATCH 2/2] Update bazel by hack/update-bazel.sh --- staging/src/k8s.io/legacy-cloud-providers/openstack/BUILD | 1 - 1 file changed, 1 deletion(-) diff --git a/staging/src/k8s.io/legacy-cloud-providers/openstack/BUILD b/staging/src/k8s.io/legacy-cloud-providers/openstack/BUILD index ce61e815cc0..370a5006dca 100644 --- a/staging/src/k8s.io/legacy-cloud-providers/openstack/BUILD +++ b/staging/src/k8s.io/legacy-cloud-providers/openstack/BUILD @@ -65,7 +65,6 @@ go_library( "//vendor/github.com/gophercloud/gophercloud/openstack/networking/v2/ports:go_default_library", "//vendor/github.com/gophercloud/gophercloud/pagination:go_default_library", "//vendor/github.com/mitchellh/mapstructure:go_default_library", - "//vendor/github.com/prometheus/client_golang/prometheus:go_default_library", "//vendor/gopkg.in/gcfg.v1:go_default_library", "//vendor/k8s.io/klog:go_default_library", "//vendor/k8s.io/utils/exec:go_default_library",