Merge branch 'main' into lporoli/fix-mergerclustertopologies

kontrol-service/api/analytics.go

@@ -19,16 +19,13 @@ const (
 )
 
 // NewAnalyticsWrapper creates a new AnalyticsWrapper
-func NewAnalyticsWrapper(isDevMode bool) *AnalyticsWrapper {
-	if !isDevMode {
-		// This is the Segment write key for the "kontrol-service" project. It is not
-		// a sensitive value, but it could be extracted to an env var in the future
-		// to separate dev and prod traffic if desired.
-		client := analytics.New("1TeZVRY3ta9VYaNknKTCCKBZtcBllE6U")
+func NewAnalyticsWrapper(isDevMode bool, writeKey string) *AnalyticsWrapper {
+	if !isDevMode && writeKey != "" {
+		client := analytics.New(writeKey)
 		logrus.Info("Segment analytics client initialized")
 		return &AnalyticsWrapper{client: &client}
 	}
-	logrus.Info("Dev mode: Segment analytics client not initialized")
+	logrus.Info("Dev mode or write key not set: Segment analytics client not initialized")
 	return &AnalyticsWrapper{client: nil}
 }
 

kontrol-service/main.go

@@ -15,16 +15,23 @@ import (
 )
 
 func main() {
-	devMode := flag.Bool("dev-mode", false, "Allow to run the service in local mode.")
+	var devMode bool
+	devMode = *flag.Bool("dev-mode", false, "Allow to run the service in local mode.")
+	if !devMode {
+		devModeEnvVarStr := os.Getenv("DEV_MODE")
+		if devModeEnvVarStr == "true" {
+			devMode = true
+		}
+	}
 
 	flag.Parse()
 
-	if *devMode {
+	if devMode {
 		logrus.Warn("Running in dev mode. CORS fully open.")
 		logrus.SetLevel(logrus.DebugLevel)
 	}
 
-	startServer(*devMode)
+	startServer(devMode)
 }
 
 func startServer(isDevMode bool) {
@@ -64,7 +71,8 @@ func startServer(isDevMode bool) {
 
 	// Create a new Segment analytics client instance.
 	// analyticsClient is not initialized in dev mode so events are not reported to Segment
-	analyticsWrapper := api.NewAnalyticsWrapper(isDevMode)
+	analyticsWriteKeyEnvVarStr := os.Getenv("ANALYTICS_WRITE_KEY")
+	analyticsWrapper := api.NewAnalyticsWrapper(isDevMode, analyticsWriteKeyEnvVarStr)
 	defer analyticsWrapper.Close()
 
 	// create a type that satisfies the `api.ServerInterface`, which contains an implementation of every operation from the generated code