fix: Retry reporting agent version (#4190)

kylecarbs · web-flow · commit 413bfb8d58a7 · 2022-09-25T11:11:36.000-05:00
It's possible that an agent starts before a build is reported as complete. This ensures the version is successfully sent before the startup completes. Fixes #4151.
diff --git a/cli/agent.go b/cli/agent.go
@@ -168,6 +168,18 @@ func workspaceAgent() *cobra.Command {
 				}
 			}
 
+			ctx, cancelFunc := context.WithTimeout(cmd.Context(), time.Hour)
+			defer cancelFunc()
+			for retry.New(100*time.Millisecond, 5*time.Second).Wait(ctx) {
+				err := client.PostWorkspaceAgentVersion(cmd.Context(), version)
+				if err != nil {
+					logger.Warn(cmd.Context(), "post agent version: %w", slog.Error(err), slog.F("version", version))
+					continue
+				}
+				logger.Info(ctx, "updated agent version", slog.F("version", version))
+				break
+			}
+
 			executablePath, err := os.Executable()
 			if err != nil {
 				return xerrors.Errorf("getting os executable: %w", err)
@@ -177,10 +189,6 @@ func workspaceAgent() *cobra.Command {
 				return xerrors.Errorf("add executable to $PATH: %w", err)
 			}
 
-			if err := client.PostWorkspaceAgentVersion(cmd.Context(), version); err != nil {
-				logger.Error(cmd.Context(), "post agent version: %w", slog.Error(err), slog.F("version", version))
-			}
-
 			closer := agent.New(agent.Options{
 				FetchMetadata: client.WorkspaceAgentMetadata,
 				Logger:        logger,
