test calling composedHandler.ServeHTTP directly

cmd/queue/main.go

@@ -254,12 +254,6 @@ func buildProbe(logger *zap.SugaredLogger, encodedProbe string, autodetectHTTP2
 	return readiness.NewProbe(coreProbe)
 }
 
-func healthCheckForDrainer(h http.Handler) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		h.ServeHTTP(w, r)
-	}
-}
-
 func buildServer(ctx context.Context, env config, drainer *pkghandler.Drainer, probeContainer func() bool, stats *network.RequestStats,
 	logger *zap.SugaredLogger) *http.Server {
 
@@ -320,7 +314,7 @@ func buildServer(ctx context.Context, env config, drainer *pkghandler.Drainer, p
 	}
 
 	drainer.Inner = composedHandler
-	drainer.HealthCheck = healthCheckForDrainer(composedHandler)
+	drainer.HealthCheck = composedHandler.ServeHTTP
 
 	return pkgnet.NewServer(":"+env.QueueServingPort, drainer)
 }