fix: noOp span

ethersphere · Nov 4, 2023 · a7a61df · a7a61df
1 parent f09c14c
commit a7a61df
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/pkg/api/bzz.go b/pkg/api/bzz.go
@@ -247,6 +247,7 @@ func (s *Service) fileUploadHandler(
 	}
 
 	span.LogFields(olog.Bool("success", true))
+	span.SetTag("root_address", manifestReference)
 
 	if tagID != 0 {
 		w.Header().Set(SwarmTagHeader, fmt.Sprint(tagID))

diff --git a/pkg/pusher/pusher.go b/pkg/pusher/pusher.go
@@ -168,7 +168,12 @@ func (s *Service) chunksWorker(warmupTime time.Duration, tracer *tracing.Tracer)
 		s.metrics.TotalToPush.Inc()
 		startTime := time.Now()
 
-		spanCtx := tracing.WithContext(ctx, op.Span.Context())
+		spanCtx := ctx
+		if op.Span != nil {
+			spanCtx = tracing.WithContext(spanCtx, op.Span.Context())
+		} else {
+			op.Span = opentracing.NoopTracer{}.StartSpan("noOp")
+		}
 
 		if op.Direct {
 			err = s.pushDirect(spanCtx, s.logger, op)