Merge pull request #2049 from facchettos/metrics-rename

renamed oddly named metrics.Interface to MetricsEmitter
Azure · Apr 13, 2022 · e167214 · e167214
2 parents eab506d + d9d9fa0
commit e167214
Show file tree

Hide file tree

Showing 43 changed files with 86 additions and 86 deletions.
diff --git a/pkg/backend/backend.go b/pkg/backend/backend.go
@@ -35,7 +35,7 @@ type backend struct {
 	dbSubscriptions     database.Subscriptions
 
 	aead    encryption.AEAD
-	m       metrics.Interface
+	m       metrics.Emitter
 	billing billing.Manager
 
 	mu       sync.Mutex
@@ -53,7 +53,7 @@ type Runnable interface {
 }
 
 // NewBackend returns a new runnable backend
-func NewBackend(ctx context.Context, log *logrus.Entry, env env.Interface, dbAsyncOperations database.AsyncOperations, dbBilling database.Billing, dbGateway database.Gateway, dbOpenShiftClusters database.OpenShiftClusters, dbSubscriptions database.Subscriptions, aead encryption.AEAD, m metrics.Interface) (Runnable, error) {
+func NewBackend(ctx context.Context, log *logrus.Entry, env env.Interface, dbAsyncOperations database.AsyncOperations, dbBilling database.Billing, dbGateway database.Gateway, dbOpenShiftClusters database.OpenShiftClusters, dbSubscriptions database.Subscriptions, aead encryption.AEAD, m metrics.Emitter) (Runnable, error) {
 	b, err := newBackend(ctx, log, env, dbAsyncOperations, dbBilling, dbGateway, dbOpenShiftClusters, dbSubscriptions, aead, m)
 	if err != nil {
 		return nil, err
@@ -64,7 +64,7 @@ func NewBackend(ctx context.Context, log *logrus.Entry, env env.Interface, dbAsy
 	return b, nil
 }
 
-func newBackend(ctx context.Context, log *logrus.Entry, env env.Interface, dbAsyncOperations database.AsyncOperations, dbBilling database.Billing, dbGateway database.Gateway, dbOpenShiftClusters database.OpenShiftClusters, dbSubscriptions database.Subscriptions, aead encryption.AEAD, m metrics.Interface) (*backend, error) {
+func newBackend(ctx context.Context, log *logrus.Entry, env env.Interface, dbAsyncOperations database.AsyncOperations, dbBilling database.Billing, dbGateway database.Gateway, dbOpenShiftClusters database.OpenShiftClusters, dbSubscriptions database.Subscriptions, aead encryption.AEAD, m metrics.Emitter) (*backend, error) {
 	billing, err := billing.NewManager(env, dbBilling, dbSubscriptions, log)
 	if err != nil {
 		return nil, err

diff --git a/pkg/database/database.go b/pkg/database/database.go
@@ -35,7 +35,7 @@ const (
 	collSubscriptions     = "Subscriptions"
 )
 
-func NewDatabaseClient(log *logrus.Entry, env env.Core, authorizer cosmosdb.Authorizer, m metrics.Interface, aead encryption.AEAD) (cosmosdb.DatabaseClient, error) {
+func NewDatabaseClient(log *logrus.Entry, env env.Core, authorizer cosmosdb.Authorizer, m metrics.Emitter, aead encryption.AEAD) (cosmosdb.DatabaseClient, error) {
 	for _, key := range []string{
 		"DATABASE_ACCOUNT_NAME",
 	} {

diff --git a/pkg/database/metrics.go b/pkg/database/metrics.go
@@ -13,7 +13,7 @@ import (
 	"github.com/Azure/ARO-RP/pkg/util/recover"
 )
 
-func EmitMetrics(ctx context.Context, log *logrus.Entry, dbOpenShiftClusters OpenShiftClusters, m metrics.Interface) {
+func EmitMetrics(ctx context.Context, log *logrus.Entry, dbOpenShiftClusters OpenShiftClusters, m metrics.Emitter) {
 	defer recover.Panic(log)
 	t := time.NewTicker(time.Minute)
 	defer t.Stop()

diff --git a/pkg/dbtoken/refresher.go b/pkg/dbtoken/refresher.go
@@ -33,11 +33,11 @@ type refresher struct {
 
 	lastRefresh atomic.Value //time.Time
 
-	m            metrics.Interface
+	m            metrics.Emitter
 	metricPrefix string
 }
 
-func NewRefresher(log *logrus.Entry, env env.Core, authorizer autorest.Authorizer, insecureSkipVerify bool, dbc cosmosdb.DatabaseClient, permission string, m metrics.Interface, metricPrefix string) (Refresher, error) {
+func NewRefresher(log *logrus.Entry, env env.Core, authorizer autorest.Authorizer, insecureSkipVerify bool, dbc cosmosdb.DatabaseClient, permission string, m metrics.Emitter, metricPrefix string) (Refresher, error) {
 	c, err := NewClient(env, authorizer, insecureSkipVerify)
 	if err != nil {
 		return nil, err

diff --git a/pkg/dbtoken/server.go b/pkg/dbtoken/server.go
@@ -41,7 +41,7 @@ type server struct {
 	l                       net.Listener
 	verifier                oidc.Verifier
 	permissionClientFactory func(userid string) cosmosdb.PermissionClient
-	m                       metrics.Interface
+	m                       metrics.Emitter
 }
 
 func NewServer(
@@ -54,7 +54,7 @@ func NewServer(
 	servingCerts []*x509.Certificate,
 	verifier oidc.Verifier,
 	userc cosmosdb.UserClient,
-	m metrics.Interface,
+	m metrics.Emitter,
 ) (Server, error) {
 	config := &tls.Config{
 		Certificates: []tls.Certificate{

diff --git a/pkg/frontend/admin_openshiftcluster_list_test.go b/pkg/frontend/admin_openshiftcluster_list_test.go
@@ -123,7 +123,7 @@ func TestAdminListOpenShiftCluster(t *testing.T) {
 				ti.openShiftClustersClient.SetError(tt.throwsError)
 			}
 
-			f, err := NewFrontend(ctx, ti.audit, ti.log, ti.env, ti.asyncOperationsDatabase, ti.openShiftClustersDatabase, ti.subscriptionsDatabase, api.APIs, &noop.Noop{}, aead, nil, nil, func(log *logrus.Entry, dialer proxy.Dialer, m metrics.Interface) clusterdata.OpenShiftClusterEnricher {
+			f, err := NewFrontend(ctx, ti.audit, ti.log, ti.env, ti.asyncOperationsDatabase, ti.openShiftClustersDatabase, ti.subscriptionsDatabase, api.APIs, &noop.Noop{}, aead, nil, nil, func(log *logrus.Entry, dialer proxy.Dialer, m metrics.Emitter) clusterdata.OpenShiftClusterEnricher {
 				return ti.enricher
 			})
 			if err != nil {

diff --git a/pkg/frontend/frontend.go b/pkg/frontend/frontend.go
@@ -42,7 +42,7 @@ type kubeActionsFactory func(*logrus.Entry, env.Interface, *api.OpenShiftCluster
 
 type azureActionsFactory func(*logrus.Entry, env.Interface, *api.OpenShiftCluster, *api.SubscriptionDocument) (adminactions.AzureActions, error)
 
-type ocEnricherFactory func(log *logrus.Entry, dialer proxy.Dialer, m metrics.Interface) clusterdata.OpenShiftClusterEnricher
+type ocEnricherFactory func(log *logrus.Entry, dialer proxy.Dialer, m metrics.Emitter) clusterdata.OpenShiftClusterEnricher
 
 type frontend struct {
 	auditLog *logrus.Entry
@@ -54,7 +54,7 @@ type frontend struct {
 	dbSubscriptions     database.Subscriptions
 
 	apis map[string]*api.Version
-	m    metrics.Interface
+	m    metrics.Emitter
 	aead encryption.AEAD
 
 	kubeActionsFactory  kubeActionsFactory
@@ -88,7 +88,7 @@ func NewFrontend(ctx context.Context,
 	dbOpenShiftClusters database.OpenShiftClusters,
 	dbSubscriptions database.Subscriptions,
 	apis map[string]*api.Version,
-	m metrics.Interface,
+	m metrics.Emitter,
 	aead encryption.AEAD,
 	kubeActionsFactory kubeActionsFactory,
 	azureActionsFactory azureActionsFactory,

diff --git a/pkg/frontend/middleware/metrics.go b/pkg/frontend/middleware/metrics.go
@@ -14,7 +14,7 @@ import (
 )
 
 // Metric records request metrics for tracking
-func Metrics(m metrics.Interface) func(http.Handler) http.Handler {
+func Metrics(m metrics.Emitter) func(http.Handler) http.Handler {
 	return func(h http.Handler) http.Handler {
 		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 			vars := mux.Vars(r)

diff --git a/pkg/frontend/openshiftcluster_get_test.go b/pkg/frontend/openshiftcluster_get_test.go
@@ -97,7 +97,7 @@ func TestGetOpenShiftCluster(t *testing.T) {
 				ti.openShiftClustersClient.SetError(tt.dbError)
 			}
 
-			f, err := NewFrontend(ctx, ti.audit, ti.log, ti.env, ti.asyncOperationsDatabase, ti.openShiftClustersDatabase, ti.subscriptionsDatabase, api.APIs, &noop.Noop{}, nil, nil, nil, func(log *logrus.Entry, dialer proxy.Dialer, m metrics.Interface) clusterdata.OpenShiftClusterEnricher {
+			f, err := NewFrontend(ctx, ti.audit, ti.log, ti.env, ti.asyncOperationsDatabase, ti.openShiftClustersDatabase, ti.subscriptionsDatabase, api.APIs, &noop.Noop{}, nil, nil, nil, func(log *logrus.Entry, dialer proxy.Dialer, m metrics.Emitter) clusterdata.OpenShiftClusterEnricher {
 				return ti.enricher
 			})
 			if err != nil {

diff --git a/pkg/frontend/openshiftcluster_list_test.go b/pkg/frontend/openshiftcluster_list_test.go
@@ -198,7 +198,7 @@ func TestListOpenShiftCluster(t *testing.T) {
 
 					aead := testdatabase.NewFakeAEAD()
 
-					f, err := NewFrontend(ctx, ti.audit, ti.log, ti.env, ti.asyncOperationsDatabase, ti.openShiftClustersDatabase, ti.subscriptionsDatabase, api.APIs, &noop.Noop{}, aead, nil, nil, func(log *logrus.Entry, dialer proxy.Dialer, m metrics.Interface) clusterdata.OpenShiftClusterEnricher {
+					f, err := NewFrontend(ctx, ti.audit, ti.log, ti.env, ti.asyncOperationsDatabase, ti.openShiftClustersDatabase, ti.subscriptionsDatabase, api.APIs, &noop.Noop{}, aead, nil, nil, func(log *logrus.Entry, dialer proxy.Dialer, m metrics.Emitter) clusterdata.OpenShiftClusterEnricher {
 						return ti.enricher
 					})
 					if err != nil {

diff --git a/pkg/frontend/openshiftcluster_putorpatch_test.go b/pkg/frontend/openshiftcluster_putorpatch_test.go
@@ -565,7 +565,7 @@ func TestPutOrPatchOpenShiftClusterAdminAPI(t *testing.T) {
 				t.Fatal(err)
 			}
 
-			f, err := NewFrontend(ctx, ti.audit, ti.log, ti.env, ti.asyncOperationsDatabase, ti.openShiftClustersDatabase, ti.subscriptionsDatabase, apis, &noop.Noop{}, nil, nil, nil, func(log *logrus.Entry, dialer proxy.Dialer, m metrics.Interface) clusterdata.OpenShiftClusterEnricher {
+			f, err := NewFrontend(ctx, ti.audit, ti.log, ti.env, ti.asyncOperationsDatabase, ti.openShiftClustersDatabase, ti.subscriptionsDatabase, apis, &noop.Noop{}, nil, nil, nil, func(log *logrus.Entry, dialer proxy.Dialer, m metrics.Emitter) clusterdata.OpenShiftClusterEnricher {
 				return ti.enricher
 			})
 			if err != nil {
@@ -1393,7 +1393,7 @@ func TestPutOrPatchOpenShiftCluster(t *testing.T) {
 				t.Fatal(err)
 			}
 
-			f, err := NewFrontend(ctx, ti.audit, ti.log, ti.env, ti.asyncOperationsDatabase, ti.openShiftClustersDatabase, ti.subscriptionsDatabase, apis, &noop.Noop{}, nil, nil, nil, func(log *logrus.Entry, dialer proxy.Dialer, m metrics.Interface) clusterdata.OpenShiftClusterEnricher {
+			f, err := NewFrontend(ctx, ti.audit, ti.log, ti.env, ti.asyncOperationsDatabase, ti.openShiftClustersDatabase, ti.subscriptionsDatabase, apis, &noop.Noop{}, nil, nil, nil, func(log *logrus.Entry, dialer proxy.Dialer, m metrics.Emitter) clusterdata.OpenShiftClusterEnricher {
 				return ti.enricher
 			})
 			if err != nil {

diff --git a/pkg/gateway/gateway.go b/pkg/gateway/gateway.go
@@ -68,7 +68,7 @@ type gateway struct {
 
 	allowList map[string]struct{}
 
-	m                metrics.Interface
+	m                metrics.Emitter
 	httpConnections  int64
 	httpsConnections int64
 }
@@ -87,7 +87,7 @@ const SocketSize = 65536
 
 // TODO: may one day want to limit gateway readiness on # active connections
 
-func NewGateway(ctx context.Context, env env.Core, baseLog, accessLog *logrus.Entry, dbGateway database.Gateway, httpsl, httpl net.Listener, acrResourceID, gatewayDomains string, m metrics.Interface) (Runnable, error) {
+func NewGateway(ctx context.Context, env env.Core, baseLog, accessLog *logrus.Entry, dbGateway database.Gateway, httpsl, httpl net.Listener, acrResourceID, gatewayDomains string, m metrics.Emitter) (Runnable, error) {
 	var domains []string
 	if gatewayDomains != "" {
 		domains = strings.Split(gatewayDomains, ",")

diff --git a/pkg/metrics/generate.go b/pkg/metrics/generate.go
@@ -4,5 +4,5 @@ package metrics
 // Licensed under the Apache License 2.0.
 
 //go:generate rm -rf ../util/mocks/$GOPACKAGE
-//go:generate go run ../../vendor/github.com/golang/mock/mockgen -destination=../util/mocks/$GOPACKAGE/$GOPACKAGE.go github.com/Azure/ARO-RP/pkg/$GOPACKAGE Interface
+//go:generate go run ../../vendor/github.com/golang/mock/mockgen -destination=../util/mocks/$GOPACKAGE/$GOPACKAGE.go github.com/Azure/ARO-RP/pkg/$GOPACKAGE Emitter
 //go:generate go run ../../vendor/golang.org/x/tools/cmd/goimports -local=github.com/Azure/ARO-RP -e -w ../util/mocks/$GOPACKAGE/$GOPACKAGE.go
diff --git a/pkg/metrics/metrics.go b/pkg/metrics/metrics.go
@@ -3,8 +3,8 @@ package metrics
 // Copyright (c) Microsoft Corporation.
 // Licensed under the Apache License 2.0.
 
-// Interface represents metrics interface
-type Interface interface {
+// Emitter emits different types of metrics
+type Emitter interface {
 	EmitFloat(string, float64, map[string]string)
 	EmitGauge(string, int64, map[string]string)
 }
diff --git a/pkg/metrics/statsd/azure/metrics.go b/pkg/metrics/statsd/azure/metrics.go
@@ -17,7 +17,7 @@ import (
 var _ tracing.Tracer = (*tracer)(nil)
 
 type tracer struct {
-	m metrics.Interface
+	m metrics.Emitter
 }
 
 type contextKey int
@@ -31,7 +31,7 @@ type metric struct {
 	name string
 }
 
-func New(m metrics.Interface) tracing.Tracer {
+func New(m metrics.Emitter) tracing.Tracer {
 	return &tracer{
 		m: m,
 	}

diff --git a/pkg/metrics/statsd/azure/metrics_test.go b/pkg/metrics/statsd/azure/metrics_test.go
@@ -18,7 +18,7 @@ func TestTracer(t *testing.T) {
 	controller := gomock.NewController(t)
 	defer controller.Finish()
 
-	m := mock_metrics.NewMockInterface(controller)
+	m := mock_metrics.NewMockEmitter(controller)
 
 	m.EXPECT().EmitGauge("client.azure.duration", gomock.Any(), map[string]string{
 		"client": "test",

diff --git a/pkg/metrics/statsd/cosmosdb/metrics.go b/pkg/metrics/statsd/cosmosdb/metrics.go
@@ -18,11 +18,11 @@ var _ http.RoundTripper = (*tracerRoundTripper)(nil)
 
 type tracerRoundTripper struct {
 	log *logrus.Entry
-	m   metrics.Interface
+	m   metrics.Emitter
 	tr  http.RoundTripper
 }
 
-func New(log *logrus.Entry, tr *http.Transport, m metrics.Interface) *tracerRoundTripper {
+func New(log *logrus.Entry, tr *http.Transport, m metrics.Emitter) *tracerRoundTripper {
 	return &tracerRoundTripper{
 		log: log,
 		m:   m,

diff --git a/pkg/metrics/statsd/cosmosdb/metrics_test.go b/pkg/metrics/statsd/cosmosdb/metrics_test.go
@@ -28,7 +28,7 @@ func TestTracerRoundTripperRoundTrip(t *testing.T) {
 		name               string
 		url                string
 		rt                 http.RoundTripper
-		mocks              func(*mock_metrics.MockInterface)
+		mocks              func(*mock_metrics.MockEmitter)
 		wantErr            string
 		wantRespStatusCode int
 	}{
@@ -37,7 +37,7 @@ func TestTracerRoundTripperRoundTrip(t *testing.T) {
 			rt: &testRoundTripper{
 				err: errors.New("roundtrip failed"),
 			},
-			mocks: func(m *mock_metrics.MockInterface) {
+			mocks: func(m *mock_metrics.MockEmitter) {
 				m.EXPECT().EmitGauge("client.cosmosdb.count", int64(1), map[string]string{
 					"verb": http.MethodGet,
 					"path": "/foo",
@@ -66,7 +66,7 @@ func TestTracerRoundTripperRoundTrip(t *testing.T) {
 					},
 				},
 			},
-			mocks: func(m *mock_metrics.MockInterface) {
+			mocks: func(m *mock_metrics.MockEmitter) {
 				m.EXPECT().EmitGauge("client.cosmosdb.count", int64(1), map[string]string{
 					"verb": http.MethodGet,
 					"path": "/foo",
@@ -91,7 +91,7 @@ func TestTracerRoundTripperRoundTrip(t *testing.T) {
 					},
 				},
 			},
-			mocks: func(m *mock_metrics.MockInterface) {
+			mocks: func(m *mock_metrics.MockEmitter) {
 				m.EXPECT().EmitGauge("client.cosmosdb.count", int64(1), map[string]string{
 					"verb": http.MethodGet,
 					"path": "/docs/{id}",
@@ -115,7 +115,7 @@ func TestTracerRoundTripperRoundTrip(t *testing.T) {
 			controller := gomock.NewController(t)
 			defer controller.Finish()
 
-			m := mock_metrics.NewMockInterface(controller)
+			m := mock_metrics.NewMockEmitter(controller)
 			tt.mocks(m)
 
 			tripper := &tracerRoundTripper{

diff --git a/pkg/metrics/statsd/golang/metrics.go b/pkg/metrics/statsd/golang/metrics.go
@@ -24,11 +24,11 @@ type Runnable interface {
 // refactor our entire metrics stack to do things that way.
 type golang struct {
 	log *logrus.Entry
-	m   metrics.Interface
+	m   metrics.Emitter
 	r   *prometheus.Registry
 }
 
-func NewMetrics(log *logrus.Entry, m metrics.Interface) (Runnable, error) {
+func NewMetrics(log *logrus.Entry, m metrics.Emitter) (Runnable, error) {
 	g := &golang{
 		log: log,
 		m:   m,

diff --git a/pkg/metrics/statsd/k8s/metrics.go b/pkg/metrics/statsd/k8s/metrics.go
@@ -17,16 +17,16 @@ var _ kmetrics.LatencyMetric = (*tracer)(nil)
 var _ kmetrics.ResultMetric = (*tracer)(nil)
 
 type tracer struct {
-	m metrics.Interface
+	m metrics.Emitter
 }
 
-func NewLatency(m metrics.Interface) kmetrics.LatencyMetric {
+func NewLatency(m metrics.Emitter) kmetrics.LatencyMetric {
 	return &tracer{
 		m: m,
 	}
 }
 
-func NewResult(m metrics.Interface) kmetrics.ResultMetric {
+func NewResult(m metrics.Emitter) kmetrics.ResultMetric {
 	return &tracer{
 		m: m,
 	}

diff --git a/pkg/metrics/statsd/k8s/metrics_test.go b/pkg/metrics/statsd/k8s/metrics_test.go
@@ -16,7 +16,7 @@ func TestTracer(t *testing.T) {
 	controller := gomock.NewController(t)
 	defer controller.Finish()
 
-	m := mock_metrics.NewMockInterface(controller)
+	m := mock_metrics.NewMockEmitter(controller)
 
 	m.EXPECT().EmitGauge("client.k8s.count", int64(1), map[string]string{
 		"verb": "GET",

diff --git a/pkg/metrics/statsd/statsd.go b/pkg/metrics/statsd/statsd.go
@@ -30,8 +30,8 @@ type statsd struct {
 	now func() time.Time
 }
 
-// New returns a new metrics.Interface
-func New(ctx context.Context, log *logrus.Entry, env env.Core, account, namespace string) metrics.Interface {
+// New returns a new metrics.Emitter
+func New(ctx context.Context, log *logrus.Entry, env env.Core, account, namespace string) metrics.Emitter {
 	s := &statsd{
 		log: log,
 		env: env,

diff --git a/pkg/monitor/cluster/arooperatorheartbeat_test.go b/pkg/monitor/cluster/arooperatorheartbeat_test.go
@@ -78,7 +78,7 @@ func TestEmitAroOperatorHeartbeat(t *testing.T) {
 	controller := gomock.NewController(t)
 	defer controller.Finish()
 
-	m := mock_metrics.NewMockInterface(controller)
+	m := mock_metrics.NewMockEmitter(controller)
 
 	mon := &Monitor{
 		cli: cli,

diff --git a/pkg/monitor/cluster/cluster.go b/pkg/monitor/cluster/cluster.go
@@ -37,7 +37,7 @@ type Monitor struct {
 	configcli  configclient.Interface
 	maocli     maoclient.Interface
 	mcocli     mcoclient.Interface
-	m          metrics.Interface
+	m          metrics.Emitter
 	arocli     aroclient.Interface
 
 	// access below only via the helper functions in cache.go
@@ -49,7 +49,7 @@ type Monitor struct {
 	}
 }
 
-func NewMonitor(ctx context.Context, log *logrus.Entry, restConfig *rest.Config, oc *api.OpenShiftCluster, m metrics.Interface, hourlyRun bool) (*Monitor, error) {
+func NewMonitor(ctx context.Context, log *logrus.Entry, restConfig *rest.Config, oc *api.OpenShiftCluster, m metrics.Emitter, hourlyRun bool) (*Monitor, error) {
 	r, err := azure.ParseResourceID(oc.ID)
 	if err != nil {
 		return nil, err

diff --git a/pkg/monitor/cluster/clusteroperatorconditions_test.go b/pkg/monitor/cluster/clusteroperatorconditions_test.go
@@ -67,7 +67,7 @@ func TestEmitClusterOperatorConditions(t *testing.T) {
 	controller := gomock.NewController(t)
 	defer controller.Finish()
 
-	m := mock_metrics.NewMockInterface(controller)
+	m := mock_metrics.NewMockEmitter(controller)
 
 	mon := &Monitor{
 		configcli: configcli,

diff --git a/pkg/monitor/cluster/clusteroperatorversions_test.go b/pkg/monitor/cluster/clusteroperatorversions_test.go
@@ -50,7 +50,7 @@ func TestEmitClusterOperatorVersion(t *testing.T) {
 	controller := gomock.NewController(t)
 	defer controller.Finish()
 
-	m := mock_metrics.NewMockInterface(controller)
+	m := mock_metrics.NewMockEmitter(controller)
 
 	mon := &Monitor{
 		configcli: configcli,

diff --git a/pkg/monitor/cluster/clusterversionconditions_test.go b/pkg/monitor/cluster/clusterversionconditions_test.go
@@ -67,7 +67,7 @@ func TestEmitClusterVersionConditions(t *testing.T) {
 	controller := gomock.NewController(t)
 	defer controller.Finish()
 
-	m := mock_metrics.NewMockInterface(controller)
+	m := mock_metrics.NewMockEmitter(controller)
 
 	mon := &Monitor{
 		configcli: configcli,

diff --git a/pkg/monitor/cluster/clusterversions_test.go b/pkg/monitor/cluster/clusterversions_test.go
@@ -141,7 +141,7 @@ func TestEmitClusterVersion(t *testing.T) {
 			controller := gomock.NewController(t)
 			defer controller.Finish()
 
-			m := mock_metrics.NewMockInterface(controller)
+			m := mock_metrics.NewMockEmitter(controller)
 
 			mon := &Monitor{
 				configcli: configcli,