Merge pull request #262 from dgageot/avoid-init

Avoid init functions

Author: dgageot

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,

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

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

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()
-}