From 78d24f59dd26fb598045b283ce74c6f2b01244cd Mon Sep 17 00:00:00 2001 From: wuyafang Date: Fri, 25 Oct 2019 16:56:44 +0800 Subject: [PATCH] remove reference to promhttp in kubelet --- pkg/kubelet/server/BUILD | 1 - pkg/kubelet/server/server.go | 9 ++++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pkg/kubelet/server/BUILD b/pkg/kubelet/server/BUILD index 43d943603dd..cc0af5fa019 100644 --- a/pkg/kubelet/server/BUILD +++ b/pkg/kubelet/server/BUILD @@ -53,7 +53,6 @@ go_library( "//vendor/github.com/google/cadvisor/info/v1:go_default_library", "//vendor/github.com/google/cadvisor/metrics:go_default_library", "//vendor/github.com/prometheus/client_golang/prometheus:go_default_library", - "//vendor/github.com/prometheus/client_golang/prometheus/promhttp:go_default_library", "//vendor/google.golang.org/grpc:go_default_library", "//vendor/k8s.io/klog:go_default_library", ], diff --git a/pkg/kubelet/server/server.go b/pkg/kubelet/server/server.go index 51862f45445..f24627dd15d 100644 --- a/pkg/kubelet/server/server.go +++ b/pkg/kubelet/server/server.go @@ -37,11 +37,10 @@ import ( cadvisorapi "github.com/google/cadvisor/info/v1" "github.com/google/cadvisor/metrics" "github.com/prometheus/client_golang/prometheus" - "github.com/prometheus/client_golang/prometheus/promhttp" "google.golang.org/grpc" "k8s.io/klog" - v1 "k8s.io/api/core/v1" + "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" @@ -318,13 +317,13 @@ func (s *Server) InstallDefaultHandlers(enableCAdvisorJSONEndpoints bool) { } r.MustRegister(metrics.NewPrometheusCollector(prometheusHostAdapter{s.host}, containerPrometheusLabelsFunc(s.host), includedMetrics)) s.restfulCont.Handle(cadvisorMetricsPath, - promhttp.HandlerFor(r, promhttp.HandlerOpts{ErrorHandling: promhttp.ContinueOnError}), + compbasemetrics.HandlerFor(r, compbasemetrics.HandlerOpts{ErrorHandling: compbasemetrics.ContinueOnError}), ) v1alpha1ResourceRegistry := prometheus.NewRegistry() v1alpha1ResourceRegistry.MustRegister(stats.NewPrometheusResourceMetricCollector(s.resourceAnalyzer, v1alpha1.Config())) s.restfulCont.Handle(path.Join(resourceMetricsPathPrefix, v1alpha1.Version), - promhttp.HandlerFor(v1alpha1ResourceRegistry, promhttp.HandlerOpts{ErrorHandling: promhttp.ContinueOnError}), + compbasemetrics.HandlerFor(v1alpha1ResourceRegistry, compbasemetrics.HandlerOpts{ErrorHandling: compbasemetrics.ContinueOnError}), ) // prober metrics are exposed under a different endpoint @@ -333,7 +332,7 @@ func (s *Server) InstallDefaultHandlers(enableCAdvisorJSONEndpoints bool) { compbasemetrics.RegisterProcessStartTime(p.RawRegister) p.MustRegister(prober.ProberResults) s.restfulCont.Handle(proberMetricsPath, - promhttp.HandlerFor(p, promhttp.HandlerOpts{ErrorHandling: promhttp.ContinueOnError}), + compbasemetrics.HandlerFor(p, compbasemetrics.HandlerOpts{ErrorHandling: compbasemetrics.ContinueOnError}), ) if enableCAdvisorJSONEndpoints {