From 241119a970fbddb581155592854a2a662849c7f7 Mon Sep 17 00:00:00 2001
From: lash <dev@holbrook.no>
Date: Mon, 11 Feb 2019 15:57:59 +0100
Subject: [PATCH] swarm/network: Remove useless span remember

---
 swarm/network/stream/delivery.go | 11 -----------
 swarm/network/stream/peer.go     | 15 ---------------
 2 files changed, 26 deletions(-)

diff --git a/swarm/network/stream/delivery.go b/swarm/network/stream/delivery.go
index d0417a39ac..3353c435ee 100644
--- a/swarm/network/stream/delivery.go
+++ b/swarm/network/stream/delivery.go
@@ -209,22 +209,11 @@ type ChunkDeliveryMsgSyncing ChunkDeliveryMsg
 
 // TODO: Fix context SNAFU
 func (d *Delivery) handleChunkDeliveryMsg(ctx context.Context, sp *Peer, req *ChunkDeliveryMsg) error {
-	//	var osp opentracing.Span
-	//	ctx, osp = spancontext.StartSpan(
-	//		ctx,
-	//		"chunk.delivery")
-
-	spanId := fmt.Sprintf("request.%v.%v", sp.ID(), req.Addr)
-	span, spanOk := sp.spans.Load(spanId)
-	sp.spans.Delete(spanId)
 
 	processReceivedChunksCount.Inc(1)
 
 	go func() {
 		//defer osp.Finish()
-		if spanOk {
-			defer span.(opentracing.Span).Finish()
-		}
 
 		req.peer = sp
 		err := d.chunkStore.Put(ctx, storage.NewChunk(req.Addr, req.SData))
diff --git a/swarm/network/stream/peer.go b/swarm/network/stream/peer.go
index 690e84f7ff..abe8c7619b 100644
--- a/swarm/network/stream/peer.go
+++ b/swarm/network/stream/peer.go
@@ -65,7 +65,6 @@ type Peer struct {
 	// on creating a new client in offered hashes handler.
 	clientParams map[Stream]*clientParams
 	quit         chan struct{}
-	spans        sync.Map
 }
 
 type WrappedPriorityMsg struct {
@@ -83,16 +82,10 @@ func NewPeer(peer *protocols.Peer, streamer *Registry) *Peer {
 		clients:      make(map[Stream]*client),
 		clientParams: make(map[Stream]*clientParams),
 		quit:         make(chan struct{}),
-		spans:        sync.Map{},
 	}
 	ctx, cancel := context.WithCancel(context.Background())
 	go p.pq.Run(ctx, func(i interface{}) {
 		wmsg := i.(WrappedPriorityMsg)
-		//		defer p.spans.Delete(wmsg.Context)
-		//		sp, ok := p.spans.Load(wmsg.Context)
-		//		if ok {
-		//			defer sp.(opentracing.Span).Finish()
-		//		}
 		err := p.Send(wmsg.Context, wmsg.Msg)
 		if err != nil {
 			log.Error("Message send error, dropping peer", "peer", p.ID(), "err", err)
@@ -166,14 +159,6 @@ func (p *Peer) Deliver(ctx context.Context, chunk storage.Chunk, priority uint8,
 func (p *Peer) SendPriority(ctx context.Context, msg interface{}, priority uint8, traceId string) error {
 	defer metrics.GetOrRegisterResettingTimer(fmt.Sprintf("peer.sendpriority_t.%d", priority), nil).UpdateSince(time.Now())
 	metrics.GetOrRegisterCounter(fmt.Sprintf("peer.sendpriority.%d", priority), nil).Inc(1)
-	if traceId != "" {
-		var sp opentracing.Span
-		ctx, sp = spancontext.StartSpan(
-			ctx,
-			traceId,
-		)
-		p.spans.Store(traceId, sp)
-	}
 	wmsg := WrappedPriorityMsg{
 		Context: ctx,
 		Msg:     msg,