From aef8672b6326c02db40498eef63647f408c5f618 Mon Sep 17 00:00:00 2001
From: Elad Nachmias <theman@elad.im>
Date: Mon, 10 Dec 2018 23:14:13 +0530
Subject: [PATCH] swarm/api/client: address pr comments

---
 swarm/api/client/client.go | 32 +++++++++++++-------------------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/swarm/api/client/client.go b/swarm/api/client/client.go
index 570c580690..fad5b652c6 100644
--- a/swarm/api/client/client.go
+++ b/swarm/api/client/client.go
@@ -42,7 +42,6 @@ import (
 	"github.com/ethereum/go-ethereum/swarm/api"
 	"github.com/ethereum/go-ethereum/swarm/spancontext"
 	"github.com/ethereum/go-ethereum/swarm/storage/feed"
-	opentracing "github.com/opentracing/opentracing-go"
 	"github.com/pborman/uuid"
 )
 
@@ -503,12 +502,7 @@ func (c *Client) TarUpload(hash string, uploader Uploader, defaultPath string, t
 		return "", err
 	}
 
-	opentracing.GlobalTracer().Inject(
-		sp.Context(),
-		opentracing.HTTPHeaders,
-		opentracing.HTTPHeadersCarrier(req.Header))
-
-	trace := GetClientTrace("swarm api client - upload tar", "swarm.api.client.uploadtar", uuid.New()[:8], &tn)
+	trace := GetClientTrace("swarm api client - upload tar", "api.client.uploadtar", uuid.New()[:8], &tn)
 
 	req = req.WithContext(httptrace.WithClientTrace(ctx, trace))
 	transport := http.DefaultTransport
@@ -757,51 +751,51 @@ func GetClientTrace(traceMsg, metricPrefix, ruid string, tn *time.Time) *httptra
 	trace := &httptrace.ClientTrace{
 		GetConn: func(_ string) {
 			log.Trace(traceMsg+" - http get", "event", "GetConn", "ruid", ruid)
-			metrics.GetOrRegisterResettingTimer(metricPrefix+".fetch.clienttrace.getconn", nil).Update(time.Since(*tn))
+			metrics.GetOrRegisterResettingTimer(metricPrefix+".getconn", nil).Update(time.Since(*tn))
 		},
 		GotConn: func(_ httptrace.GotConnInfo) {
 			log.Trace(traceMsg+" - http get", "event", "GotConn", "ruid", ruid)
-			metrics.GetOrRegisterResettingTimer(metricPrefix+".fetch.clienttrace.gotconn", nil).Update(time.Since(*tn))
+			metrics.GetOrRegisterResettingTimer(metricPrefix+".gotconn", nil).Update(time.Since(*tn))
 		},
 		PutIdleConn: func(err error) {
 			log.Trace(traceMsg+" - http get", "event", "PutIdleConn", "ruid", ruid, "err", err)
-			metrics.GetOrRegisterResettingTimer(metricPrefix+".fetch.clienttrace.putidle", nil).Update(time.Since(*tn))
+			metrics.GetOrRegisterResettingTimer(metricPrefix+".putidle", nil).Update(time.Since(*tn))
 		},
 		GotFirstResponseByte: func() {
 			log.Trace(traceMsg+" - http get", "event", "GotFirstResponseByte", "ruid", ruid)
-			metrics.GetOrRegisterResettingTimer(metricPrefix+".fetch.clienttrace.firstbyte", nil).Update(time.Since(*tn))
+			metrics.GetOrRegisterResettingTimer(metricPrefix+".firstbyte", nil).Update(time.Since(*tn))
 		},
 		Got100Continue: func() {
 			log.Trace(traceMsg, "event", "Got100Continue", "ruid", ruid)
-			metrics.GetOrRegisterResettingTimer(metricPrefix+".fetch.clienttrace.got100continue", nil).Update(time.Since(*tn))
+			metrics.GetOrRegisterResettingTimer(metricPrefix+".got100continue", nil).Update(time.Since(*tn))
 		},
 		DNSStart: func(_ httptrace.DNSStartInfo) {
 			log.Trace(traceMsg, "event", "DNSStart", "ruid", ruid)
-			metrics.GetOrRegisterResettingTimer(metricPrefix+".fetch.clienttrace.dnsstart", nil).Update(time.Since(*tn))
+			metrics.GetOrRegisterResettingTimer(metricPrefix+".dnsstart", nil).Update(time.Since(*tn))
 		},
 		DNSDone: func(_ httptrace.DNSDoneInfo) {
 			log.Trace(traceMsg, "event", "DNSDone", "ruid", ruid)
-			metrics.GetOrRegisterResettingTimer(metricPrefix+".fetch.clienttrace.dnsdone", nil).Update(time.Since(*tn))
+			metrics.GetOrRegisterResettingTimer(metricPrefix+".dnsdone", nil).Update(time.Since(*tn))
 		},
 		ConnectStart: func(network, addr string) {
 			log.Trace(traceMsg, "event", "ConnectStart", "ruid", ruid, "network", network, "addr", addr)
-			metrics.GetOrRegisterResettingTimer(metricPrefix+".fetch.clienttrace.connectstart", nil).Update(time.Since(*tn))
+			metrics.GetOrRegisterResettingTimer(metricPrefix+".connectstart", nil).Update(time.Since(*tn))
 		},
 		ConnectDone: func(network, addr string, err error) {
 			log.Trace(traceMsg, "event", "ConnectDone", "ruid", ruid, "network", network, "addr", addr, "err", err)
-			metrics.GetOrRegisterResettingTimer(metricPrefix+".fetch.clienttrace.connectdone", nil).Update(time.Since(*tn))
+			metrics.GetOrRegisterResettingTimer(metricPrefix+".connectdone", nil).Update(time.Since(*tn))
 		},
 		WroteHeaders: func() {
 			log.Trace(traceMsg, "event", "WroteHeaders(request)", "ruid", ruid)
-			metrics.GetOrRegisterResettingTimer(metricPrefix+".fetch.clienttrace.wroteheaders", nil).Update(time.Since(*tn))
+			metrics.GetOrRegisterResettingTimer(metricPrefix+".wroteheaders", nil).Update(time.Since(*tn))
 		},
 		Wait100Continue: func() {
 			log.Trace(traceMsg, "event", "Wait100Continue", "ruid", ruid)
-			metrics.GetOrRegisterResettingTimer(metricPrefix+".fetch.clienttrace.wait100continue", nil).Update(time.Since(*tn))
+			metrics.GetOrRegisterResettingTimer(metricPrefix+".wait100continue", nil).Update(time.Since(*tn))
 		},
 		WroteRequest: func(_ httptrace.WroteRequestInfo) {
 			log.Trace(traceMsg, "event", "WroteRequest", "ruid", ruid)
-			metrics.GetOrRegisterResettingTimer(metricPrefix+".fetch.clienttrace.wroterequest", nil).Update(time.Since(*tn))
+			metrics.GetOrRegisterResettingTimer(metricPrefix+".wroterequest", nil).Update(time.Since(*tn))
 		},
 	}
 	return trace