[gp] track git event with instanceId (#16693)

instead of workspaceInstanceId to allow cross events matching in Mixpanel
gitpod-io · Mar 6, 2023 · b9f2657 · b9f2657
1 parent 294aa69
commit b9f2657
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/components/gitpod-cli/cmd/git-track-command.go b/components/gitpod-cli/cmd/git-track-command.go
@@ -57,15 +57,19 @@ var gitTrackCommand = &cobra.Command{
 		defer client.Close()
 
 		type GitEventParams struct {
-			Command             string `json:"command,omitempty"`
-			WorkspaceId         string `json:"workspaceId,omitempty"`
+			Command     string `json:"command,omitempty"`
+			WorkspaceId string `json:"workspaceId,omitempty"`
+			// most often used across all events
+			InstanceId string `json:"instanceId,omitempty"`
+			// deprecated for backward compatibility
 			WorkspaceInstanceId string `json:"workspaceInstanceId,omitempty"`
 			Timestamp           int64  `json:"timestamp,omitempty"`
 		}
 
 		params := &GitEventParams{
 			Command:             gitTrackCommandOpts.GitCommand,
 			WorkspaceId:         wsInfo.WorkspaceId,
+			InstanceId:          wsInfo.InstanceId,
 			WorkspaceInstanceId: wsInfo.InstanceId,
 			Timestamp:           time.Now().Unix(),
 		}
@@ -76,6 +80,7 @@ var gitTrackCommand = &cobra.Command{
 		log.WithField("command", gitTrackCommandOpts.GitCommand).
 			Info("tracking the GitCommand event")
 
+		// TODO(ak) use segment directly + supervisor info to get workspace and isntance IDs, don't use server
 		err = client.TrackEvent(ctx, event)
 		if err != nil {
 			log.WithError(err).Fatal("error tracking git event")