From 73364460cd01a6f9b3123f6dcb501f30076c1d57 Mon Sep 17 00:00:00 2001 From: Anton Evangelatov Date: Mon, 10 Dec 2018 19:46:20 +0100 Subject: [PATCH] swarm/api/http: remove opentracing --- swarm/api/http/middleware.go | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/swarm/api/http/middleware.go b/swarm/api/http/middleware.go index 42dd34cf5b..f7f819eab5 100644 --- a/swarm/api/http/middleware.go +++ b/swarm/api/http/middleware.go @@ -11,8 +11,7 @@ import ( "github.com/ethereum/go-ethereum/swarm/api" "github.com/ethereum/go-ethereum/swarm/log" "github.com/ethereum/go-ethereum/swarm/sctx" - opentracing "github.com/opentracing/opentracing-go" - "github.com/opentracing/opentracing-go/ext" + "github.com/ethereum/go-ethereum/swarm/spancontext" "github.com/pborman/uuid" ) @@ -95,10 +94,7 @@ func InstrumentOpenTracing(h http.Handler) http.Handler { return } spanName := fmt.Sprintf("http.%s.%s", r.Method, uri.Scheme) - wireContext, _ := opentracing.GlobalTracer().Extract( - opentracing.HTTPHeaders, - opentracing.HTTPHeadersCarrier(r.Header)) - sp, ctx := opentracing.StartSpanFromContext(r.Context(), spanName, ext.RPCServerOption(wireContext)) + ctx, sp := spancontext.StartSpan(r.Context(), spanName) defer sp.Finish() h.ServeHTTP(w, r.WithContext(ctx))