gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

network/stream: remove send.offered.hashes trace (#1497)

Browse Source
This commit is contained in:
Anton Evangelatov
2019-06-18 14:53:18 +02:00
committed by GitHub
parent d589af14a8
commit 9fa6d29c88
1 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
network/stream/peer.go
View File

@ -30,11 +30,9 @@ import (
"github.com/ethersphere/swarm/network" "github.com/ethersphere/swarm/network"
pq "github.com/ethersphere/swarm/network/priorityqueue" pq "github.com/ethersphere/swarm/network/priorityqueue"
"github.com/ethersphere/swarm/network/stream/intervals" "github.com/ethersphere/swarm/network/stream/intervals"
"github.com/ethersphere/swarm/spancontext"
"github.com/ethersphere/swarm/state" "github.com/ethersphere/swarm/state"
"github.com/ethersphere/swarm/storage" "github.com/ethersphere/swarm/storage"
"github.com/ethersphere/swarm/tracing" "github.com/ethersphere/swarm/tracing"
opentracing "github.com/opentracing/opentracing-go"
) )
type notFoundError struct { type notFoundError struct {
@ -174,13 +172,6 @@ func (p *Peer) SendPriority(ctx context.Context, msg interface{}, priority uint8
// SendOfferedHashes sends OfferedHashesMsg protocol msg // SendOfferedHashes sends OfferedHashesMsg protocol msg
func (p *Peer) SendOfferedHashes(s *server, f, t uint64) error { func (p *Peer) SendOfferedHashes(s *server, f, t uint64) error {
var sp opentracing.Span
ctx, sp := spancontext.StartSpan(
context.TODO(),
"send.offered.hashes",
)
defer sp.Finish()
defer metrics.GetOrRegisterResettingTimer("send.offered.hashes", nil).UpdateSince(time.Now()) defer metrics.GetOrRegisterResettingTimer("send.offered.hashes", nil).UpdateSince(time.Now())
hashes, from, to, err := s.setNextBatch(f, t) hashes, from, to, err := s.setNextBatch(f, t)
@ -199,8 +190,7 @@ func (p *Peer) SendOfferedHashes(s *server, f, t uint64) error {
Stream: s.stream, Stream: s.stream,
} }
log.Trace("Swarm syncer offer batch", "peer", p.ID(), "stream", s.stream, "len", len(hashes), "from", from, "to", to) log.Trace("Swarm syncer offer batch", "peer", p.ID(), "stream", s.stream, "len", len(hashes), "from", from, "to", to)
ctx = context.WithValue(ctx, "stream_send_tag", "send.offered.hashes") return p.SendPriority(context.TODO(), msg, s.priority)
return p.SendPriority(ctx, msg, s.priority)
} }
func (p *Peer) getServer(s Stream) (*server, error) { func (p *Peer) getServer(s Stream) (*server, error) {