From 0f95b91f9632b092a87b9754858909d13070f8a6 Mon Sep 17 00:00:00 2001
From: Clayton Coleman <ccoleman@redhat.com>
Date: Wed, 6 Apr 2016 17:52:28 -0400
Subject: [PATCH] Move /resetMetrics to DELETE /metrics

Reduces the surface area of the API server slightly and allows
downstream components to have deleteable metrics. After this change
genericapiserver will *not* have metrics unless the caller defines it
(allows different apiserver implementations to make that choice on their
own).
---
 pkg/apiserver/apiserver.go         |  2 --
 pkg/master/master.go               | 20 +++++++++++++++-----
 test/e2e/framework/metrics_util.go |  2 +-
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/pkg/apiserver/apiserver.go b/pkg/apiserver/apiserver.go
index 66b9dc3d11d..a5fd87e3bcd 100644
--- a/pkg/apiserver/apiserver.go
+++ b/pkg/apiserver/apiserver.go
@@ -46,7 +46,6 @@ import (
 
 	"github.com/emicklei/go-restful"
 	"github.com/golang/glog"
-	"github.com/prometheus/client_golang/prometheus"
 )
 
 func init() {
@@ -171,7 +170,6 @@ func (g *APIGroupVersion) newInstaller() *APIInstaller {
 func InstallSupport(mux Mux, ws *restful.WebService, checks ...healthz.HealthzChecker) {
 	// TODO: convert healthz and metrics to restful and remove container arg
 	healthz.InstallHandler(mux, checks...)
-	mux.Handle("/metrics", prometheus.Handler())
 
 	// Set up a service to return the git code version.
 	ws.Path("/version")
diff --git a/pkg/master/master.go b/pkg/master/master.go
index faf2b0eb624..5e3a4e15d56 100644
--- a/pkg/master/master.go
+++ b/pkg/master/master.go
@@ -175,10 +175,17 @@ func New(c *Config) (*Master, error) {
 	return m, nil
 }
 
-func resetMetrics(w http.ResponseWriter, req *http.Request) {
-	apiservermetrics.Reset()
-	etcdmetrics.Reset()
-	io.WriteString(w, "metrics reset\n")
+var defaultMetricsHandler = prometheus.Handler().ServeHTTP
+
+// MetricsWithReset is a handler that resets metrics when DELETE is passed to the endpoint.
+func MetricsWithReset(w http.ResponseWriter, req *http.Request) {
+	if req.Method == "DELETE" {
+		apiservermetrics.Reset()
+		etcdmetrics.Reset()
+		io.WriteString(w, "metrics reset\n")
+		return
+	}
+	defaultMetricsHandler(w, req)
 }
 
 func (m *Master) InstallAPIs(c *Config) {
@@ -220,8 +227,11 @@ func (m *Master) InstallAPIs(c *Config) {
 
 	// TODO(nikhiljindal): Refactor generic parts of support services (like /versions) to genericapiserver.
 	apiserver.InstallSupport(m.MuxHelper, m.RootWebService, healthzChecks...)
+
 	if c.EnableProfiling {
-		m.MuxHelper.HandleFunc("/resetMetrics", resetMetrics)
+		m.MuxHelper.HandleFunc("/metrics", MetricsWithReset)
+	} else {
+		m.MuxHelper.HandleFunc("/metrics", defaultMetricsHandler)
 	}
 
 	// Install root web services
diff --git a/test/e2e/framework/metrics_util.go b/test/e2e/framework/metrics_util.go
index 887df3e1520..470bd434286 100644
--- a/test/e2e/framework/metrics_util.go
+++ b/test/e2e/framework/metrics_util.go
@@ -315,7 +315,7 @@ func VerifyPodStartupLatency(latency PodStartupLatency) error {
 // Resets latency metrics in apiserver.
 func ResetMetrics(c *client.Client) error {
 	Logf("Resetting latency metrics in apiserver...")
-	body, err := c.Get().AbsPath("/resetMetrics").DoRaw()
+	body, err := c.Delete().AbsPath("/metrics").DoRaw()
 	if err != nil {
 		return err
 	}