From d9d9fa0ed5c671a10842e3ad6a816485643527fa Mon Sep 17 00:00:00 2001 From: Jeremy Facchetti Date: Mon, 11 Apr 2022 09:51:27 +0200 Subject: [PATCH] renamed oddly named metrics.Interface to Emitter --- pkg/backend/backend.go | 6 ++-- pkg/database/database.go | 2 +- pkg/database/metrics.go | 2 +- pkg/dbtoken/refresher.go | 4 +-- pkg/dbtoken/server.go | 4 +-- .../admin_openshiftcluster_list_test.go | 2 +- pkg/frontend/frontend.go | 6 ++-- pkg/frontend/middleware/metrics.go | 2 +- pkg/frontend/openshiftcluster_get_test.go | 2 +- pkg/frontend/openshiftcluster_list_test.go | 2 +- .../openshiftcluster_putorpatch_test.go | 4 +-- pkg/gateway/gateway.go | 4 +-- pkg/metrics/generate.go | 2 +- pkg/metrics/metrics.go | 4 +-- pkg/metrics/statsd/azure/metrics.go | 4 +-- pkg/metrics/statsd/azure/metrics_test.go | 2 +- pkg/metrics/statsd/cosmosdb/metrics.go | 4 +-- pkg/metrics/statsd/cosmosdb/metrics_test.go | 10 +++--- pkg/metrics/statsd/golang/metrics.go | 4 +-- pkg/metrics/statsd/k8s/metrics.go | 6 ++-- pkg/metrics/statsd/k8s/metrics_test.go | 2 +- pkg/metrics/statsd/statsd.go | 4 +-- .../cluster/arooperatorheartbeat_test.go | 2 +- pkg/monitor/cluster/cluster.go | 4 +-- .../cluster/clusteroperatorconditions_test.go | 2 +- .../cluster/clusteroperatorversions_test.go | 2 +- .../cluster/clusterversionconditions_test.go | 2 +- pkg/monitor/cluster/clusterversions_test.go | 2 +- pkg/monitor/cluster/daemonsetstatuses_test.go | 2 +- .../cluster/deploymentstatuses_test.go | 2 +- pkg/monitor/cluster/jobconditions_test.go | 2 +- pkg/monitor/cluster/machineconfigpool_test.go | 2 +- .../machineconfigpoolconditions_test.go | 2 +- pkg/monitor/cluster/nodeconditions_test.go | 2 +- pkg/monitor/cluster/podconditions_test.go | 6 ++-- .../cluster/replicasetstatuses_test.go | 2 +- .../cluster/statefulsetstatuses_test.go | 2 +- pkg/monitor/cluster/summary_test.go | 2 +- pkg/monitor/monitor.go | 6 ++-- pkg/portal/portal.go | 4 +-- pkg/util/clusterdata/clusterdata.go | 4 +-- pkg/util/heartbeat/heartbeat.go | 2 +- pkg/util/mocks/metrics/metrics.go | 36 +++++++++---------- 43 files changed, 86 insertions(+), 86 deletions(-) diff --git a/pkg/backend/backend.go b/pkg/backend/backend.go index 41f745462a3..89c5a64065d 100644 --- 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 index 251de14ee04..a0efa5dfb4c 100644 --- 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 index 2f36e16d81c..7276b617f49 100644 --- 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 index 15434f3e7e8..94ae85ecf1d 100644 --- 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 index 88c26470d55..3ce2fe9b8fd 100644 --- 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 index 701f361d877..34236ff2c9f 100644 --- 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 index 88f84f6cf77..e020eb84a50 100644 --- 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 index 1b0b3570495..2c2050fca25 100644 --- 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 index a959eb59eca..cbf93195524 100644 --- 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 index 817de0c7e57..99dc5ddb328 100644 --- 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 index c215f2b953b..2cc2c3359f7 100644 --- 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 index 44ab170c271..026ff3b7d50 100644 --- 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 index 84d7169e028..75228034917 100644 --- 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 index 8d1a7810b57..42af830f7ad 100644 --- 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 index 0084e73e1ee..832ec3390b0 100644 --- 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 index c99e44e559f..635906c571f 100644 --- 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 index d3d106689dd..6d2f373a0c5 100644 --- 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 index 7c41c67e577..a1da5c13dcb 100644 --- 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 index e97cadc7eb6..410440012cb 100644 --- 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 index 8d3549282f9..b0109127b8a 100644 --- 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 index 3efa01e4d40..b42609dbb41 100644 --- 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 index 8b55038bc7a..df8bf304568 100644 --- 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 index 95be6d2f703..ef2e5326833 100644 --- 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 index feadd1e14da..2834cd66979 100644 --- 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 index e05975f5bbe..a708878156b 100644 --- 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 index cdcf5a182fc..d10c0d636e3 100644 --- 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 index 78d39f730c1..8aa94141d80 100644 --- 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 index ae3fa6853fe..23fd6083839 100644 --- 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, diff --git a/pkg/monitor/cluster/daemonsetstatuses_test.go b/pkg/monitor/cluster/daemonsetstatuses_test.go index 89354d02e9a..e39f4eb5576 100644 --- a/pkg/monitor/cluster/daemonsetstatuses_test.go +++ b/pkg/monitor/cluster/daemonsetstatuses_test.go @@ -53,7 +53,7 @@ func TestEmitDaemonsetStatuses(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/deploymentstatuses_test.go b/pkg/monitor/cluster/deploymentstatuses_test.go index 206364af86b..fba87974803 100644 --- a/pkg/monitor/cluster/deploymentstatuses_test.go +++ b/pkg/monitor/cluster/deploymentstatuses_test.go @@ -53,7 +53,7 @@ func TestEmitDeploymentStatuses(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/jobconditions_test.go b/pkg/monitor/cluster/jobconditions_test.go index c5188b29611..143e85820c9 100644 --- a/pkg/monitor/cluster/jobconditions_test.go +++ b/pkg/monitor/cluster/jobconditions_test.go @@ -73,7 +73,7 @@ func TestEmitJobConditions(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/machineconfigpool_test.go b/pkg/monitor/cluster/machineconfigpool_test.go index 1c2eb603c6b..1edf32195e0 100644 --- a/pkg/monitor/cluster/machineconfigpool_test.go +++ b/pkg/monitor/cluster/machineconfigpool_test.go @@ -69,7 +69,7 @@ func TestEmitMachineConfigPoolUnmanagedNodes(t *testing.T) { controller := gomock.NewController(t) defer controller.Finish() - m := mock_metrics.NewMockInterface(controller) + m := mock_metrics.NewMockEmitter(controller) mon := &Monitor{ mcocli: mcocli, diff --git a/pkg/monitor/cluster/machineconfigpoolconditions_test.go b/pkg/monitor/cluster/machineconfigpoolconditions_test.go index 35cc2466ae0..c7e48c0f370 100644 --- a/pkg/monitor/cluster/machineconfigpoolconditions_test.go +++ b/pkg/monitor/cluster/machineconfigpoolconditions_test.go @@ -52,7 +52,7 @@ func TestEmitMachineConfigPoolConditions(t *testing.T) { controller := gomock.NewController(t) defer controller.Finish() - m := mock_metrics.NewMockInterface(controller) + m := mock_metrics.NewMockEmitter(controller) mon := &Monitor{ mcocli: mcocli, diff --git a/pkg/monitor/cluster/nodeconditions_test.go b/pkg/monitor/cluster/nodeconditions_test.go index 6abb2057def..9056d6f7e6a 100644 --- a/pkg/monitor/cluster/nodeconditions_test.go +++ b/pkg/monitor/cluster/nodeconditions_test.go @@ -101,7 +101,7 @@ func TestEmitNodeConditions(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/podconditions_test.go b/pkg/monitor/cluster/podconditions_test.go index ceb06996854..1ead00d24d0 100644 --- a/pkg/monitor/cluster/podconditions_test.go +++ b/pkg/monitor/cluster/podconditions_test.go @@ -58,7 +58,7 @@ func TestEmitPodConditions(t *testing.T) { controller := gomock.NewController(t) defer controller.Finish() - m := mock_metrics.NewMockInterface(controller) + m := mock_metrics.NewMockEmitter(controller) mon := &Monitor{ cli: cli, @@ -126,7 +126,7 @@ func TestEmitPodContainerStatuses(t *testing.T) { controller := gomock.NewController(t) defer controller.Finish() - m := mock_metrics.NewMockInterface(controller) + m := mock_metrics.NewMockEmitter(controller) mon := &Monitor{ cli: cli, @@ -259,7 +259,7 @@ func TestEmitPodContainerRestartCounter(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/replicasetstatuses_test.go b/pkg/monitor/cluster/replicasetstatuses_test.go index c12ea980826..262052faf29 100644 --- a/pkg/monitor/cluster/replicasetstatuses_test.go +++ b/pkg/monitor/cluster/replicasetstatuses_test.go @@ -53,7 +53,7 @@ func TestEmitReplicasetStatuses(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/statefulsetstatuses_test.go b/pkg/monitor/cluster/statefulsetstatuses_test.go index d77663efa5a..f679aa6bd99 100644 --- a/pkg/monitor/cluster/statefulsetstatuses_test.go +++ b/pkg/monitor/cluster/statefulsetstatuses_test.go @@ -53,7 +53,7 @@ func TestEmitStatefulsetStatuses(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/summary_test.go b/pkg/monitor/cluster/summary_test.go index 66e963dfdf1..d4cf1803d0c 100644 --- a/pkg/monitor/cluster/summary_test.go +++ b/pkg/monitor/cluster/summary_test.go @@ -67,7 +67,7 @@ func TestEmitSummary(t *testing.T) { controller := gomock.NewController(t) defer controller.Finish() - m := mock_metrics.NewMockInterface(controller) + m := mock_metrics.NewMockEmitter(controller) mockCreatedAt := time.Date(1970, 1, 1, 0, 0, 0, 0, time.UTC) diff --git a/pkg/monitor/monitor.go b/pkg/monitor/monitor.go index 0270fd73249..6e5eb5ff7f5 100644 --- a/pkg/monitor/monitor.go +++ b/pkg/monitor/monitor.go @@ -29,8 +29,8 @@ type monitor struct { dbOpenShiftClusters database.OpenShiftClusters dbSubscriptions database.Subscriptions - m metrics.Interface - clusterm metrics.Interface + m metrics.Emitter + clusterm metrics.Emitter mu sync.RWMutex docs map[string]*cacheDoc subs map[string]*api.SubscriptionDocument @@ -48,7 +48,7 @@ type Runnable interface { Run(context.Context) error } -func NewMonitor(log *logrus.Entry, dialer proxy.Dialer, dbMonitors database.Monitors, dbOpenShiftClusters database.OpenShiftClusters, dbSubscriptions database.Subscriptions, m, clusterm metrics.Interface) Runnable { +func NewMonitor(log *logrus.Entry, dialer proxy.Dialer, dbMonitors database.Monitors, dbOpenShiftClusters database.OpenShiftClusters, dbSubscriptions database.Subscriptions, m, clusterm metrics.Emitter) Runnable { return &monitor{ baseLog: log, dialer: dialer, diff --git a/pkg/portal/portal.go b/pkg/portal/portal.go index dde31e91f84..9099ae29852 100644 --- a/pkg/portal/portal.go +++ b/pkg/portal/portal.go @@ -74,7 +74,7 @@ type portal struct { aad middleware.AAD - m metrics.Interface + m metrics.Emitter } func NewPortal(env env.Core, @@ -97,7 +97,7 @@ func NewPortal(env env.Core, dbOpenShiftClusters database.OpenShiftClusters, dbPortal database.Portal, dialer proxy.Dialer, - m metrics.Interface, + m metrics.Emitter, ) Runnable { return &portal{ env: env, diff --git a/pkg/util/clusterdata/clusterdata.go b/pkg/util/clusterdata/clusterdata.go index cec38746cf2..008ee1c0838 100644 --- a/pkg/util/clusterdata/clusterdata.go +++ b/pkg/util/clusterdata/clusterdata.go @@ -33,7 +33,7 @@ type enricherTask interface { // NewBestEffortEnricher returns an enricher that attempts to populate // fields, but ignores errors in case of failures -func NewBestEffortEnricher(log *logrus.Entry, dialer proxy.Dialer, m metrics.Interface) OpenShiftClusterEnricher { +func NewBestEffortEnricher(log *logrus.Entry, dialer proxy.Dialer, m metrics.Emitter) OpenShiftClusterEnricher { return &bestEffortEnricher{ log: log, dialer: dialer, @@ -52,7 +52,7 @@ func NewBestEffortEnricher(log *logrus.Entry, dialer proxy.Dialer, m metrics.Int type bestEffortEnricher struct { log *logrus.Entry dialer proxy.Dialer - m metrics.Interface + m metrics.Emitter restConfig func(dialer proxy.Dialer, oc *api.OpenShiftCluster) (*rest.Config, error) taskConstructors []enricherTaskConstructor diff --git a/pkg/util/heartbeat/heartbeat.go b/pkg/util/heartbeat/heartbeat.go index b6158aa2c3c..d1cb6861884 100644 --- a/pkg/util/heartbeat/heartbeat.go +++ b/pkg/util/heartbeat/heartbeat.go @@ -14,7 +14,7 @@ import ( // EmitHeartbeat sends a heartbeat metric (if healthy), starting immediately and // subsequently every 60 seconds -func EmitHeartbeat(log *logrus.Entry, m metrics.Interface, metricName string, stop <-chan struct{}, checkFunc func() bool) { +func EmitHeartbeat(log *logrus.Entry, m metrics.Emitter, metricName string, stop <-chan struct{}, checkFunc func() bool) { defer recover.Panic(log) t := time.NewTicker(time.Minute) diff --git a/pkg/util/mocks/metrics/metrics.go b/pkg/util/mocks/metrics/metrics.go index 1c2c3c036d8..6eb9a9d4065 100644 --- a/pkg/util/mocks/metrics/metrics.go +++ b/pkg/util/mocks/metrics/metrics.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/Azure/ARO-RP/pkg/metrics (interfaces: Interface) +// Source: github.com/Azure/ARO-RP/pkg/metrics (interfaces: Emitter) // Package mock_metrics is a generated GoMock package. package mock_metrics @@ -10,49 +10,49 @@ import ( gomock "github.com/golang/mock/gomock" ) -// MockInterface is a mock of Interface interface. -type MockInterface struct { +// MockEmitter is a mock of Emitter interface. +type MockEmitter struct { ctrl *gomock.Controller - recorder *MockInterfaceMockRecorder + recorder *MockEmitterMockRecorder } -// MockInterfaceMockRecorder is the mock recorder for MockInterface. -type MockInterfaceMockRecorder struct { - mock *MockInterface +// MockEmitterMockRecorder is the mock recorder for MockEmitter. +type MockEmitterMockRecorder struct { + mock *MockEmitter } -// NewMockInterface creates a new mock instance. -func NewMockInterface(ctrl *gomock.Controller) *MockInterface { - mock := &MockInterface{ctrl: ctrl} - mock.recorder = &MockInterfaceMockRecorder{mock} +// NewMockEmitter creates a new mock instance. +func NewMockEmitter(ctrl *gomock.Controller) *MockEmitter { + mock := &MockEmitter{ctrl: ctrl} + mock.recorder = &MockEmitterMockRecorder{mock} return mock } // EXPECT returns an object that allows the caller to indicate expected use. -func (m *MockInterface) EXPECT() *MockInterfaceMockRecorder { +func (m *MockEmitter) EXPECT() *MockEmitterMockRecorder { return m.recorder } // EmitFloat mocks base method. -func (m *MockInterface) EmitFloat(arg0 string, arg1 float64, arg2 map[string]string) { +func (m *MockEmitter) EmitFloat(arg0 string, arg1 float64, arg2 map[string]string) { m.ctrl.T.Helper() m.ctrl.Call(m, "EmitFloat", arg0, arg1, arg2) } // EmitFloat indicates an expected call of EmitFloat. -func (mr *MockInterfaceMockRecorder) EmitFloat(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockEmitterMockRecorder) EmitFloat(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "EmitFloat", reflect.TypeOf((*MockInterface)(nil).EmitFloat), arg0, arg1, arg2) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "EmitFloat", reflect.TypeOf((*MockEmitter)(nil).EmitFloat), arg0, arg1, arg2) } // EmitGauge mocks base method. -func (m *MockInterface) EmitGauge(arg0 string, arg1 int64, arg2 map[string]string) { +func (m *MockEmitter) EmitGauge(arg0 string, arg1 int64, arg2 map[string]string) { m.ctrl.T.Helper() m.ctrl.Call(m, "EmitGauge", arg0, arg1, arg2) } // EmitGauge indicates an expected call of EmitGauge. -func (mr *MockInterfaceMockRecorder) EmitGauge(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockEmitterMockRecorder) EmitGauge(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "EmitGauge", reflect.TypeOf((*MockInterface)(nil).EmitGauge), arg0, arg1, arg2) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "EmitGauge", reflect.TypeOf((*MockEmitter)(nil).EmitGauge), arg0, arg1, arg2) }