Fix metrics registry in agents

BBVA · Apr 1, 2019 · 09efd47 · 09efd47
1 parent 9a6a9d9
commit 09efd47
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 17 deletions.
diff --git a/gossip/auditor/auditor.go b/gossip/auditor/auditor.go
@@ -131,7 +131,7 @@ func (a Auditor) RegisterMetrics(srv *metrics.Server) {
 		QedAuditorBatchesReceivedTotal,
 		QedAuditorGetMembershipProofErrTotal,
 	}
-	srv.Register(metrics)
+	srv.MustRegister(metrics...)
 }
 
 func (a Auditor) runTaskDispatcher() {

diff --git a/gossip/monitor/monitor.go b/gossip/monitor/monitor.go
@@ -128,7 +128,7 @@ func (m Monitor) RegisterMetrics(srv *metrics.Server) {
 		QedMonitorBatchesProcessSeconds,
 		QedMonitorGetIncrementalProofErrTotal,
 	}
-	srv.Register(metrics)
+	srv.MustRegister(metrics...)
 }
 
 func (m Monitor) Process(b *protocol.BatchSnapshots) {

diff --git a/gossip/publisher/publisher.go b/gossip/publisher/publisher.go
@@ -112,7 +112,7 @@ func (p Publisher) RegisterMetrics(srv *metrics.Server) {
 		QedPublisherBatchesReceivedTotal,
 		QedPublisherBatchesProcessSeconds,
 	}
-	srv.Register(metrics)
+	srv.MustRegister(metrics...)
 }
 
 func (p *Publisher) Process(b *protocol.BatchSnapshots) {

diff --git a/gossip/sender/sender.go b/gossip/sender/sender.go
@@ -99,7 +99,7 @@ func (s Sender) RegisterMetrics(srv *metrics.Server) {
 		QedSenderInstancesCount,
 		QedSenderBatchesSentTotal,
 	}
-	srv.Register(metrics)
+	srv.MustRegister(metrics...)
 }
 
 func (s Sender) newBatch() *protocol.BatchSnapshots {

diff --git a/metrics/metrics.go b/metrics/metrics.go
@@ -84,20 +84,12 @@ func (m Server) Shutdown() {
 
 // Register registers a prometheus collector in the prometheus registry used
 // by the metrics server.
-func (m Server) Register(collector prometheus.Collector) {
-	if err := m.registry.Register(collector); err != nil {
-		log.Infof("metric not registered:", err)
-	}
+func (m Server) Register(collector prometheus.Collector) error {
+	return m.registry.Register(collector)
 }
 
 // MustRegister registers multiple prometheus collectors in the prometheus registry used
 // by the metrics server.
 func (m Server) MustRegister(collectors ...prometheus.Collector) {
-	for _, c := range collectors {
-		if err := m.registry.Register(c); err != nil {
-			log.Infof("metric not registered:", err)
-		} else {
-			log.Infof("metric registered.")
-		}
-	}
+	m.registry.MustRegister(collectors...)
 }
diff --git a/server/server.go b/server/server.go
@@ -120,8 +120,8 @@ func NewServer(conf *Config) (*Server, error) {
 
 	// create metrics server and register default qed metrics
 	server.metricsServer = metrics.NewServer(conf.MetricsAddr)
-	server.metricsServer.Register(metrics.DefaultMetrics)
-	store.RegisterMetrics(server.metricsServer.Register)
+	server.metricsServer.MustRegister(metrics.DefaultMetrics...)
+	store.RegisterMetrics(server.metricsServer)
 	// server.metricsServer.Register(raft.PrometheusCollectors())
 	// server.metricsServer.Register(balloon.PrometheusCollectors())