chore: re-add script timings

coder · DanielleMaywood · Jun 25, 2025 · Jun 20, 2025 · Jun 20, 2025 · Jun 20, 2025
commit 91bb43af35d52a9052f0bb08dedcfe1772377b8c
diff --git a/agent/agent.go b/agent/agent.go
@@ -89,6 +89,7 @@
 	ServiceBannerRefreshInterval time.Duration
 	BlockFileTransfer            bool
 	Execer                       agentexec.Execer
+	Clock                        quartz.Clock
 
 	ExperimentalDevcontainersEnabled bool
 	ContainerAPIOptions              []agentcontainers.Option // Enable ExperimentalDevcontainersEnabled for these to be effective.
@@ -145,6 +146,9 @@
 	if options.PortCacheDuration == 0 {
 		options.PortCacheDuration = 1 * time.Second
 	}
+	if options.Clock == nil {
+		options.Clock = quartz.NewReal()
+	}
 
 	prometheusRegistry := options.PrometheusRegistry
 	if prometheusRegistry == nil {
@@ -158,6 +162,7 @@
 	hardCtx, hardCancel := context.WithCancel(context.Background())
 	gracefulCtx, gracefulCancel := context.WithCancel(hardCtx)
 	a := &agent{
+		clock:                              options.Clock,
 		tailnetListenPort:                  options.TailnetListenPort,
 		reconnectingPTYTimeout:             options.ReconnectingPTYTimeout,
 		logger:                             options.Logger,
@@ -205,6 +210,7 @@
 }
 
 type agent struct {
+	clock             quartz.Clock
 	logger        
8000
    slog.Logger
 	client            Client
 	exchangeToken     func(ctx context.Context) (string, error)
@@ -1124,7 +1130,7 @@
 		sentResult = true

 		// The startup script should only execute on the first run!
 		if oldManifest == nil {
 			a.setLifecycle(codersdk.WorkspaceAgentLifecycleStarting)

 			// Perform overrides early so that Git auth can work even if users
@@ -1142,9 +1148,13 @@
 			}
 
 			var (
-				scripts          = manifest.Scripts
-				scriptRunnerOpts []agentscripts.InitOption
+				scripts             = manifest.Scripts
+				scriptRunnerOpts    []agentscripts.InitOption
+				devcontainerScripts map[uuid.UUID]codersdk.WorkspaceAgentScript
 			)
+			if a.experimentalDevcontainersEnabled {
+				scripts, devcontainerScripts = agentcontainers.ExtractDevcontainerScripts(manifest.Devcontainers, scripts)
+			}
 			err = a.scriptRunner.Init(scripts, aAPI.ScriptCompleted, scriptRunnerOpts...)
 			if err != nil {
 				return xerrors.Errorf("init script runner: %w", err)
@@ -1165,7 +1175,28 @@
 
 				if cAPI := a.containerAPI.Load(); cAPI != nil {
 					for _, dc := range manifest.Devcontainers {
-						err = errors.Join(err, cAPI.CreateDevcontainer(dc))
+						var (
+							script    = devcontainerScripts[dc.ID]
+							exitCode  = int32(0)
+							startTime = a.clock.Now()
+						)
+						if cErr := cAPI.CreateDevcontainer(dc); cErr != nil {
+							exitCode = 1
+							err = errors.Join(err, cErr)
+						}
+						endTime := a.clock.Now()
+
+						if _, scriptErr := aAPI.ScriptCompleted(ctx, &proto.WorkspaceAgentScriptCompletedRequest{
+							Timing: &proto.Timing{
+								ScriptId: script.ID[:],
+								Start:    timestamppb.New(startTime),
+								End:      timestamppb.New(endTime),
+								ExitCode: exitCode,
+								Stage:    proto.Timing_START,
+							},
+						}); scriptErr != nil {
+							a.logger.Warn(ctx, "reporting script completed failed", slog.Error(scriptErr))
+						}
 					}
 				}
 

diff --git a/agent/agentcontainers/devcontainer.go b/agent/agentcontainers/devcontainer.go
@@ -7,6 +7,7 @@ import (
 
 	"cdr.dev/slog"
 	"github.com/coder/coder/v2/codersdk"
+	"github.com/google/uuid"
 )
 
 const (
@@ -20,6 +21,28 @@ const (
 	DevcontainerDefaultContainerWorkspaceFolder = "/workspaces"
 )
 
+func ExtractDevcontainerScripts(
+	devcontainers []codersdk.WorkspaceAgentDevcontainer,
+	scripts []codersdk.WorkspaceAgentScript,
+) (filteredScripts []codersdk.WorkspaceAgentScript, devcontainerScripts map[uuid.UUID]codersdk.WorkspaceAgentScript) {
+	devcontainerScripts = make(map[uuid.UUID]codersdk.WorkspaceAgentScript)
+ScriptLoop:
+	for _, script := range scripts {
+		for _, dc := range devcontainers {
+			// The devcontainer scripts match the devcontainer ID for
+			// identification.
+			if script.ID == dc.ID {
+				devcontainerScripts[dc.ID] = script
+				continue ScriptLoop
+			}
+		}
+
+		filteredScripts = append(filteredScripts, script)
+	}
+
+	return filteredScripts, devcontainerScripts
+}
+
 // ExpandAllDevcontainerPaths expands all devcontainer paths in the given
 // devcontainers. This is required by the devcontainer CLI, which requires
 // absolute paths for the workspace folder and config path.