refactor

Author: Andrea Falzetti

components/gitpod-cli/cmd/rebuild.go

@@ -50,12 +50,13 @@ func TerminateExistingContainer() error {
 func runRebuild(ctx context.Context, supervisorClient *supervisor.SupervisorClient, event *utils.EventTracker) error {
 	wsInfo, err := supervisorClient.Info.WorkspaceInfo(ctx, &api.WorkspaceInfoRequest{})
 	if err != nil {
+		event.Set("ErrorCode", utils.SystemErrorCode)
 		return err
 	}
 
 	tmpDir, err := os.MkdirTemp("", "gp-rebuild-*")
 	if err != nil {
-		event.Set("ErrorCode", utils.SystemErrorCode_TmpDirCannotWrite)
+		event.Set("ErrorCode", utils.SystemErrorCode)
 		return err
 	}
 	defer os.RemoveAll(tmpDir)
@@ -158,12 +159,13 @@ func runRebuild(ctx context.Context, supervisorClient *supervisor.SupervisorClie
 		event.Set("ErrorCode", utils.RebuildErrorCode_DockerErr)
 		return err
 	}
-	iamgeBuildDurationSeconds := time.Since(imageBuildStartTime).Seconds()
-	event.Set("ImageBuildDurationSeconds", iamgeBuildDurationSeconds)
+	ImageBuildDuration := time.Since(imageBuildStartTime).Milliseconds()
+	event.Set("ImageBuildDuration", ImageBuildDuration)
 
 	err = TerminateExistingContainer()
 	if err != nil {
-		utils.LogError(ctx, err, "Failed to stop previous gp rebuild container", supervisorClient)
+		event.Set("ErrorCode", utils.SystemErrorCode)
+		return err
 	}
 
 	messages := []string{
@@ -223,7 +225,7 @@ var buildCmd = &cobra.Command{
 
 		err = runRebuild(ctx, supervisorClient, event)
 		if err != nil && event.Data.ErrorCode == "" {
-			event.Set("ErrorCode", "System")
+			event.Set("ErrorCode", utils.SystemErrorCode)
 		}
 		event.Send(ctx)
 

components/gitpod-cli/pkg/utils/trackEvent.go

@@ -17,7 +17,7 @@ import (
 
 const (
 	// System
-	SystemErrorCode_TmpDirCannotWrite = "system_tmpdir_cannot_write"
+	SystemErrorCode = "system_error"
 
 	// Rebuild
 	RebuildErrorCode_DockerBuildFailed     = "rebuild_docker_build_failed"
@@ -34,13 +34,13 @@ const (
 )
 
 type TrackCommandUsageParams struct {
-	Command                    string  `json:"command,omitempty"`
-	DurationMs                 int64   `json:"durationMs,omitempty"`
-	ErrorCode                  string  `json:"errorCode,omitempty"`
-	WorkspaceId                string  `json:"workspaceId,omitempty"`
-	InstanceId                 string  `json:"instanceId,omitempty"`
-	Timestamp                  int64   `json:"timestamp,omitempty"`
-	DockerBuildDurationSeconds float64 `json:"dockerBuildDurationSeconds,omitempty"`
+	Command            string `json:"command,omitempty"`
+	Duration           int64  `json:"duration,omitempty"`
+	ErrorCode          string `json:"errorCode,omitempty"`
+	WorkspaceId        string `json:"workspaceId,omitempty"`
+	InstanceId         string `json:"instanceId,omitempty"`
+	Timestamp          int64  `json:"timestamp,omitempty"`
+	ImageBuildDuration int64  `json:"imageBuildDuration,omitempty"`
 }
 
 type EventTracker struct {
@@ -72,7 +72,7 @@ func TrackEvent(ctx context.Context, supervisorClient *supervisor.SupervisorClie
 
 	tracker.Data = &TrackCommandUsageParams{
 		Command:     cmdParams.Command,
-		DurationMs:  0,
+		Duration:    0,
 		WorkspaceId: wsInfo.WorkspaceId,
 		InstanceId:  wsInfo.InstanceId,
 		ErrorCode:   "",
@@ -88,20 +88,20 @@ func (t *EventTracker) Set(key string, value interface{}) *EventTracker {
 		t.Data.Command = value.(string)
 	case "ErrorCode":
 		t.Data.ErrorCode = value.(string)
-	case "DurationMs":
-		t.Data.DurationMs = value.(int64)
+	case "Duration":
+		t.Data.Duration = value.(int64)
 	case "WorkspaceId":
 		t.Data.WorkspaceId = value.(string)
 	case "InstanceId":
 		t.Data.InstanceId = value.(string)
-	case "DockerBuildDurationSeconds":
-		t.Data.DockerBuildDurationSeconds = value.(float64)
+	case "ImageBuildDuration":
+		t.Data.ImageBuildDuration = value.(int64)
 	}
 	return t
 }
 
 func (t *EventTracker) Send(ctx context.Context) {
-	t.Set("DurationMs", time.Since(t.startTime).Milliseconds())
+	t.Set("Duration", time.Since(t.startTime).Milliseconds())
 
 	event := &serverapi.RemoteTrackMessage{
 		Event:      "gp_command",