From 78d0f1827acfb8400d6e1622d55bdfed64b047ed Mon Sep 17 00:00:00 2001 From: RainbowMango Date: Wed, 9 Oct 2019 21:58:51 +0800 Subject: [PATCH] Remove direct reference to prometheus from apiserver/pkg/storage/value. --- .../k8s.io/apiserver/pkg/storage/value/metrics_test.go | 6 +++--- .../apiserver/pkg/storage/value/transformer_test.go | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/storage/value/metrics_test.go b/staging/src/k8s.io/apiserver/pkg/storage/value/metrics_test.go index c4feb98fd6d..22109bb2a9e 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/value/metrics_test.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/value/metrics_test.go @@ -24,8 +24,8 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/prometheus/client_golang/prometheus" - "github.com/prometheus/client_golang/prometheus/testutil" + "k8s.io/component-base/metrics/legacyregistry" + "k8s.io/component-base/metrics/testutil" ) func TestTotals(t *testing.T) { @@ -122,7 +122,7 @@ apiserver_storage_transformation_operations_total{status="Internal",transformati tt.prefix.TransformFromStorage([]byte("k8s:enc:kms:v1:value"), nil) defer transformerOperationsTotal.Reset() defer deprecatedTransformerFailuresTotal.Reset() - if err := testutil.GatherAndCompare(prometheus.DefaultGatherer, strings.NewReader(tt.want), tt.metrics...); err != nil { + if err := testutil.GatherAndCompare(legacyregistry.DefaultGatherer, strings.NewReader(tt.want), tt.metrics...); err != nil { t.Fatal(err) } }) diff --git a/staging/src/k8s.io/apiserver/pkg/storage/value/transformer_test.go b/staging/src/k8s.io/apiserver/pkg/storage/value/transformer_test.go index 08b3275086e..f044da4fbbf 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/value/transformer_test.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/value/transformer_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/prometheus/client_golang/prometheus" - "github.com/prometheus/client_golang/prometheus/testutil" + "k8s.io/component-base/metrics/legacyregistry" + "k8s.io/component-base/metrics/testutil" ) type testTransformer struct { @@ -185,7 +185,7 @@ func TestPrefixFromMetrics(t *testing.T) { t.Run(tc.desc, func(t *testing.T) { tc.prefix.TransformFromStorage(tc.input, nil) defer transformerOperationsTotal.Reset() - if err := testutil.GatherAndCompare(prometheus.DefaultGatherer, strings.NewReader(tc.want), tc.metrics...); err != nil { + if err := testutil.GatherAndCompare(legacyregistry.DefaultGatherer, strings.NewReader(tc.want), tc.metrics...); err != nil { t.Fatal(err) } }) @@ -243,7 +243,7 @@ func TestPrefixToMetrics(t *testing.T) { t.Run(tc.desc, func(t *testing.T) { tc.prefix.TransformToStorage(tc.input, nil) defer transformerOperationsTotal.Reset() - if err := testutil.GatherAndCompare(prometheus.DefaultGatherer, strings.NewReader(tc.want), tc.metrics...); err != nil { + if err := testutil.GatherAndCompare(legacyregistry.DefaultGatherer, strings.NewReader(tc.want), tc.metrics...); err != nil { t.Fatal(err) } })