expvar: export http.Handler

Add a method to expose the handler to allow it to be installed at a
non-standard location or used with a different ServeMux.

fixes #15030

Change-Id: If778ad6fcc200f124a05c0a493511e364fca6078
Reviewed-on: https://go-review.googlesource.com/24722
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>

1 files changed, 7 insertions, 0 deletions

diff --git a/src/expvar/expvar.go b/src/expvar/expvar.go
index d5465c518f..fde763d7ce 100644
--- a/src/expvar/expvar.go
+++ b/src/expvar/expvar.go
@@ -322,6 +322,13 @@ func expvarHandler(w http.ResponseWriter, r *http.Request) {
 	fmt.Fprintf(w, "\n}\n")
 }
 
+// Handler returns the expvar HTTP Handler.
+//
+// This is only needed to install the handler in a non-standard location.
+func Handler() http.Handler {
+	return http.HandlerFunc(expvarHandler)
+}
+
 func cmdline() interface{} {
 	return os.Args
 }