From 0114c642f0280600178f329cb81a479eb7e9c65b Mon Sep 17 00:00:00 2001
From: David Gageot <david.gageot@docker.com>
Date: Sat, 20 Sep 2025 12:17:16 +0200
Subject: [PATCH] Avoid init functions

Signed-off-by: David Gageot <david.gageot@docker.com>
---
 pkg/telemetry/client.go | 1 +
 pkg/telemetry/http.go   | 2 +-
 pkg/telemetry/types.go  | 1 +
 pkg/telemetry/utils.go  | 7 -------
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/pkg/telemetry/client.go b/pkg/telemetry/client.go
index d166f9dae..129493cf1 100644
--- a/pkg/telemetry/client.go
+++ b/pkg/telemetry/client.go
@@ -66,6 +66,7 @@ func NewClient(logger *slog.Logger, enabled, debugMode bool, version string, cus
 
 	client := &Client{
 		logger:     telemetryLogger,
+		userUUID:   getUserUUID(),
 		enabled:    enabled,
 		debugMode:  debugMode,
 		httpClient: httpClient,
diff --git a/pkg/telemetry/http.go b/pkg/telemetry/http.go
index 776c3bc96..039a59daa 100644
--- a/pkg/telemetry/http.go
+++ b/pkg/telemetry/http.go
@@ -23,7 +23,7 @@ func (tc *Client) createEvent(eventName string, properties map[string]any) Event
 	}
 
 	// Add system metadata to properties
-	allProperties["user_uuid"] = userUUID
+	allProperties["user_uuid"] = tc.userUUID
 	allProperties["version"] = tc.version
 	allProperties["os"] = osInfo
 	allProperties["os_language"] = osLanguage
diff --git a/pkg/telemetry/types.go b/pkg/telemetry/types.go
index 4c45161eb..2ee3275ba 100644
--- a/pkg/telemetry/types.go
+++ b/pkg/telemetry/types.go
@@ -259,6 +259,7 @@ type HTTPClient interface {
 // Client provides simplified telemetry functionality for cagent
 type Client struct {
 	logger     *telemetryLogger
+	userUUID   string
 	enabled    bool
 	debugMode  bool // Print to stdout instead of sending
 	httpClient HTTPClient
diff --git a/pkg/telemetry/utils.go b/pkg/telemetry/utils.go
index 20e4e8877..ccd944b65 100644
--- a/pkg/telemetry/utils.go
+++ b/pkg/telemetry/utils.go
@@ -13,8 +13,6 @@ import (
 	"github.com/spf13/cobra"
 )
 
-var userUUID string
-
 // Build-time telemetry configuration (set via -ldflags)
 var (
 	TelemetryEnabled  = "true" // Default enabled
@@ -183,8 +181,3 @@ func BuildCommandInfo(cmd *cobra.Command, args []string, baseName string) Comman
 
 	return info
 }
-
-// init generates UUIDs once per process
-func init() {
-	userUUID = getUserUUID()
-}