From 256ecd0e8f7cc7ccc1a20e3f2846f6e3cc336d02 Mon Sep 17 00:00:00 2001 From: Patrick O'Doherty Date: Tue, 13 Feb 2024 10:49:36 -0800 Subject: [PATCH] Revert "tsweb: update ServeMux matching to 1.22.0 syntax (#11090)" (#11125) This reverts commit 30c9189ed307df6f2c1567aa7945bde77bb54c52. Signed-off-by: Patrick O'Doherty --- tsweb/debug.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tsweb/debug.go b/tsweb/debug.go index 9f3f72861..6db3f25cf 100644 --- a/tsweb/debug.go +++ b/tsweb/debug.go @@ -39,20 +39,20 @@ type DebugHandler struct { // Debugger returns the DebugHandler registered on mux at /debug/, // creating it if necessary. func Debugger(mux *http.ServeMux) *DebugHandler { - h, pattern := mux.Handler(&http.Request{Method: "GET", URL: &url.URL{Path: "/debug/"}}) - if d, ok := h.(*DebugHandler); ok && pattern == "GET /debug/" { + h, pat := mux.Handler(&http.Request{URL: &url.URL{Path: "/debug/"}}) + if d, ok := h.(*DebugHandler); ok && pat == "/debug/" { return d } ret := &DebugHandler{ mux: mux, } - mux.Handle("GET /debug/", ret) + mux.Handle("/debug/", ret) ret.KVFunc("Uptime", func() any { return varz.Uptime() }) ret.KV("Version", version.Long()) - ret.Handle("GET vars", "Metrics (Go)", expvar.Handler()) - ret.Handle("GET varz", "Metrics (Prometheus)", http.HandlerFunc(promvarz.Handler)) - ret.Handle("GET pprof/", "pprof (index)", http.HandlerFunc(pprof.Index)) + ret.Handle("vars", "Metrics (Go)", expvar.Handler()) + ret.Handle("varz", "Metrics (Prometheus)", http.HandlerFunc(promvarz.Handler)) + ret.Handle("pprof/", "pprof (index)", http.HandlerFunc(pprof.Index)) // the CPU profile handler is special because it responds // streamily, unlike every other pprof handler. This means it's // not made available through pprof.Index the way all the other @@ -63,7 +63,7 @@ func Debugger(mux *http.ServeMux) *DebugHandler { ret.HandleSilent("pprof/profile", http.HandlerFunc(pprof.Profile)) ret.URL("/debug/pprof/goroutine?debug=1", "Goroutines (collapsed)") ret.URL("/debug/pprof/goroutine?debug=2", "Goroutines (full)") - ret.Handle("GET gc", "force GC", http.HandlerFunc(gcHandler)) + ret.Handle("gc", "force GC", http.HandlerFunc(gcHandler)) hostname, err := os.Hostname() if err == nil { ret.KV("Machine", hostname) @@ -98,7 +98,7 @@ func (d *DebugHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { } func (d *DebugHandler) handle(slug string, handler http.Handler) string { - href := "GET /debug/" + slug + href := "/debug/" + slug d.mux.Handle(href, Protected(debugBrowserHeaderHandler(handler))) return href }