From a09eea8d4d06a4793fb5493ff064d57693f95863 Mon Sep 17 00:00:00 2001
From: Micro <micro@Bens-MacBook-Pro-2.local>
Date: Wed, 29 Jan 2020 16:05:58 +0000
Subject: [PATCH] Update the Debug Handler to use the servers tracer

---
 debug/service/handler/debug.go | 20 ++++++++------------
 service.go                     |  2 +-
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/debug/service/handler/debug.go b/debug/service/handler/debug.go
index f9258abc..a6a4dbff 100644
--- a/debug/service/handler/debug.go
+++ b/debug/service/handler/debug.go
@@ -12,10 +12,14 @@ import (
 	"github.com/micro/go-micro/server"
 )
 
-var (
-	// DefaultHandler is default debug handler
-	DefaultHandler = newDebug()
-)
+// NewHandler returns an instance of the Debug Handler
+func NewHandler(srv server.Server) *Debug {
+	return &Debug{
+		log:   log.DefaultLog,
+		stats: stats.DefaultStats,
+		trace: srv.Options().Tracer,
+	}
+}
 
 type Debug struct {
 	// must honour the debug handler
@@ -28,14 +32,6 @@ type Debug struct {
 	trace trace.Tracer
 }
 
-func newDebug() *Debug {
-	return &Debug{
-		log:   log.DefaultLog,
-		stats: stats.DefaultStats,
-		trace: trace.DefaultTracer,
-	}
-}
-
 func (d *Debug) Health(ctx context.Context, req *proto.HealthRequest, rsp *proto.HealthResponse) error {
 	rsp.Status = "ok"
 	return nil
diff --git a/service.go b/service.go
index 9d2a955b..231faae9 100644
--- a/service.go
+++ b/service.go
@@ -158,7 +158,7 @@ func (s *service) Run() error {
 	// register the debug handler
 	s.opts.Server.Handle(
 		s.opts.Server.NewHandler(
-			handler.DefaultHandler,
+			handler.NewHandler(s.Options().Server),
 			server.InternalHandler(true),
 		),
 	)