Merge pull request #2279 from gtardif/desktop_uuid

dgageot · web-flow · commit 47cb9f8af9d4 · 2026-03-30T17:16:07.000+02:00
Add desktop_uuid in telemetry (next to user_uuid)
diff --git a/cmd/root/a2a.go b/cmd/root/a2a.go
@@ -36,9 +36,9 @@ func newA2ACmd() *cobra.Command {
 }
 
 func (f *a2aFlags) runA2ACommand(cmd *cobra.Command, args []string) error {
-	telemetry.TrackCommand("serve", append([]string{"a2a"}, args...))
-
 	ctx := cmd.Context()
+	telemetry.TrackCommand(ctx, "serve", append([]string{"a2a"}, args...))
+
 	out := cli.NewPrinter(cmd.OutOrStdout())
 	agentFilename := args[0]
 
diff --git a/cmd/root/acp.go b/cmd/root/acp.go
@@ -37,9 +37,9 @@ func newACPCmd() *cobra.Command {
 }
 
 func (f *acpFlags) runACPCommand(cmd *cobra.Command, args []string) error {
-	telemetry.TrackCommand("serve", append([]string{"acp"}, args...))
-
 	ctx := cmd.Context()
+	telemetry.TrackCommand(ctx, "serve", append([]string{"acp"}, args...))
+
 	agentFilename := args[0]
 
 	// Expand tilde in session database path
diff --git a/cmd/root/alias.go b/cmd/root/alias.go
@@ -112,7 +112,7 @@ func newAliasRemoveCmd() *cobra.Command {
 }
 
 func runAliasAddCommand(cmd *cobra.Command, args []string, flags *aliasAddFlags) error {
-	telemetry.TrackCommand("alias", append([]string{"add"}, args...))
+	telemetry.TrackCommand(cmd.Context(), "alias", append([]string{"add"}, args...))
 
 	out := cli.NewPrinter(cmd.OutOrStdout())
 	name := args[0]
@@ -179,7 +179,7 @@ func runAliasAddCommand(cmd *cobra.Command, args []string, flags *aliasAddFlags)
 }
 
 func runAliasListCommand(cmd *cobra.Command, args []string) error {
-	telemetry.TrackCommand("alias", append([]string{"list"}, args...))
+	telemetry.TrackCommand(cmd.Context(), "alias", append([]string{"list"}, args...))
 
 	out := cli.NewPrinter(cmd.OutOrStdout())
 
@@ -235,7 +235,7 @@ func runAliasListCommand(cmd *cobra.Command, args []string) error {
 }
 
 func runAliasRemoveCommand(cmd *cobra.Command, args []string) error {
-	telemetry.TrackCommand("alias", append([]string{"remove"}, args...))
+	telemetry.TrackCommand(cmd.Context(), "alias", append([]string{"remove"}, args...))
 
 	out := cli.NewPrinter(cmd.OutOrStdout())
 	name := args[0]
diff --git a/cmd/root/api.go b/cmd/root/api.go
@@ -47,9 +47,8 @@ func newAPICmd() *cobra.Command {
 }
 
 func (f *apiFlags) runAPICommand(cmd *cobra.Command, args []string) error {
-	telemetry.TrackCommand("serve", append([]string{"api"}, args...))
-
 	ctx := cmd.Context()
+	telemetry.TrackCommand(ctx, "serve", append([]string{"api"}, args...))
 
 	out := cli.NewPrinter(cmd.OutOrStdout())
 	agentsPath := args[0]
diff --git a/cmd/root/debug.go b/cmd/root/debug.go
@@ -76,7 +76,7 @@ func (f *debugFlags) loadTeam(ctx context.Context, agentFilename string, opts ..
 }
 
 func (f *debugFlags) runDebugConfigCommand(cmd *cobra.Command, args []string) error {
-	telemetry.TrackCommand("debug", append([]string{"config"}, args...))
+	telemetry.TrackCommand(cmd.Context(), "debug", append([]string{"config"}, args...))
 
 	agentSource, err := config.Resolve(args[0], f.runConfig.EnvProvider())
 	if err != nil {
@@ -92,7 +92,7 @@ func (f *debugFlags) runDebugConfigCommand(cmd *cobra.Command, args []string) er
 }
 
 func (f *debugFlags) runDebugToolsetsCommand(cmd *cobra.Command, args []string) error {
-	telemetry.TrackCommand("debug", append([]string{"toolsets"}, args...))
+	telemetry.TrackCommand(cmd.Context(), "debug", append([]string{"toolsets"}, args...))
 
 	ctx := cmd.Context()
 
@@ -132,7 +132,7 @@ func (f *debugFlags) runDebugToolsetsCommand(cmd *cobra.Command, args []string)
 }
 
 func (f *debugFlags) runDebugTitleCommand(cmd *cobra.Command, args []string) error {
-	telemetry.TrackCommand("debug", append([]string{"title"}, args...))
+	telemetry.TrackCommand(cmd.Context(), "debug", append([]string{"title"}, args...))
 
 	ctx := cmd.Context()
 
diff --git a/cmd/root/debug_auth.go b/cmd/root/debug_auth.go
@@ -33,9 +33,9 @@ func newDebugAuthCmd() *cobra.Command {
 		Short: "Print Docker Desktop authentication information",
 		Args:  cobra.NoArgs,
 		RunE: func(cmd *cobra.Command, _ []string) error {
-			telemetry.TrackCommand("debug", []string{"auth"})
-
 			ctx := cmd.Context()
+			telemetry.TrackCommand(ctx, "debug", []string{"auth"})
+
 			w := cmd.OutOrStdout()
 
 			token := desktop.GetToken(ctx)
diff --git a/cmd/root/eval.go b/cmd/root/eval.go
@@ -50,7 +50,7 @@ func newEvalCmd() *cobra.Command {
 }
 
 func (f *evalFlags) runEvalCommand(cmd *cobra.Command, args []string) error {
-	telemetry.TrackCommand("eval", args)
+	telemetry.TrackCommand(cmd.Context(), "eval", args)
 
 	ctx := cmd.Context()
 	agentFilename := args[0]
diff --git a/cmd/root/mcp.go b/cmd/root/mcp.go
@@ -39,9 +39,9 @@ func newMCPCmd() *cobra.Command {
 }
 
 func (f *mcpFlags) runMCPCommand(cmd *cobra.Command, args []string) error {
-	telemetry.TrackCommand("serve", append([]string{"mcp"}, args...))
-
 	ctx := cmd.Context()
+	telemetry.TrackCommand(ctx, "serve", append([]string{"mcp"}, args...))
+
 	agentFilename := args[0]
 
 	if !f.http {
diff --git a/cmd/root/new.go b/cmd/root/new.go
@@ -51,9 +51,8 @@ Optionally provide a description as an argument to skip the initial prompt.`,
 }
 
 func (f *newFlags) runNewCommand(cmd *cobra.Command, args []string) error {
-	telemetry.TrackCommand("new", args)
-
 	ctx := cmd.Context()
+	telemetry.TrackCommand(ctx, "new", args)
 
 	t, err := creator.Agent(ctx, &f.runConfig, f.modelParam)
 	if err != nil {
diff --git a/cmd/root/pull.go b/cmd/root/pull.go
@@ -35,9 +35,9 @@ func newPullCmd() *cobra.Command {
 }
 
 func (f *pullFlags) runPullCommand(cmd *cobra.Command, args []string) error {
-	telemetry.TrackCommand("share", append([]string{"pull"}, args...))
-
 	ctx := cmd.Context()
+	telemetry.TrackCommand(ctx, "share", append([]string{"pull"}, args...))
+
 	out := cli.NewPrinter(cmd.OutOrStdout())
 	registryRef := args[0]
 	slog.Debug("Starting pull", "registry_ref", registryRef)
diff --git a/cmd/root/push.go b/cmd/root/push.go
@@ -25,9 +25,9 @@ func newPushCmd() *cobra.Command {
 }
 
 func runPushCommand(cmd *cobra.Command, args []string) error {
-	telemetry.TrackCommand("share", append([]string{"push"}, args...))
-
 	ctx := cmd.Context()
+	telemetry.TrackCommand(ctx, "share", append([]string{"push"}, args...))
+
 	agentFilename := args[0]
 	tag := args[1]
 	out := cli.NewPrinter(cmd.OutOrStdout())
diff --git a/cmd/root/run.go b/cmd/root/run.go
@@ -133,13 +133,14 @@ func (f *runExecFlags) runRunCommand(cmd *cobra.Command, args []string) error {
 		return runInSandbox(cmd, &f.runConfig, f.sandboxTemplate)
 	}
 
+	ctx := cmd.Context()
+
 	if f.exec {
-		telemetry.TrackCommand("exec", args)
+		telemetry.TrackCommand(ctx, "exec", args)
 	} else {
-		telemetry.TrackCommand("run", args)
+		telemetry.TrackCommand(ctx, "run", args)
 	}
 
-	ctx := cmd.Context()
 	out := cli.NewPrinter(cmd.OutOrStdout())
 
 	useTUI := !f.exec && (f.forceTUI || isatty.IsTerminal(os.Stdout.Fd()))
diff --git a/cmd/root/version.go b/cmd/root/version.go
@@ -20,7 +20,7 @@ func newVersionCmd() *cobra.Command {
 }
 
 func runVersionCommand(cmd *cobra.Command, args []string) {
-	telemetry.TrackCommand("version", args)
+	telemetry.TrackCommand(cmd.Context(), "version", args)
 
 	out := cli.NewPrinter(cmd.OutOrStdout())
 
diff --git a/pkg/cli/runner.go b/pkg/cli/runner.go
@@ -85,8 +85,8 @@ func Run(ctx context.Context, out *Printer, cfg Config, rt runtime.Runtime, sess
 	defer cancel()
 
 	// Ensure telemetry is initialized and add to context so runtime can access it
-	telemetry.EnsureGlobalTelemetryInitialized()
-	if telemetryClient := telemetry.GetGlobalTelemetryClient(); telemetryClient != nil {
+	telemetry.EnsureGlobalTelemetryInitialized(ctx)
+	if telemetryClient := telemetry.GetGlobalTelemetryClient(ctx); telemetryClient != nil {
 		ctx = telemetry.WithClient(ctx, telemetryClient)
 	}
 
diff --git a/pkg/desktop/login.go b/pkg/desktop/login.go
@@ -1,6 +1,8 @@
 package desktop
 
-import "context"
+import (
+	"context"
+)
 
 type DockerHubInfo struct {
 	Username string `json:"id"`
diff --git a/pkg/desktop/uuid.go b/pkg/desktop/uuid.go
@@ -0,0 +1,19 @@
+package desktop
+
+import (
+	"context"
+
+	"github.com/kofalt/go-memoize"
+	"github.com/patrickmn/go-cache"
+)
+
+var uuidMmemoizer = memoize.NewMemoizer(cache.NoExpiration, cache.NoExpiration)
+
+func GetUUID(ctx context.Context) string {
+	uuid, _, _ := uuidMmemoizer.Memoize("desktopUUID", func() (any, error) {
+		var uuid string
+		_ = ClientBackend.Get(ctx, "/uuid", &uuid)
+		return uuid, nil
+	})
+	return uuid.(string)
+}
diff --git a/pkg/telemetry/client.go b/pkg/telemetry/client.go
@@ -5,6 +5,8 @@ import (
 	"log/slog"
 	"net/http"
 	"time"
+
+	"github.com/docker/docker-agent/pkg/desktop"
 )
 
 // telemetryLogger wraps slog.Logger to automatically prepend "[Telemetry]" to all messages
@@ -42,7 +44,7 @@ func (tl *telemetryLogger) Enabled(ctx context.Context, level slog.Level) bool {
 	return tl.logger.Enabled(ctx, level)
 }
 
-func newClient(logger *slog.Logger, enabled, debugMode bool, version string, customHTTPClient ...*http.Client) *Client {
+func newClient(ctx context.Context, logger *slog.Logger, enabled, debugMode bool, version string, customHTTPClient ...*http.Client) *Client {
 	telemetryLogger := NewTelemetryLogger(logger)
 
 	if !enabled {
@@ -72,15 +74,16 @@ func newClient(logger *slog.Logger, enabled, debugMode bool, version string, cus
 	}
 
 	client := &Client{
-		logger:     telemetryLogger,
-		userUUID:   getUserUUID(),
-		enabled:    enabled,
-		debugMode:  debugMode,
-		httpClient: httpClient,
-		endpoint:   endpoint,
-		apiKey:     apiKey,
-		header:     header,
-		version:    version,
+		logger:      telemetryLogger,
+		userUUID:    getUserUUID(),
+		desktopUUID: desktop.GetUUID(ctx),
+		enabled:     enabled,
+		debugMode:   debugMode,
+		httpClient:  httpClient,
+		endpoint:    endpoint,
+		apiKey:      apiKey,
+		header:      header,
+		version:     version,
 	}
 
 	telemetryLogger.Debug("Enabled:", enabled)
diff --git a/pkg/telemetry/global.go b/pkg/telemetry/global.go
@@ -7,12 +7,11 @@ import (
 )
 
 // TrackCommand records a command event using automatic telemetry initialization
-func TrackCommand(action string, args []string) {
+func TrackCommand(ctx context.Context, action string, args []string) {
 	// Automatically initialize telemetry if not already done
-	EnsureGlobalTelemetryInitialized()
+	EnsureGlobalTelemetryInitialized(ctx)
 
 	if globalToolTelemetryClient != nil {
-		ctx := context.Background()
 		commandEvent := CommandEvent{
 			Action:  action,
 			Args:    args,
@@ -32,8 +31,8 @@ var (
 )
 
 // GetGlobalTelemetryClient returns the global telemetry client for adding to context
-func GetGlobalTelemetryClient() *Client {
-	EnsureGlobalTelemetryInitialized()
+func GetGlobalTelemetryClient(ctx context.Context) *Client {
+	EnsureGlobalTelemetryInitialized(ctx)
 	return globalToolTelemetryClient
 }
 
@@ -61,7 +60,7 @@ func SetGlobalTelemetryDebugMode(debug bool) {
 
 // EnsureGlobalTelemetryInitialized ensures telemetry is initialized exactly once
 // This handles all the setup automatically - no explicit initialization needed
-func EnsureGlobalTelemetryInitialized() {
+func EnsureGlobalTelemetryInitialized(ctx context.Context) {
 	globalTelemetryOnce.Do(func() {
 		// Read global settings under the lock
 		globalMu.RLock()
@@ -75,7 +74,7 @@ func EnsureGlobalTelemetryInitialized() {
 		// Get telemetry enabled setting
 		enabled := GetTelemetryEnabled()
 
-		client := newClient(logger, enabled, debugMode, version)
+		client := newClient(ctx, logger, enabled, debugMode, version)
 
 		globalToolTelemetryClient = client
 
diff --git a/pkg/telemetry/http.go b/pkg/telemetry/http.go
@@ -34,6 +34,7 @@ func (tc *Client) createEvent(eventName string, properties map[string]any) Event
 
 	// Add system metadata AFTER tags so they cannot be overwritten
 	allProperties["user_uuid"] = tc.userUUID
+	allProperties["desktop_uuid"] = tc.desktopUUID
 	allProperties["version"] = tc.getVersion()
 	allProperties["os"] = osInfo
 	allProperties["os_language"] = osLanguage
diff --git a/pkg/telemetry/telemetry_test.go b/pkg/telemetry/telemetry_test.go
diff --git a/pkg/telemetry/types.go b/pkg/telemetry/types.go

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ func newAliasRemoveCmd() *cobra.Command {`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`func runAliasAddCommand(cmd cobra.Command, args []string, flags aliasAddFlags) error {`
`115`		`- telemetry.TrackCommand("alias", append([]string{"add"}, args...))`
	`115`	`+ telemetry.TrackCommand(cmd.Context(), "alias", append([]string{"add"}, args...))`
`116`	`116`
`117`	`117`	`out := cli.NewPrinter(cmd.OutOrStdout())`
`118`	`118`	`name := args[0]`
`@@ -179,7 +179,7 @@ func runAliasAddCommand(cmd cobra.Command, args []string, flags aliasAddFlags)`
`179`	`179`	`}`
`180`	`180`
`181`	`181`	`func runAliasListCommand(cmd *cobra.Command, args []string) error {`
`182`		`- telemetry.TrackCommand("alias", append([]string{"list"}, args...))`
	`182`	`+ telemetry.TrackCommand(cmd.Context(), "alias", append([]string{"list"}, args...))`
`183`	`183`
`184`	`184`	`out := cli.NewPrinter(cmd.OutOrStdout())`
`185`	`185`
`@@ -235,7 +235,7 @@ func runAliasListCommand(cmd *cobra.Command, args []string) error {`
`235`	`235`	`}`
`236`	`236`
`237`	`237`	`func runAliasRemoveCommand(cmd *cobra.Command, args []string) error {`
`238`		`- telemetry.TrackCommand("alias", append([]string{"remove"}, args...))`
	`238`	`+ telemetry.TrackCommand(cmd.Context(), "alias", append([]string{"remove"}, args...))`
`239`	`239`
`240`	`240`	`out := cli.NewPrinter(cmd.OutOrStdout())`
`241`	`241`	`name := args[0]`
Original file line number	Diff line number	Diff line change
`@@ -47,9 +47,8 @@ func newAPICmd() *cobra.Command {`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`func (f apiFlags) runAPICommand(cmd cobra.Command, args []string) error {`
`50`		`- telemetry.TrackCommand("serve", append([]string{"api"}, args...))`
`51`		`-`
`52`	`50`	`ctx := cmd.Context()`
	`51`	`+ telemetry.TrackCommand(ctx, "serve", append([]string{"api"}, args...))`
`53`	`52`
`54`	`53`	`out := cli.NewPrinter(cmd.OutOrStdout())`
`55`	`54`	`agentsPath := args[0]`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ func (f *debugFlags) loadTeam(ctx context.Context, agentFilename string, opts ..`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`func (f debugFlags) runDebugConfigCommand(cmd cobra.Command, args []string) error {`
`79`		`- telemetry.TrackCommand("debug", append([]string{"config"}, args...))`
	`79`	`+ telemetry.TrackCommand(cmd.Context(), "debug", append([]string{"config"}, args...))`
`80`	`80`
`81`	`81`	`agentSource, err := config.Resolve(args[0], f.runConfig.EnvProvider())`
`82`	`82`	`if err != nil {`
`@@ -92,7 +92,7 @@ func (f debugFlags) runDebugConfigCommand(cmd cobra.Command, args []string) er`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`func (f debugFlags) runDebugToolsetsCommand(cmd cobra.Command, args []string) error {`
`95`		`- telemetry.TrackCommand("debug", append([]string{"toolsets"}, args...))`
	`95`	`+ telemetry.TrackCommand(cmd.Context(), "debug", append([]string{"toolsets"}, args...))`
`96`	`96`
`97`	`97`	`ctx := cmd.Context()`
`98`	`98`
`@@ -132,7 +132,7 @@ func (f debugFlags) runDebugToolsetsCommand(cmd cobra.Command, args []string)`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`func (f debugFlags) runDebugTitleCommand(cmd cobra.Command, args []string) error {`
`135`		`- telemetry.TrackCommand("debug", append([]string{"title"}, args...))`
	`135`	`+ telemetry.TrackCommand(cmd.Context(), "debug", append([]string{"title"}, args...))`
`136`	`136`
`137`	`137`	`ctx := cmd.Context()`
`138`	`138`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ func newEvalCmd() *cobra.Command {`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`func (f evalFlags) runEvalCommand(cmd cobra.Command, args []string) error {`
`53`		`- telemetry.TrackCommand("eval", args)`
	`53`	`+ telemetry.TrackCommand(cmd.Context(), "eval", args)`
`54`	`54`
`55`	`55`	`ctx := cmd.Context()`
`56`	`56`	`agentFilename := args[0]`
Original file line number	Diff line number	Diff line change
@@ -51,9 +51,8 @@ Optionally provide a description as an argument to skip the initial prompt.`,
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`func (f newFlags) runNewCommand(cmd cobra.Command, args []string) error {`
`54`		`- telemetry.TrackCommand("new", args)`
`55`		`-`
`56`	`54`	`ctx := cmd.Context()`
	`55`	`+ telemetry.TrackCommand(ctx, "new", args)`
`57`	`56`
`58`	`57`	`t, err := creator.Agent(ctx, &f.runConfig, f.modelParam)`
`59`	`58`	`if err != nil {`