From 527d03e0d2966a9e4bd0190376c9f402d1f6a3a6 Mon Sep 17 00:00:00 2001 From: tylerauerbeck Date: Wed, 25 Oct 2017 22:38:10 -0400 Subject: [PATCH] etcdserver: update metrics to use promhttp Update api/etcdhttp/metrics.go to use promhttp.Handler() instead of prometheus.Handler() fixes #8729 --- etcdserver/api/etcdhttp/metrics.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/etcdserver/api/etcdhttp/metrics.go b/etcdserver/api/etcdhttp/metrics.go index 23e7aff86..02eea64c2 100644 --- a/etcdserver/api/etcdhttp/metrics.go +++ b/etcdserver/api/etcdhttp/metrics.go @@ -24,7 +24,7 @@ import ( "github.com/coreos/etcd/etcdserver/etcdserverpb" "github.com/coreos/etcd/raft" - "github.com/prometheus/client_golang/prometheus" + "github.com/prometheus/client_golang/prometheus/promhttp" ) const ( @@ -34,13 +34,13 @@ const ( // HandleMetricsHealth registers metrics and health handlers. func HandleMetricsHealth(mux *http.ServeMux, srv etcdserver.ServerV2) { - mux.Handle(pathMetrics, prometheus.Handler()) + mux.Handle(pathMetrics, promhttp.Handler()) mux.Handle(PathHealth, NewHealthHandler(func() Health { return checkHealth(srv) })) } // HandlePrometheus registers prometheus handler on '/metrics'. func HandlePrometheus(mux *http.ServeMux) { - mux.Handle(pathMetrics, prometheus.Handler()) + mux.Handle(pathMetrics, promhttp.Handler()) } // HandleHealth registers health handler on '/health'.