[supervisor] switch lib back to use upstream ramr/go-reaper

Author: mustard-mh

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"
 )
 
@@ -114,18 +114,22 @@ var initCmd = &cobra.Command{
 			}
 		}()
 		// start the reaper to clean up zombie processes
+		reaperChan := make(chan reaper.Status, 10)
 		reaper.Start(reaper.Config{
 			Pid:              -1,
 			Options:          0,
 			DisablePid1Check: false,
-			OnReap: func(pid int, wstatus syscall.WaitStatus) {
-				if pid != runCommand.Process.Pid {
-					return
+			StatusChannel:    reaperChan,
+		})
+		go func() {
+			for status := range reaperChan {
+				if status.Pid != runCommand.Process.Pid {
+					continue
 				}
-				exitCode := wstatus.ExitStatus()
+				exitCode := status.WaitStatus.ExitStatus()
 				handledByReaper <- exitCode
-			},
-		})
+			}
+		}()
 
 		select {
 		case <-supervisorDone:

components/supervisor/go.mod

@@ -30,6 +30,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.2
 	github.com/sirupsen/logrus v1.9.3
 	github.com/soheilhy/cmux v0.1.5
 	github.com/spf13/cobra v1.4.0