Ignore non-existent span headers

Author: bergundy

contrib/opentelemetry/tracing_interceptor.go

@@ -148,6 +148,11 @@ func (t *tracer) Options() interceptor.TracerOptions {
 }
 
 func (t *tracer) UnmarshalSpan(m map[string]string) (interceptor.TracerSpanRef, error) {
+	if _, ok := m["traceparent"]; !ok {
+		// If there is no span, return nothing, but don't error out. This is
+		// a legitimate place where a span does not exist in the headers
+		return nil, nil
+	}
 	ctx := t.options.TextMapPropagator.Extract(context.Background(), textMapCarrier(m))
 	spanCtx := trace.SpanContextFromContext(ctx)
 	if !spanCtx.IsValid() {

contrib/opentracing/interceptor.go

@@ -25,6 +25,7 @@ package opentracing
 
 import (
 	"context"
+	"errors"
 	"fmt"
 
 	"github.com/opentracing/opentracing-go"
@@ -111,6 +112,11 @@ func (t *tracer) Options() interceptor.TracerOptions {
 
 func (t *tracer) UnmarshalSpan(m map[string]string) (interceptor.TracerSpanRef, error) {
 	ctx, err := t.options.Tracer.Extract(opentracing.TextMap, opentracing.TextMapCarrier(m))
+	if errors.Is(err, opentracing.ErrSpanContextNotFound) {
+		// If there is no span, return nothing, but don't error out. This is
+		// a legitimate place where a span does not exist in the headers
+		return nil, nil
+	}
 	if err != nil {
 		return nil, err
 	}

interceptor/tracing_interceptor.go

@@ -1023,11 +1023,7 @@ func (t *tracingInterceptor) writeSpanToNexusHeader(span TracerSpan, header nexu
 }
 
 func (t *tracingInterceptor) readSpanFromNexusHeader(header nexus.Header) (TracerSpanRef, error) {
-	// Ignore unmarshal errors, e.g. when an expected header isn't set.
-	// This works differently from non Nexus headers where the trace context is serialized entirely into a single
-	// payload and the presence of that payload implies a valid header.
-	span, _ := t.tracer.UnmarshalSpan(header)
-	return span, nil
+	return t.tracer.UnmarshalSpan(header)
 }
 
 func workflowFutureFromErr(ctx workflow.Context, err error) workflow.Future {