Replace ServeHTTP with mux.Handler(req)

Author: bhope

pkg/app/server_test.go

@@ -22,7 +22,6 @@ import (
 	"flag"
 	"fmt"
 	"io"
-	"net/http"
 	"net/http/httptest"
 	"os"
 	"path/filepath"
@@ -460,10 +459,9 @@ func TestPprofRouting(t *testing.T) {
 	telemetryMux := buildTelemetryServer(reg, false, nil)
 	for _, path := range pprofPaths {
 		req := httptest.NewRequest("GET", "http://localhost:8081"+path, nil)
-		w := httptest.NewRecorder()
-		telemetryMux.ServeHTTP(w, req)
-		if w.Result().StatusCode == http.StatusNotFound {
-			t.Errorf("expected pprof path %s to be registered on telemetry server, got 404", path)
+		_, pattern := telemetryMux.Handler(req)
+		if pattern == "" {
+			t.Errorf("expected pprof path %s to be registered on telemetry server, got no match", path)
 		}
 	}
 
@@ -475,12 +473,15 @@ func TestPprofRouting(t *testing.T) {
 		false,
 		nil,
 	)
+	pprofPatterns := make(map[string]struct{}, len(pprofPaths))
+	for _, path := range pprofPaths {
+		pprofPatterns[path] = struct{}{}
+	}
 	for _, path := range pprofPaths {
 		req := httptest.NewRequest("GET", "http://localhost:8080"+path, nil)
-		w := httptest.NewRecorder()
-		metricsMux.ServeHTTP(w, req)
-		if w.Result().StatusCode != http.StatusNotFound {
-			t.Errorf("expected pprof path %s to return 404 on metrics server, got %d", path, w.Result().StatusCode)
+		_, pattern := metricsMux.Handler(req)
+		if _, ok := pprofPatterns[pattern]; ok {
+			t.Errorf("expected pprof path %s to be unregistered on metrics server, matched pattern %q", path, pattern)
 		}
 	}
 }