Update data sent to vercel for runs

cli/internal/runsummary/execution_summary.go

@@ -72,6 +72,10 @@ type TaskExecutionSummary struct {
 	exitCode *int               // pointer so we can distinguish between 0 and unknown.
 }
 
+func (ts *TaskExecutionSummary) endTime() time.Time {
+	return ts.startAt.Add(ts.Duration)
+}
+
 // MarshalJSON munges the TaskExecutionSummary into a format we want
 // We'll use an anonmyous, private struct for this, so it's not confusingly duplicated
 func (ts *TaskExecutionSummary) MarshalJSON() ([]byte, error) {
@@ -82,7 +86,7 @@ func (ts *TaskExecutionSummary) MarshalJSON() ([]byte, error) {
 		ExitCode *int  `json:"exitCode"`
 	}{
 		Start:    ts.startAt.UnixMilli(),
-		End:      ts.startAt.Add(ts.Duration).UnixMilli(),
+		End:      ts.endTime().UnixMilli(),
 		Err:      ts.err,
 		ExitCode: ts.exitCode,
 	}

cli/internal/runsummary/run_summary.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"path/filepath"
+	"strings"
 	"sync"
 	"time"
 
@@ -26,6 +27,7 @@ const MissingFrameworkLabel = "<NO FRAMEWORK DETECTED>"
 
 const runSummarySchemaVersion = "0"
 const runsEndpoint = "/v0/spaces/%s/runs"
+const runsPatchEndpoint = "/v0/spaces/%s/runs/%s"
 const tasksEndpoint = "/v0/spaces/%s/runs/%s/tasks"
 
 type runType int
@@ -144,8 +146,11 @@ func (rsm *Meta) Close(exitCode int, workspaceInfos workspace.Catalog) error {
 
 	if rsm.shouldSave {
 		if rsm.spaceID != "" && rsm.apiClient.IsLinked() {
-			if err := rsm.record(); err != nil {
-				rsm.ui.Warn(fmt.Sprintf("Error recording Run to Vercel: %v", err))
+			if errs := rsm.record(); len(errs) > 0 {
+				rsm.ui.Warn("Errors recording run to Vercel")
+				for _, err := range errs {
+					rsm.ui.Warn(fmt.Sprintf("%v", err))
+				}
 			}
 		}
 	}
@@ -176,6 +181,16 @@ func (summary *RunSummary) TrackTask(taskID string) (func(outcome executionEvent
 	return summary.ExecutionSummary.run(taskID)
 }
 
+// command returns a best guess command for the entire Run.
+// TODO: we should thread this through from the entry point rather than make it up
+func (summary *RunSummary) command() string {
+	taskNames := make(util.Set, len(summary.Tasks))
+	for _, task := range summary.Tasks {
+		taskNames.Add(task.Task)
+	}
+	return fmt.Sprintf("turbo run %s", strings.Join(taskNames.UnsafeListOfStrings(), " "))
+}
+
 // Save saves the run summary to a file
 func (rsm *Meta) save() error {
 	json, err := rsm.FormatJSON()
@@ -222,7 +237,8 @@ func (rsm *Meta) record() []error {
 		rsm.postTaskSummaries(runID)
 
 		if donePayload, err := json.Marshal(newVercelDonePayload(rsm.RunSummary)); err == nil {
-			if _, err := rsm.apiClient.JSONPatch(runsURL, donePayload); err != nil {
+			patchURL := fmt.Sprintf(runsPatchEndpoint, rsm.spaceID, runID)
+			if _, err := rsm.apiClient.JSONPatch(patchURL, donePayload); err != nil {
 				errs = append(errs, err)
 			}
 		}
@@ -235,7 +251,8 @@ func (rsm *Meta) record() []error {
 	return nil
 }
 
-func (rsm *Meta) postTaskSummaries(runID string) {
+func (rsm *Meta) postTaskSummaries(runID string) []error {
+	errs := []error{}
 	// We make at most 8 requests at a time.
 	maxParallelRequests := 8
 	taskSummaries := rsm.RunSummary.Tasks
@@ -256,9 +273,10 @@ func (rsm *Meta) postTaskSummaries(runID string) {
 			defer wg.Done()
 			for index := range queue {
 				task := taskSummaries[index]
-				if taskPayload, err := json.Marshal(task); err == nil {
+				payload := newVercelTaskPayload(task)
+				if taskPayload, err := json.Marshal(payload); err == nil {
 					if _, err := rsm.apiClient.JSONPost(taskURL, taskPayload); err != nil {
-						rsm.ui.Warn(fmt.Sprintf("Eror uploading summary of %s", task.TaskID))
+						errs = append(errs, fmt.Errorf("Eror uploading summary of %s", task.TaskID))
 					}
 				}
 			}
@@ -270,4 +288,10 @@ func (rsm *Meta) postTaskSummaries(runID string) {
 	}
 	close(queue)
 	wg.Wait()
+
+	if len(errs) > 0 {
+		return errs
+	}
+
+	return nil
 }

cli/internal/runsummary/vercel.go

@@ -1,5 +1,9 @@
 package runsummary
 
+import (
+	"github.com/vercel/turbo/cli/internal/ci"
+)
+
 type vercelRunResponse struct {
 	ID string
 }
@@ -22,20 +26,49 @@ type vercelRunPayload struct {
 
 	// ExitCode is the exit code for the full run
 	ExitCode int `json:"exitCode,omitempty"`
+
+	// The command that kicked off the turbo run
+	Command string `json:"command,omitempty"`
+
+	// Context is the host on which this Run was executed (e.g. Vercel)
+	Context string `json:"context,omitempty"`
+
 	// TODO: we need to add these in
 	// originationUser string
 	// gitBranch       string
 	// gitSha          string
-	// context         string
-	// command         string
+}
+
+type vercelCacheStatus struct {
+	Status string `json:"status,omitempty"`
+	Source string `json:"source,omitempty"`
+}
+
+type vercelTask struct {
+	Key          string            `json:"key,omitempty"`
+	Name         string            `json:"name,omitempty"`
+	Workspace    string            `json:"workspace,omitempty"`
+	Hash         string            `json:"hash,omitempty"`
+	StartTime    int               `json:"startTime,omitempty"`
+	EndTime      int               `json:"endTime,omitempty"`
+	Cache        vercelCacheStatus `json:"cache,omitempty"`
+	ExitCode     int               `json:"exitCode,omitempty"`
+	Dependencies []string          `json:"dependencies,omitempty"`
+	Dependents   []string          `json:"dependents,omitempty"`
 }
 
 func newVercelRunCreatePayload(runsummary *RunSummary) *vercelRunPayload {
 	startTime := int(runsummary.ExecutionSummary.startedAt.UnixMilli())
+	var context = "LOCAL"
+	if name := ci.Constant(); name != "" {
+		context = name
+	}
 	return &vercelRunPayload{
 		StartTime: startTime,
-		Status:    "started",
+		Status:    "running",
+		Command:   runsummary.command(),
 		Type:      "TURBO",
+		Context:   context,
 	}
 }
 
@@ -47,3 +80,32 @@ func newVercelDonePayload(runsummary *RunSummary) *vercelRunPayload {
 		ExitCode: runsummary.ExecutionSummary.exitCode,
 	}
 }
+
+func newVercelTaskPayload(taskSummary *TaskSummary) *vercelTask {
+	hit := taskSummary.CacheState.Local || taskSummary.CacheState.Remote
+	status := "MISS"
+	var source string
+	if hit {
+		source = "REMOTE"
+		status = "HIT"
+	}
+
+	startTime := int(taskSummary.Execution.startAt.UnixMilli())
+	endTime := int(taskSummary.Execution.endTime().UnixMilli())
+
+	return &vercelTask{
+		Key:       taskSummary.TaskID,
+		Name:      taskSummary.Task,
+		Workspace: taskSummary.Package,
+		Hash:      taskSummary.Hash,
+		StartTime: startTime,
+		EndTime:   endTime,
+		Cache: vercelCacheStatus{
+			Status: status,
+			Source: source,
+		},
+		ExitCode:     *taskSummary.Execution.exitCode,
+		Dependencies: taskSummary.Dependencies,
+		Dependents:   taskSummary.Dependents,
+	}
+}