From f7c23b1c1dd6d2565e975a38c464c2498fb41e00 Mon Sep 17 00:00:00 2001 From: Han Kang Date: Mon, 25 Mar 2019 15:12:09 -0700 Subject: [PATCH] cleanup of reflector metric code (finish removing unused code) --- cmd/kube-apiserver/app/BUILD | 1 - cmd/kube-apiserver/app/server.go | 1 - pkg/util/BUILD | 1 - pkg/util/prometheusclientgo/BUILD | 1 - pkg/util/prometheusclientgo/adapters.go | 1 - pkg/util/reflector/prometheus/BUILD | 29 ----- pkg/util/reflector/prometheus/prometheus.go | 126 -------------------- 7 files changed, 160 deletions(-) delete mode 100644 pkg/util/reflector/prometheus/BUILD delete mode 100644 pkg/util/reflector/prometheus/prometheus.go diff --git a/cmd/kube-apiserver/app/BUILD b/cmd/kube-apiserver/app/BUILD index 9b55641912..9a2731e502 100644 --- a/cmd/kube-apiserver/app/BUILD +++ b/cmd/kube-apiserver/app/BUILD @@ -29,7 +29,6 @@ go_library( "//pkg/registry/rbac/rest:go_default_library", "//pkg/serviceaccount:go_default_library", "//pkg/util/flag:go_default_library", - "//pkg/util/reflector/prometheus:go_default_library", "//pkg/util/workqueue/prometheus:go_default_library", "//pkg/version:go_default_library", "//pkg/version/verflag:go_default_library", diff --git a/cmd/kube-apiserver/app/server.go b/cmd/kube-apiserver/app/server.go index 26ba8903e3..43d3d8f1a5 100644 --- a/cmd/kube-apiserver/app/server.go +++ b/cmd/kube-apiserver/app/server.go @@ -78,7 +78,6 @@ import ( rbacrest "k8s.io/kubernetes/pkg/registry/rbac/rest" "k8s.io/kubernetes/pkg/serviceaccount" utilflag "k8s.io/kubernetes/pkg/util/flag" - _ "k8s.io/kubernetes/pkg/util/reflector/prometheus" // for reflector metric registration _ "k8s.io/kubernetes/pkg/util/workqueue/prometheus" // for workqueue metric registration "k8s.io/kubernetes/pkg/version" "k8s.io/kubernetes/pkg/version/verflag" diff --git a/pkg/util/BUILD b/pkg/util/BUILD index b52c95b50a..9198cdad66 100644 --- a/pkg/util/BUILD +++ b/pkg/util/BUILD @@ -43,7 +43,6 @@ filegroup( "//pkg/util/pod:all-srcs", "//pkg/util/procfs:all-srcs", "//pkg/util/prometheusclientgo:all-srcs", - "//pkg/util/reflector/prometheus:all-srcs", "//pkg/util/removeall:all-srcs", "//pkg/util/resizefs:all-srcs", "//pkg/util/resourcecontainer:all-srcs", diff --git a/pkg/util/prometheusclientgo/BUILD b/pkg/util/prometheusclientgo/BUILD index 82b05d6895..40936caf62 100644 --- a/pkg/util/prometheusclientgo/BUILD +++ b/pkg/util/prometheusclientgo/BUILD @@ -8,7 +8,6 @@ go_library( deps = [ "//pkg/client/metrics/prometheus:go_default_library", "//pkg/util/prometheusclientgo/leaderelection:go_default_library", - "//pkg/util/reflector/prometheus:go_default_library", "//pkg/util/workqueue/prometheus:go_default_library", ], ) diff --git a/pkg/util/prometheusclientgo/adapters.go b/pkg/util/prometheusclientgo/adapters.go index 32920cfe42..75b316015f 100644 --- a/pkg/util/prometheusclientgo/adapters.go +++ b/pkg/util/prometheusclientgo/adapters.go @@ -20,6 +20,5 @@ package prometheusclientgo import ( _ "k8s.io/kubernetes/pkg/client/metrics/prometheus" // for client metric registration _ "k8s.io/kubernetes/pkg/util/prometheusclientgo/leaderelection" // for leader election metric registration - _ "k8s.io/kubernetes/pkg/util/reflector/prometheus" // for reflector metric registration _ "k8s.io/kubernetes/pkg/util/workqueue/prometheus" // for workqueue metric registration ) diff --git a/pkg/util/reflector/prometheus/BUILD b/pkg/util/reflector/prometheus/BUILD deleted file mode 100644 index f469ec7e86..0000000000 --- a/pkg/util/reflector/prometheus/BUILD +++ /dev/null @@ -1,29 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", -) - -go_library( - name = "go_default_library", - srcs = ["prometheus.go"], - importpath = "k8s.io/kubernetes/pkg/util/reflector/prometheus", - deps = [ - "//staging/src/k8s.io/client-go/tools/cache:go_default_library", - "//vendor/github.com/prometheus/client_golang/prometheus:go_default_library", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) diff --git a/pkg/util/reflector/prometheus/prometheus.go b/pkg/util/reflector/prometheus/prometheus.go deleted file mode 100644 index 63657e9c55..0000000000 --- a/pkg/util/reflector/prometheus/prometheus.go +++ /dev/null @@ -1,126 +0,0 @@ -/* -Copyright 2016 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 prometheus sets the cache DefaultMetricsFactory to produce -// prometheus metrics. To use this package, you just have to import it. -package prometheus - -import ( - "k8s.io/client-go/tools/cache" - - "github.com/prometheus/client_golang/prometheus" -) - -const reflectorSubsystem = "reflector" - -var ( - listsTotal = prometheus.NewCounterVec(prometheus.CounterOpts{ - Subsystem: reflectorSubsystem, - Name: "lists_total", - Help: "Total number of API lists done by the reflectors", - }, []string{"name"}) - - listsDuration = prometheus.NewSummaryVec(prometheus.SummaryOpts{ - Subsystem: reflectorSubsystem, - Name: "list_duration_seconds", - Help: "How long an API list takes to return and decode for the reflectors", - }, []string{"name"}) - - itemsPerList = prometheus.NewSummaryVec(prometheus.SummaryOpts{ - Subsystem: reflectorSubsystem, - Name: "items_per_list", - Help: "How many items an API list returns to the reflectors", - }, []string{"name"}) - - watchesTotal = prometheus.NewCounterVec(prometheus.CounterOpts{ - Subsystem: reflectorSubsystem, - Name: "watches_total", - Help: "Total number of API watches done by the reflectors", - }, []string{"name"}) - - shortWatchesTotal = prometheus.NewCounterVec(prometheus.CounterOpts{ - Subsystem: reflectorSubsystem, - Name: "short_watches_total", - Help: "Total number of short API watches done by the reflectors", - }, []string{"name"}) - - watchDuration = prometheus.NewSummaryVec(prometheus.SummaryOpts{ - Subsystem: reflectorSubsystem, - Name: "watch_duration_seconds", - Help: "How long an API watch takes to return and decode for the reflectors", - }, []string{"name"}) - - itemsPerWatch = prometheus.NewSummaryVec(prometheus.SummaryOpts{ - Subsystem: reflectorSubsystem, - Name: "items_per_watch", - Help: "How many items an API watch returns to the reflectors", - }, []string{"name"}) - - lastResourceVersion = prometheus.NewGaugeVec(prometheus.GaugeOpts{ - Subsystem: reflectorSubsystem, - Name: "last_resource_version", - Help: "Last resource version seen for the reflectors", - }, []string{"name"}) -) - -func init() { - prometheus.MustRegister(listsTotal) - prometheus.MustRegister(listsDuration) - prometheus.MustRegister(itemsPerList) - prometheus.MustRegister(watchesTotal) - prometheus.MustRegister(shortWatchesTotal) - prometheus.MustRegister(watchDuration) - prometheus.MustRegister(itemsPerWatch) - prometheus.MustRegister(lastResourceVersion) -} - -type prometheusMetricsProvider struct{} - -func (prometheusMetricsProvider) NewListsMetric(name string) cache.CounterMetric { - return listsTotal.WithLabelValues(name) -} - -// use summary to get averages and percentiles -func (prometheusMetricsProvider) NewListDurationMetric(name string) cache.SummaryMetric { - return listsDuration.WithLabelValues(name) -} - -// use summary to get averages and percentiles -func (prometheusMetricsProvider) NewItemsInListMetric(name string) cache.SummaryMetric { - return itemsPerList.WithLabelValues(name) -} - -func (prometheusMetricsProvider) NewWatchesMetric(name string) cache.CounterMetric { - return watchesTotal.WithLabelValues(name) -} - -func (prometheusMetricsProvider) NewShortWatchesMetric(name string) cache.CounterMetric { - return shortWatchesTotal.WithLabelValues(name) -} - -// use summary to get averages and percentiles -func (prometheusMetricsProvider) NewWatchDurationMetric(name string) cache.SummaryMetric { - return watchDuration.WithLabelValues(name) -} - -// use summary to get averages and percentiles -func (prometheusMetricsProvider) NewItemsInWatchMetric(name string) cache.SummaryMetric { - return itemsPerWatch.WithLabelValues(name) -} - -func (prometheusMetricsProvider) NewLastResourceVersionMetric(name string) cache.GaugeMetric { - return lastResourceVersion.WithLabelValues(name) -}