From 247397ca7861c4993c1e31dbc0f52b01f5de6baa Mon Sep 17 00:00:00 2001
From: Sergey Podgornyy <13667212+SergeyPodgornyy@users.noreply.github.com>
Date: Thu, 19 Oct 2023 02:05:31 +0200
Subject: [PATCH] Use original expvar handler for profiler middleware (#848)

---
 middleware/profiler.go | 32 ++++++++------------------------
 1 file changed, 8 insertions(+), 24 deletions(-)

diff --git a/middleware/profiler.go b/middleware/profiler.go
index 3c36f878..ebd81ee4 100644
--- a/middleware/profiler.go
+++ b/middleware/profiler.go
@@ -2,7 +2,6 @@ package middleware
 
 import (
 	"expvar"
-	"fmt"
 	"net/http"
 	"net/http/pprof"
 
@@ -11,13 +10,13 @@ import (
 
 // Profiler is a convenient subrouter used for mounting net/http/pprof. ie.
 //
-//  func MyService() http.Handler {
-//    r := chi.NewRouter()
-//    // ..middlewares
-//    r.Mount("/debug", middleware.Profiler())
-//    // ..routes
-//    return r
-//  }
+//	func MyService() http.Handler {
+//		r := chi.NewRouter()
+//		// ..middlewares
+//		r.Mount("/debug", middleware.Profiler())
+//		// ..routes
+//		return r
+//	}
 func Profiler() http.Handler {
 	r := chi.NewRouter()
 	r.Use(NoCache)
@@ -34,7 +33,7 @@ func Profiler() http.Handler {
 	r.HandleFunc("/pprof/profile", pprof.Profile)
 	r.HandleFunc("/pprof/symbol", pprof.Symbol)
 	r.HandleFunc("/pprof/trace", pprof.Trace)
-	r.HandleFunc("/vars", expVars)
+	r.Handle("/vars", expvar.Handler())
 
 	r.Handle("/pprof/goroutine", pprof.Handler("goroutine"))
 	r.Handle("/pprof/threadcreate", pprof.Handler("threadcreate"))
@@ -45,18 +44,3 @@ func Profiler() http.Handler {
 
 	return r
 }
-
-// Replicated from expvar.go as not public.
-func expVars(w http.ResponseWriter, r *http.Request) {
-	first := true
-	w.Header().Set("Content-Type", "application/json")
-	fmt.Fprintf(w, "{\n")
-	expvar.Do(func(kv expvar.KeyValue) {
-		if !first {
-			fmt.Fprintf(w, ",\n")
-		}
-		first = false
-		fmt.Fprintf(w, "%q: %s", kv.Key, kv.Value)
-	})
-	fmt.Fprintf(w, "\n}\n")
-}