bump prometheus with zipkin (#4109)

Signed-off-by: zounengren <zounengren@cmss.chinamobile.com>

go.mod

@@ -23,15 +23,16 @@ require (
 	github.com/miekg/dns v1.1.31
 	github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492 // indirect
 	github.com/opentracing/opentracing-go v1.2.0
-	github.com/openzipkin-contrib/zipkin-go-opentracing v0.3.5
+	github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5
+	github.com/openzipkin/zipkin-go v0.2.2
 	github.com/philhofer/fwd v1.0.0 // indirect
 	github.com/prometheus/client_golang v1.7.1
 	github.com/prometheus/client_model v0.2.0
-	github.com/prometheus/common v0.10.0
+	github.com/prometheus/common v0.13.0
 	go.etcd.io/etcd v0.5.0-alpha.5.0.20200306183522-221f0cc107cb
 	go.uber.org/zap v1.14.1 // indirect
 	golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
-	golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4
+	golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae
 	google.golang.org/api v0.29.0
 	google.golang.org/grpc v1.29.1
 	gopkg.in/DataDog/dd-trace-go.v1 v1.26.0

plugin/trace/trace.go

@@ -17,7 +17,9 @@ import (
 
 	"github.com/miekg/dns"
 	ot "github.com/opentracing/opentracing-go"
-	zipkin "github.com/openzipkin-contrib/zipkin-go-opentracing"
+	zipkinot "github.com/openzipkin-contrib/zipkin-go-opentracing"
+	"github.com/openzipkin/zipkin-go"
+	zipkinhttp "github.com/openzipkin/zipkin-go/reporter/http"
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/opentracer"
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer"
 )
@@ -64,15 +66,16 @@ func (t *trace) OnStartup() error {
 }
 
 func (t *trace) setupZipkin() error {
-
-	collector, err := zipkin.NewHTTPCollector(t.Endpoint)
+	reporter := zipkinhttp.NewReporter(t.Endpoint)
+	recorder, err := zipkin.NewEndpoint(t.serviceName, t.serviceEndpoint)
+	if err != nil {
+		log.Warningf("build Zipkin endpoint found err: %v", err)
+	}
+	tracer, err := zipkin.NewTracer(reporter, zipkin.WithLocalEndpoint(recorder))
 	if err != nil {
 		return err
 	}
-
-	recorder := zipkin.NewRecorder(collector, false, t.serviceEndpoint, t.serviceName)
-	t.tracer, err = zipkin.NewTracer(recorder, zipkin.ClientServerSameSpan(t.clientServer))
-
+	t.tracer = zipkinot.Wrap(tracer)
 	return err
 }
 
@@ -111,4 +114,4 @@ func (t *trace) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg)
 
 func spanName(ctx context.Context, req request.Request) string {
 	return "servedns:" + metrics.WithServer(ctx) + " " + req.Name()
-}
+}
\ No newline at end of file