Revert "[supervisor] set pod failure reason when supervisor is reaped (…

…#20318)"

This reverts commit 9e8da3b.

components/supervisor/cmd/init.go

@@ -22,8 +22,8 @@ import (
 	"github.com/gitpod-io/gitpod/common-go/process"
 	"github.com/gitpod-io/gitpod/supervisor/pkg/shared"
 	"github.com/gitpod-io/gitpod/supervisor/pkg/supervisor"
-	reaper "github.com/gitpod-io/go-reaper"
 	"github.com/prometheus/procfs"
+	reaper "github.com/ramr/go-reaper"
 	"github.com/spf13/cobra"
 )
 
@@ -77,55 +77,25 @@ var initCmd = &cobra.Command{
 		}
 
 		supervisorDone := make(chan struct{})
-		handledByReaper := make(chan int)
-		handleSupervisorExit := func(exitCode int) {
-			if exitCode == 0 {
-				return
-			}
-			logs := extractFailureFromRun()
-			if shared.IsExpectedShutdown(exitCode) {
-				log.Fatal(logs)
-			} else {
-				log.WithError(fmt.Errorf(logs)).Fatal("supervisor run error with unexpected exit code")
-			}
-		}
 		go func() {
 			defer close(supervisorDone)
 
 			err := runCommand.Wait()
-			if err == nil {
-				return
-			}
-			// exited by reaper
-			if strings.Contains(err.Error(), "no child processes") {
-				ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
-				defer cancel()
-				select {
-				case <-ctx.Done(): // timeout
-				case exitCode := <-handledByReaper:
-					handleSupervisorExit(exitCode)
-				}
-			} else if !(strings.Contains(err.Error(), "signal: ")) {
+			if err != nil && !(strings.Contains(err.Error(), "signal: ") || strings.Contains(err.Error(), "no child processes")) {
 				if eerr, ok := err.(*exec.ExitError); ok && eerr.ExitCode() != 0 {
-					handleSupervisorExit(eerr.ExitCode())
+					logs := extractFailureFromRun()
+					if shared.IsExpectedShutdown(eerr.ExitCode()) {
+						log.Fatal(logs)
+					} else {
+						log.WithError(fmt.Errorf(logs)).Fatal("supervisor run error with unexpected exit code")
+					}
 				}
 				log.WithError(err).Error("supervisor run error")
 				return
 			}
 		}()
 		// start the reaper to clean up zombie processes
-		reaper.Start(reaper.Config{
-			Pid:              -1,
-			Options:          0,
-			DisablePid1Check: false,
-			OnReap: func(pid int, wstatus syscall.WaitStatus) {
-				if pid != runCommand.Process.Pid {
-					return
-				}
-				exitCode := wstatus.ExitStatus()
-				handledByReaper <- exitCode
-			},
-		})
+		reaper.Reap()
 
 		select {
 		case <-supervisorDone:

components/supervisor/go.mod

@@ -16,7 +16,6 @@ require (
 	github.com/gitpod-io/gitpod/ide-metrics-api v0.0.0-00010101000000-000000000000
 	github.com/gitpod-io/gitpod/supervisor/api v0.0.0-00010101000000-000000000000
 	github.com/gitpod-io/gitpod/ws-daemon/api v0.0.0-00010101000000-000000000000
-	github.com/gitpod-io/go-reaper v0.0.0-20241024192051-78d04cc2e25f
 	github.com/golang/mock v1.6.0
 	github.com/google/go-cmp v0.6.0
 	github.com/google/uuid v1.6.0
@@ -30,6 +29,7 @@ require (
 	github.com/prometheus/common v0.42.0
 	github.com/prometheus/procfs v0.10.1
 	github.com/prometheus/pushgateway v1.5.1
+	github.com/ramr/go-reaper v0.2.1
 	github.com/sirupsen/logrus v1.9.3
 	github.com/soheilhy/cmux v0.1.5
 	github.com/spf13/cobra v1.4.0