forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-19 18:32:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

swarm/api/client: address pr comments

Browse source
This commit is contained in:
Elad Nachmias 2018-12-10 23:14:13 +05:30
parent a43801c636
commit aef8672b63
1 changed files with 13 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
swarm/api/client/client.go
View file

@ -42,7 +42,6 @@ import (
"github.com/ethereum/go-ethereum/swarm/api" "github.com/ethereum/go-ethereum/swarm/api"
"github.com/ethereum/go-ethereum/swarm/spancontext" "github.com/ethereum/go-ethereum/swarm/spancontext"
"github.com/ethereum/go-ethereum/swarm/storage/feed" "github.com/ethereum/go-ethereum/swarm/storage/feed"
opentracing "github.com/opentracing/opentracing-go"
"github.com/pborman/uuid" "github.com/pborman/uuid"
) )
@ -503,12 +502,7 @@ func (c *Client) TarUpload(hash string, uploader Uploader, defaultPath string, t
return "", err return "", err
} }
opentracing.GlobalTracer().Inject( trace := GetClientTrace("swarm api client - upload tar", "api.client.uploadtar", uuid.New()[:8], &tn)
sp.Context(),
opentracing.HTTPHeaders,
opentracing.HTTPHeadersCarrier(req.Header))
trace := GetClientTrace("swarm api client - upload tar", "swarm.api.client.uploadtar", uuid.New()[:8], &tn)
req = req.WithContext(httptrace.WithClientTrace(ctx, trace)) req = req.WithContext(httptrace.WithClientTrace(ctx, trace))
transport := http.DefaultTransport transport := http.DefaultTransport
@ -757,51 +751,51 @@ func GetClientTrace(traceMsg, metricPrefix, ruid string, tn *time.Time) *httptra
trace := &httptrace.ClientTrace{ trace := &httptrace.ClientTrace{
GetConn: func(_ string) { GetConn: func(_ string) {
log.Trace(traceMsg+" - http get", "event", "GetConn", "ruid", ruid) 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) { GotConn: func(_ httptrace.GotConnInfo) {
log.Trace(traceMsg+" - http get", "event", "GotConn", "ruid", ruid) 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) { PutIdleConn: func(err error) {
log.Trace(traceMsg+" - http get", "event", "PutIdleConn", "ruid", ruid, "err", err) 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() { GotFirstResponseByte: func() {
log.Trace(traceMsg+" - http get", "event", "GotFirstResponseByte", "ruid", ruid) 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() { Got100Continue: func() {
log.Trace(traceMsg, "event", "Got100Continue", "ruid", ruid) 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) { DNSStart: func(_ httptrace.DNSStartInfo) {
log.Trace(traceMsg, "event", "DNSStart", "ruid", ruid) 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) { DNSDone: func(_ httptrace.DNSDoneInfo) {
log.Trace(traceMsg, "event", "DNSDone", "ruid", ruid) 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) { ConnectStart: func(network, addr string) {
log.Trace(traceMsg, "event", "ConnectStart", "ruid", ruid, "network", network, "addr", addr) 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) { ConnectDone: func(network, addr string, err error) {
log.Trace(traceMsg, "event", "ConnectDone", "ruid", ruid, "network", network, "addr", addr, "err", err) 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() { WroteHeaders: func() {
log.Trace(traceMsg, "event", "WroteHeaders(request)", "ruid", ruid) 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() { Wait100Continue: func() {
log.Trace(traceMsg, "event", "Wait100Continue", "ruid", ruid) 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) { WroteRequest: func(_ httptrace.WroteRequestInfo) {
log.Trace(traceMsg, "event", "WroteRequest", "ruid", ruid) 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 return trace