From 53940dda186d668bf4cef60469952e71fef27b3c Mon Sep 17 00:00:00 2001
From: Vasiliy Tolstov <v.tolstov@unistack.org>
Date: Thu, 16 Apr 2020 01:10:43 +0300
Subject: [PATCH] wrapper/monitoring/prometheus: use default registry (#532)

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
---
 prometheus.go      |  8 +++-----
 prometheus_test.go | 10 +++++++---
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/prometheus.go b/prometheus.go
index 887b41e..44f9fd4 100644
--- a/prometheus.go
+++ b/prometheus.go
@@ -60,17 +60,15 @@ func NewHandlerWrapper(opts ...server.Option) server.HandlerWrapper {
 		[]string{"method"},
 	)
 
-	reg := prometheus.NewRegistry()
-	wrapreg := prometheus.WrapRegistererWith(md, reg)
+	wrapreg := prometheus.WrapRegistererWith(md, prometheus.DefaultRegisterer)
 	wrapreg.MustRegister(
-		prometheus.NewProcessCollector(prometheus.ProcessCollectorOpts{}),
-		prometheus.NewGoCollector(),
+		//prometheus.NewProcessCollector(prometheus.ProcessCollectorOpts{}),
+		//prometheus.NewGoCollector(),
 		opsCounter,
 		timeCounterSummary,
 		timeCounterHistogram,
 	)
 
-	prometheus.DefaultGatherer = reg
 	prometheus.DefaultRegisterer = wrapreg
 
 	return func(fn server.HandlerFunc) server.HandlerFunc {
diff --git a/prometheus_test.go b/prometheus_test.go
index 5d958da..f8a1e2c 100644
--- a/prometheus_test.go
+++ b/prometheus_test.go
@@ -5,6 +5,8 @@ import (
 	"fmt"
 	"testing"
 
+	"github.com/micro/go-micro/v2/broker"
+	bmemory "github.com/micro/go-micro/v2/broker/memory"
 	"github.com/micro/go-micro/v2/client"
 	"github.com/micro/go-micro/v2/client/selector"
 	"github.com/micro/go-micro/v2/registry/memory"
@@ -34,8 +36,9 @@ func (t *testHandler) Method(ctx context.Context, req *TestRequest, rsp *TestRes
 
 func TestPrometheusMetrics(t *testing.T) {
 	// setup
-	registry := memory.NewRegistry()
-	sel := selector.NewSelector(selector.Registry(registry))
+	reg := memory.NewRegistry()
+	brk := bmemory.NewBroker(broker.Registry(reg))
+	sel := selector.NewSelector(selector.Registry(reg))
 
 	name := "test"
 	id := "id-1234567890"
@@ -50,7 +53,8 @@ func TestPrometheusMetrics(t *testing.T) {
 		server.Name(name),
 		server.Version(version),
 		server.Id(id),
-		server.Registry(registry),
+		server.Registry(reg),
+		server.Broker(brk),
 		server.WrapHandler(
 			NewHandlerWrapper(
 				server.Metadata(md),