promote /metrics to genericapiserver

pkg/routes/BUILD

@@ -15,15 +15,11 @@ go_library(
     srcs = [
         "doc.go",
         "logs.go",
-        "metrics.go",
         "ui.go",
     ],
     tags = ["automanaged"],
     deps = [
-        "//pkg/apiserver/metrics:go_default_library",
         "//pkg/genericapiserver/mux:go_default_library",
-        "//pkg/storage/etcd/metrics:go_default_library",
         "//vendor:github.com/emicklei/go-restful",
-        "//vendor:github.com/prometheus/client_golang/prometheus",
     ],
 )

pkg/routes/metrics.go

@@ -1,52 +0,0 @@
-/*
-Copyright 2014 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package routes
-
-import (
-	"io"
-	"net/http"
-
-	apiservermetrics "k8s.io/kubernetes/pkg/apiserver/metrics"
-	"k8s.io/kubernetes/pkg/genericapiserver/mux"
-	etcdmetrics "k8s.io/kubernetes/pkg/storage/etcd/metrics"
-
-	"github.com/prometheus/client_golang/prometheus"
-)
-
-// DefaultMetrics installs the default prometheus metrics handler
-type DefaultMetrics struct{}
-
-func (m DefaultMetrics) Install(c *mux.APIContainer) {
-	c.NonSwaggerRoutes.Handle("/metrics", prometheus.Handler())
-}
-
-// MetricsWithReset install the prometheus metrics handler extended with support for the DELETE method
-// which resets the metrics.
-type MetricsWithReset struct{}
-
-func (m MetricsWithReset) Install(c *mux.APIContainer) {
-	defaultMetricsHandler := prometheus.Handler().ServeHTTP
-	c.NonSwaggerRoutes.HandleFunc("/metrics", func(w http.ResponseWriter, req *http.Request) {
-		if req.Method == "DELETE" {
-			apiservermetrics.Reset()
-			etcdmetrics.Reset()
-			io.WriteString(w, "metrics reset\n")
-			return
-		}
-		defaultMetricsHandler(w, req)
-	})
-}