refactor some code

kurtosis-tech · Nov 9, 2023 · a0a72ea · a0a72ea
1 parent 354e55e
commit a0a72ea
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 30 deletions.
diff --git a/cli/cli/helpers/do_nothing_metrics_client_callback/do_nothing_metrics_client_callback.go b/cli/cli/helpers/do_nothing_metrics_client_callback/do_nothing_metrics_client_callback.go
diff --git a/cli/cli/helpers/metrics_client_factory/metrics_client_factory.go b/cli/cli/helpers/metrics_client_factory/metrics_client_factory.go
@@ -2,7 +2,6 @@ package metrics_client_factory
 
 import (
 	"github.com/kurtosis-tech/kurtosis/cli/cli/defaults"
-	"github.com/kurtosis-tech/kurtosis/cli/cli/helpers/do_nothing_metrics_client_callback"
 	"github.com/kurtosis-tech/kurtosis/cli/cli/helpers/metrics_cloud_user_instance_id_helper"
 	"github.com/kurtosis-tech/kurtosis/cli/cli/helpers/metrics_user_id_store"
 	"github.com/kurtosis-tech/kurtosis/cli/cli/kurtosis_cluster_setting"
@@ -54,7 +53,7 @@ func GetMetricsClient() (metrics_client.MetricsClient, func() error, error) {
 			clusterType,
 			sendUserMetrics,
 			shouldFlushMetricsClientQueueOnEachEvent,
-			do_nothing_metrics_client_callback.NewDoNothingMetricsClientCallback(),
+			metrics_client.DoNothingMetricsClientCallback{},
 			analytics_logger.ConvertLogrusLoggerToAnalyticsLogger(logger),
 			metrics_client.IsCI(), maybeCloudUserId, maybeCloudInstanceId),
 	)
@@ -85,7 +84,7 @@ func GetSegmentClient() (metrics_client.MetricsClient, func() error, error) {
 			clusterType,
 			sendUserMetrics,
 			shouldFlushMetricsClientQueueOnEachEvent,
-			do_nothing_metrics_client_callback.NewDoNothingMetricsClientCallback(),
+			metrics_client.DoNothingMetricsClientCallback{},
 			analytics_logger.ConvertLogrusLoggerToAnalyticsLogger(logger),
 			metrics_client.IsCI(), maybeCloudUserId, maybeCloudInstanceId),
 	)

diff --git a/cli/cli/kurtosis_config/email_collector/email_collector.go b/cli/cli/kurtosis_config/email_collector/email_collector.go
@@ -1,7 +1,6 @@
 package email_collector
 
 import (
-	"github.com/kurtosis-tech/kurtosis/cli/cli/helpers/do_nothing_metrics_client_callback"
 	"github.com/kurtosis-tech/kurtosis/cli/cli/helpers/metrics_cloud_user_instance_id_helper"
 	"github.com/kurtosis-tech/kurtosis/cli/cli/helpers/metrics_user_id_store"
 	"github.com/kurtosis-tech/kurtosis/cli/cli/helpers/prompt_displayer"
@@ -54,7 +53,7 @@ func logUserEmailAddressAsMetric(userEmail string) {
 			resolved_config.DefaultDockerClusterName,
 			sendUserMetrics,
 			flushQueueOnEachEvent,
-			do_nothing_metrics_client_callback.NewDoNothingMetricsClientCallback(),
+			metrics_client.DoNothingMetricsClientCallback{},
 			analytics_logger.ConvertLogrusLoggerToAnalyticsLogger(logger),
 			metrics_client.IsCI(),
 			maybeCloudUserID,

diff --git a/core/server/api_container/main.go b/core/server/api_container/main.go
@@ -57,11 +57,6 @@ const (
 	shouldFlushMetricsClientQueueOnEachEvent = false
 )
 
-type doNothingMetricsClientCallback struct{}
-
-func (d doNothingMetricsClientCallback) Success()          {}
-func (d doNothingMetricsClientCallback) Failure(err error) {}
-
 func main() {
 	// This allows the filename & function to be reported
 	logrus.SetReportCaller(logMethodAlongWithLogLine)
@@ -185,7 +180,7 @@ func runMain() error {
 			serverArgs.KurtosisBackendType.String(),
 			serverArgs.DidUserAcceptSendingMetrics,
 			shouldFlushMetricsClientQueueOnEachEvent,
-			doNothingMetricsClientCallback{},
+			metrics_client.DoNothingMetricsClientCallback{},
 			analytics_logger.ConvertLogrusLoggerToAnalyticsLogger(logger),
 			serverArgs.IsCI,
 			serverArgs.CloudUserID,

diff --git a/engine/server/engine/main.go b/engine/server/engine/main.go
@@ -67,11 +67,6 @@ const (
 //	because this isn't the API container
 var apiContainerModeArgsForKurtosisBackend *backend_creator.APIContainerModeArgs = nil
 
-type doNothingMetricsClientCallback struct{}
-
-func (d doNothingMetricsClientCallback) Success()          {}
-func (d doNothingMetricsClientCallback) Failure(err error) {}
-
 func main() {
 	// This allows the filename & function to be reported
 	logrus.SetReportCaller(logMethodAlongWithLogLine)
@@ -216,7 +211,7 @@ func runMain() error {
 			serverArgs.KurtosisBackendType.String(),
 			serverArgs.DidUserAcceptSendingMetrics,
 			shouldFlushMetricsClientQueueOnEachEvent,
-			doNothingMetricsClientCallback{},
+			metrics_client.DoNothingMetricsClientCallback{},
 			analytics_logger.ConvertLogrusLoggerToAnalyticsLogger(logger),
 			serverArgs.IsCI,
 			serverArgs.CloudUserID,

diff --git a/metrics-library/golang/lib/metrics_client/do_nothing_callback.go b/metrics-library/golang/lib/metrics_client/do_nothing_callback.go
@@ -0,0 +1,6 @@
+package metrics_client
+
+type DoNothingMetricsClientCallback struct{}
+
+func (d DoNothingMetricsClientCallback) Success()          {}
+func (d DoNothingMetricsClientCallback) Failure(err error) {}