From 631119a7d65e01e48b5d8a46d7300b20c65262e1 Mon Sep 17 00:00:00 2001
From: hzxuzhonghu <xuzhonghu@huawei.com>
Date: Tue, 16 Jan 2018 15:28:16 +0800
Subject: [PATCH] move prometheus init to
 k8s.io/apiserver/pkg/endpoints/metrics/metrics.go

---
 .../src/k8s.io/apiserver/pkg/endpoints/BUILD  |  1 -
 .../apiserver/pkg/endpoints/apiserver.go      | 25 -------------------
 .../pkg/endpoints/metrics/metrics.go          |  4 +--
 3 files changed, 2 insertions(+), 28 deletions(-)
 delete mode 100644 staging/src/k8s.io/apiserver/pkg/endpoints/apiserver.go

diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/BUILD b/staging/src/k8s.io/apiserver/pkg/endpoints/BUILD
index f2c1ce34509..39fe40b5d9a 100644
--- a/staging/src/k8s.io/apiserver/pkg/endpoints/BUILD
+++ b/staging/src/k8s.io/apiserver/pkg/endpoints/BUILD
@@ -60,7 +60,6 @@ go_test(
 go_library(
     name = "go_default_library",
     srcs = [
-        "apiserver.go",
         "doc.go",
         "groupversion.go",
         "installer.go",
diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/apiserver.go b/staging/src/k8s.io/apiserver/pkg/endpoints/apiserver.go
deleted file mode 100644
index 933363bffeb..00000000000
--- a/staging/src/k8s.io/apiserver/pkg/endpoints/apiserver.go
+++ /dev/null
@@ -1,25 +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 endpoints
-
-import (
-	"k8s.io/apiserver/pkg/endpoints/metrics"
-)
-
-func init() {
-	metrics.Register()
-}
diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/metrics/metrics.go b/staging/src/k8s.io/apiserver/pkg/endpoints/metrics/metrics.go
index 65e651a3317..8a3b20d0d86 100644
--- a/staging/src/k8s.io/apiserver/pkg/endpoints/metrics/metrics.go
+++ b/staging/src/k8s.io/apiserver/pkg/endpoints/metrics/metrics.go
@@ -81,8 +81,8 @@ var (
 	kubectlExeRegexp = regexp.MustCompile(`^.*((?i:kubectl\.exe))`)
 )
 
-// Register all metrics.
-func Register() {
+func init() {
+	// Register all metrics.
 	prometheus.MustRegister(requestCounter)
 	prometheus.MustRegister(longRunningRequestGauge)
 	prometheus.MustRegister(requestLatencies)