diff --git a/swarm/network/stream/delivery.go b/swarm/network/stream/delivery.go
index e051b804ca..02c5f222c5 100644
--- a/swarm/network/stream/delivery.go
+++ b/swarm/network/stream/delivery.go
@@ -275,8 +275,8 @@ func (d *Delivery) RequestFromPeers(ctx context.Context, req *network.Request) (
 
 	// setting this value in the context creates a new span that can persist across the sendpriority queue and the network roundtrip
 	// this span will finish only when delivery is handled (or times out)
-	ctx = context.WithValue(ctx, "stream_send_tag", "stream.send.request")
-	ctx = context.WithValue(ctx, "stream_send_meta", fmt.Sprintf("%v.%v", sp.ID(), req.Addr))
+	ctx = context.WithValue(ctx, tracing.StoreLabelId, "stream.send.request")
+	ctx = context.WithValue(ctx, tracing.StoreLabelMeta, fmt.Sprintf("%v.%v", sp.ID(), req.Addr))
 	err := sp.SendPriority(ctx, &RetrieveRequestMsg{
 		Addr:      req.Addr,
 		SkipCheck: req.SkipCheck,
diff --git a/swarm/tracing/tracing.go b/swarm/tracing/tracing.go
index 9ad7e48ec1..d1ec1baadd 100644
--- a/swarm/tracing/tracing.go
+++ b/swarm/tracing/tracing.go
@@ -23,7 +23,11 @@ var (
 )
 
 // TracingEnabledFlag is the CLI flag name to use to enable trace collections.
-const TracingEnabledFlag = "tracing"
+const (
+	TracingEnabledFlag = "tracing"
+	StoreLabelId       = "span_save_id"
+	StoreLabelMeta     = "span_save_meta"
+)
 
 var (
 	Closer io.Closer
@@ -117,7 +121,8 @@ func StartSaveSpan(ctx context.Context) context.Context {
 	if !Enabled {
 		return ctx
 	}
-	traceId := ctx.Value("span_save_id")
+	traceId := ctx.Value(StoreLabelId)
+
 	if traceId != nil {
 		traceStr := traceId.(string)
 		var sp opentracing.Span
@@ -125,11 +130,11 @@ func StartSaveSpan(ctx context.Context) context.Context {
 			ctx,
 			traceStr,
 		)
-		traceMeta := ctx.Value("span_save_meta")
+		traceMeta := ctx.Value(StoreLabelMeta)
 		if traceMeta != nil {
 			traceStr = traceStr + "." + traceMeta.(string)
 		}
-		store.spans.Store(traceId, sp)
+		store.spans.Store(traceStr, sp)
 	}
 	return ctx
 }