From 9ba1948298b8d0d57919fe480b41c9aeb97fa03b Mon Sep 17 00:00:00 2001
From: Jeff Mitchell <jeffrey.mitchell@gmail.com>
Date: Wed, 14 Jul 2021 16:53:42 -0700
Subject: [PATCH] Remove telemetry calls as we aren't using them

---
 internal/cmd/base/servers.go                | 18 ------------------
 internal/cmd/commands/dev/dev.go            |  5 -----
 internal/cmd/commands/server/server.go      | 11 -----------
 internal/cmd/commands/server/server_test.go |  9 ++++-----
 4 files changed, 4 insertions(+), 39 deletions(-)

diff --git a/internal/cmd/base/servers.go b/internal/cmd/base/servers.go
index bfe3c0f6d..42fbcf4a6 100644
--- a/internal/cmd/base/servers.go
+++ b/internal/cmd/base/servers.go
@@ -296,24 +296,6 @@ func (b *Server) RemovePidFile(pidPath string) error {
 	return os.Remove(pidPath)
 }
 
-func (b *Server) SetupMetrics(ui cli.Ui, telemetry *configutil.Telemetry) error {
-	// TODO: Figure out a user-agent we want to use for the last param
-	// TODO: Do we want different names for different components?
-	var err error
-	b.InmemSink, _, b.PrometheusEnabled, err = configutil.SetupTelemetry(&configutil.SetupTelemetryOpts{
-		Config:      telemetry,
-		Ui:          ui,
-		ServiceName: "boundary",
-		DisplayName: "Boundary",
-		UserAgent:   "boundary",
-	})
-	if err != nil {
-		return fmt.Errorf("Error initializing telemetry: %w", err)
-	}
-
-	return nil
-}
-
 func (b *Server) PrintInfo(ui cli.Ui) {
 	verInfo := version.Get()
 	if verInfo.Version != "" {
diff --git a/internal/cmd/commands/dev/dev.go b/internal/cmd/commands/dev/dev.go
index 742e28b7e..eb73a0d02 100644
--- a/internal/cmd/commands/dev/dev.go
+++ b/internal/cmd/commands/dev/dev.go
@@ -431,11 +431,6 @@ func (c *Command) Run(args []string) int {
 
 	base.StartMemProfiler(c.Logger)
 
-	if err := c.SetupMetrics(c.UI, c.Config.Telemetry); err != nil {
-		c.UI.Error(err.Error())
-		return base.CommandUserError
-	}
-
 	if c.flagRecoveryKey != "" {
 		c.Config.DevRecoveryKey = c.flagRecoveryKey
 	}
diff --git a/internal/cmd/commands/server/server.go b/internal/cmd/commands/server/server.go
index ef4a498f6..f420f3b64 100644
--- a/internal/cmd/commands/server/server.go
+++ b/internal/cmd/commands/server/server.go
@@ -55,10 +55,6 @@ type Command struct {
 	reloadedCh   chan struct{}  // for tests
 	startedCh    chan struct{}  // for tests
 	presetConfig *atomic.String // for tests
-	// for tests -- Prometheus seems to use a global collector so if package
-	// tests are run it errors out even if they're not run in parallel 🙄 cause
-	// Go runs the tests within the same overall process
-	skipMetrics bool
 }
 
 func (c *Command) Synopsis() string {
@@ -162,13 +158,6 @@ func (c *Command) Run(args []string) int {
 
 	base.StartMemProfiler(c.Logger)
 
-	if !c.skipMetrics {
-		if err := c.SetupMetrics(c.UI, c.Config.Telemetry); err != nil {
-			c.UI.Error(err.Error())
-			return base.CommandUserError
-		}
-	}
-
 	if err := c.SetupKMSes(c.UI, c.Config); err != nil {
 		c.UI.Error(err.Error())
 		return base.CommandUserError
diff --git a/internal/cmd/commands/server/server_test.go b/internal/cmd/commands/server/server_test.go
index 939e51290..1a569eafa 100644
--- a/internal/cmd/commands/server/server_test.go
+++ b/internal/cmd/commands/server/server_test.go
@@ -22,11 +22,10 @@ func testServerCommand(t *testing.T, controllerKey string) *Command {
 	require := require.New(t)
 	t.Helper()
 	cmd := &Command{
-		Server:      base.NewServer(base.NewCommand(cli.NewMockUi())),
-		SighupCh:    base.MakeSighupCh(),
-		startedCh:   make(chan struct{}),
-		reloadedCh:  make(chan struct{}, 5),
-		skipMetrics: true,
+		Server:     base.NewServer(base.NewCommand(cli.NewMockUi())),
+		SighupCh:   base.MakeSighupCh(),
+		startedCh:  make(chan struct{}),
+		reloadedCh: make(chan struct{}, 5),
 	}
 
 	require.NoError(cmd.SetupLogging("trace", "", "", ""))