From 6b994af680b292ac5a9be7198df8ca18c27241df Mon Sep 17 00:00:00 2001 From: Han Kang Date: Thu, 16 Jul 2020 09:26:47 -0700 Subject: [PATCH] port over apiserver metric handler to use the instrumentation library Change-Id: Ifabb726120c1c4f90ff3e4d71fdbba468fe74e8a --- .../apiserver/pkg/server/routes/metrics.go | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/server/routes/metrics.go b/staging/src/k8s.io/apiserver/pkg/server/routes/metrics.go index 4c2dbeac426..1121e95c36a 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/routes/metrics.go +++ b/staging/src/k8s.io/apiserver/pkg/server/routes/metrics.go @@ -17,9 +17,6 @@ limitations under the License. package routes import ( - "io" - "net/http" - apimetrics "k8s.io/apiserver/pkg/endpoints/metrics" "k8s.io/apiserver/pkg/server/mux" etcd3metrics "k8s.io/apiserver/pkg/storage/etcd3/metrics" @@ -43,18 +40,7 @@ type MetricsWithReset struct{} // Install adds the MetricsWithReset handler func (m MetricsWithReset) Install(c *mux.PathRecorderMux) { register() - defaultMetricsHandler := legacyregistry.Handler().ServeHTTP - c.HandleFunc("/metrics", func(w http.ResponseWriter, req *http.Request) { - if req.Method == "DELETE" { - apimetrics.Reset() - etcd3metrics.Reset() - flowcontrolmetrics.Reset() - - io.WriteString(w, "metrics reset\n") - return - } - defaultMetricsHandler(w, req) - }) + c.Handle("/metrics", legacyregistry.HandlerWithReset()) } // register apiserver and etcd metrics