workspackit: put the workspace id into log to trace.

Author: utam0k

components/workspacekit/cmd/rings.go

@@ -60,7 +60,14 @@ var ring0Cmd = &cobra.Command{
 	Short: "starts ring0 - enter here",
 	Run: func(_ *cobra.Command, args []string) {
 		log.Init(ServiceName, Version, true, false)
-		log := log.WithField("ring", 0)
+
+		wsid := os.Getenv("GITPOD_WORKSPACE_ID")
+		if wsid == "" {
+			log.Error("cannot find GITPOD_WORKSPACE_ID")
+			return
+		}
+
+		log := log.WithField("ring", 0).WithField("workspaceId", wsid)
 
 		common_grpc.SetupLogging()
 
@@ -113,6 +120,7 @@ var ring0Cmd = &cobra.Command{
 		cmd.Env = append(os.Environ(),
 			"WORKSPACEKIT_FSSHIFT="+prep.FsShift.String(),
 			fmt.Sprintf("WORKSPACEKIT_NO_WORKSPACE_MOUNT=%v", prep.FullWorkspaceBackup || prep.PersistentVolumeClaim),
+			"GITPOD_WORKSPACE_ID="+wsid,
 		)
 
 		if err := cmd.Start(); err != nil {
@@ -186,7 +194,13 @@ var ring1Cmd = &cobra.Command{
 	Short: "starts ring1",
 	Run: func(_cmd *cobra.Command, args []string) {
 		log.Init(ServiceName, Version, true, false)
-		log := log.WithField("ring", 1)
+
+		wsid := os.Getenv("GITPOD_WORKSPACE_ID")
+		if wsid == "" {
+			log.Error("cannot find GITPOD_WORKSPACE_ID")
+			return
+		}
+		log := log.WithField("ring", 1).WithField("workspaceId", wsid)
 
 		common_grpc.SetupLogging()
 
@@ -359,6 +373,7 @@ var ring1Cmd = &cobra.Command{
 		}
 
 		env = append(env, "WORKSPACEKIT_WRAP_NETNS=true")
+		env = append(env, "GITPOD_WORKSPACE_ID="+wsid)
 
 		socketFN := filepath.Join(os.TempDir(), fmt.Sprintf("workspacekit-ring1-%d.unix", time.Now().UnixNano()))
 		skt, err := net.Listen("unix", socketFN)
@@ -738,7 +753,13 @@ var ring2Cmd = &cobra.Command{
 	Args:  cobra.ExactArgs(1),
 	Run: func(_cmd *cobra.Command, args []string) {
 		log.Init(ServiceName, Version, true, false)
-		log := log.WithField("ring", 2)
+
+		wsid := os.Getenv("GITPOD_WORKSPACE_ID")
+		if wsid == "" {
+			log.Error("cannot find GITPOD_WORKSPACE_ID")
+			return
+		}
+		log := log.WithField("ring", 2).WithField("workspaceId", wsid)
 
 		common_grpc.SetupLogging()