cli: use the gitpod endpoint for analytics (#19109)

* cli: use the gitpod endpoint for analytics * Remove gitpod.io constraint * Remove unused tomfoolery * bump version
gitpod-io · Nov 24, 2023 · 96a480c · 96a480c
1 parent b6fa451
commit 96a480c
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 21 deletions.
diff --git a/components/local-app/cmd/root.go b/components/local-app/cmd/root.go
@@ -92,13 +92,15 @@ var rootCmd = &cobra.Command{
 		}
 		cmd.SetContext(config.ToContext(context.Background(), cfg))
 
+		host := "https://gitpod.io"
 		telemetryEnabled := !telemetry.DoNotTrack()
 		telemetryEnabled = telemetryEnabled && cfg.Telemetry.Enabled
 		// For now we only enable telemetry on gitpod.io
-		if gpctx, err := cfg.GetActiveContext(); err == nil && gpctx != nil {
-			telemetryEnabled = telemetryEnabled && gpctx.Host.String() == "https://gitpod.io"
+		gpctx, err := cfg.GetActiveContext()
+		if err == nil && gpctx != nil {
+			host = gpctx.Host.String()
 		}
-		telemetry.Init(telemetryEnabled, cfg.Telemetry.Identity, constants.Version.String(), level)
+		telemetry.Init(telemetryEnabled, cfg.Telemetry.Identity, constants.Version.String(), level, host)
 		telemetry.RecordCommand(cmd)
 
 		if !isVersionCommand(cmd) {

diff --git a/components/local-app/pkg/telemetry/telemetry.go b/components/local-app/pkg/telemetry/telemetry.go
@@ -24,9 +24,6 @@ import (
 	"golang.org/x/exp/slices"
 )
 
-// Injected at build time
-var segmentKey = "TgiJIVvFsBGwmxbnnt5NeeDaian9nr3n"
-
 var opts struct {
 	Enabled  bool
 	Identity string
@@ -36,7 +33,7 @@ var opts struct {
 }
 
 // Init initializes the telemetry
-func Init(enabled bool, identity, version string, logLevel slog.Level) {
+func Init(enabled bool, identity, version string, logLevel slog.Level, host string) {
 	opts.Enabled = enabled
 	if !enabled {
 		return
@@ -45,20 +42,19 @@ func Init(enabled bool, identity, version string, logLevel slog.Level) {
 	opts.Version = version
 	opts.Identity = identity
 
-	if segmentKey != "" {
-		var logger segment.Logger
-		if logLevel == slog.LevelDebug {
-			logger = segment.StdLogger(log.New(os.Stderr, "telemetry ", log.LstdFlags))
-		} else {
-			// we don't want to log anything
-			log := log.New(os.Stderr, "telemetry ", log.LstdFlags)
-			log.SetOutput(io.Discard)
-			logger = segment.StdLogger(log)
-		}
-		opts.client, _ = segment.NewWithConfig(segmentKey, segment.Config{
-			Logger: logger,
-		})
+	var logger segment.Logger
+	if logLevel == slog.LevelDebug {
+		logger = segment.StdLogger(log.New(os.Stderr, "telemetry ", log.LstdFlags))
+	} else {
+		// we don't want to log anything
+		log := log.New(os.Stderr, "telemetry ", log.LstdFlags)
+		log.SetOutput(io.Discard)
+		logger = segment.StdLogger(log)
 	}
+	opts.client, _ = segment.NewWithConfig("untrusted-dummy-key", segment.Config{
+		Logger:   logger,
+		Endpoint: host + "/analytics",
+	})
 }
 
 // DoNotTrack returns true if the user opted out of telemetry

diff --git a/components/local-app/version.txt b/components/local-app/version.txt
@@ -1 +1 @@
-0.1.2
+0.1.3