health: make health listener semantics match metrics one

health/health_server.go

@@ -7,11 +7,12 @@ import (
 	"time"
 
 	"golang.org/x/exp/slog"
+	"golang.org/x/sync/errgroup"
 )
 
 // HealthCheckListener runs simple http server on the specified port for
 // health check probes
-func HealthCheckListener(ctx context.Context, port int, log *slog.Logger) {
+func HealthCheckListener(ctx context.Context, port int, log *slog.Logger) error {
 	log.Info("Starting health listener", "port", port)
 
 	serveMux := http.NewServeMux()
@@ -26,19 +27,31 @@ func HealthCheckListener(ctx context.Context, port int, log *slog.Logger) {
 		Handler:      serveMux,
 	}
 
-	go func() {
+	g, ctx := errgroup.WithContext(ctx)
+
+	g.Go(func() error {
 		err := srv.ListenAndServe()
 		if err != http.ErrServerClosed {
 			log.Warn("health check server done listening", "err", err)
+			return err
 		}
-	}()
+		return nil
+	})
 
 	<-ctx.Done()
 
-	if err := srv.Shutdown(ctx); err != nil {
-		log.Error("health check server shutdown failed", "err", err)
-	}
+	ctx, cancel := context.WithTimeout(ctx, 2*time.Second)
+	defer cancel()
 
+	g.Go(func() error {
+		if err := srv.Shutdown(ctx); err != nil {
+			log.Error("health check server shutdown failed", "err", err)
+			return err
+		}
+		return nil
+	})
+
+	return g.Wait()
 }
 
 func basicHealth(w http.ResponseWriter, r *http.Request) {