remove warning on fail (#4)

Author: michalderdak

ctxtrace.go

@@ -92,19 +92,17 @@ func ExtractHTTPToContext(ctx context.Context, r *http.Request) context.Context
 	return context.WithValue(ctx, traceCtxMarker{}, data)
 }
 
-func addOtelSpanContextToContext(ctx context.Context, traceData TraceData) (context.Context, error) {
+func addOtelSpanContextToContext(ctx context.Context, traceData TraceData) context.Context {
 	traceIDString := traceData.TraceSpan.TraceID.String()
 	traceID, err := trace.IDFromHex(traceIDString)
-
 	if err != nil {
-		return ctx, err
+		return ctx
 	}
 
 	spanIDString := traceData.TraceSpan.ID.String()
 	spanID, err := trace.SpanIDFromHex(spanIDString)
-
 	if err != nil {
-		return ctx, err
+		return ctx
 	}
 
 	traceFlags := trace.FlagsUnused
@@ -113,9 +111,11 @@ func addOtelSpanContextToContext(ctx context.Context, traceData TraceData) (cont
 	}
 
 	spanContext := trace.SpanContext{TraceID: traceID, SpanID: spanID, TraceFlags: traceFlags}
-	ctx = trace.ContextWithRemoteSpanContext(ctx, spanContext)
+	if !spanContext.IsValid() {
+		return ctx
+	}
 
-	return ctx, nil
+	return trace.ContextWithRemoteSpanContext(ctx, spanContext)
 }
 
 // finds caller information in the gRPC metadata and adds it to the context
@@ -130,11 +130,7 @@ func extractMetadataToContext(ctx context.Context) context.Context {
 		zap.L().Warn("b3 extract failed", zap.Error(err))
 	} else {
 		data.TraceSpan = span
-
-		ctx, err = addOtelSpanContextToContext(ctx, data)
-		if err != nil {
-			zap.L().Warn("opentelemetry context failed", zap.Error(err))
-		}
+		ctx = addOtelSpanContextToContext(ctx, data)
 	}
 
 	if mdValue, ok := md[headerRequestID]; ok && len(mdValue) != 0 {

ctxtrace_test.go

@@ -34,7 +34,7 @@ func TestPackMetadata(t *testing.T) {
 	}
 }
 
-func TestOpenTelemetryContextNotSmapled(t *testing.T) {
+func TestAddOtelSpanContextToContext_NotSmapled(t *testing.T) {
 	r := httptest.NewRequest("GET", "/foo", nil)
 	r.Header.Set(headerRequestID, dummyRequestID)
 	r.Header.Set(b3.ParentSpanID, "0716f381a10c2a9b")
@@ -46,8 +46,7 @@ func TestOpenTelemetryContextNotSmapled(t *testing.T) {
 	data, err := ExtractHTTP(r)
 	assert.Nil(t, err)
 
-	ctx, err = addOtelSpanContextToContext(ctx, data)
-	assert.Nil(t, err)
+	ctx = addOtelSpanContextToContext(ctx, data)
 
 	spanContext := trace.RemoteSpanContextFromContext(ctx)
 
@@ -57,7 +56,7 @@ func TestOpenTelemetryContextNotSmapled(t *testing.T) {
 	assert.Equal(t, spanContext.TraceID.String(), data.TraceSpan.TraceID.String())
 }
 
-func TestOpenTelemetryContextSmapled(t *testing.T) {
+func TestAddOtelSpanContextToContext_Smapled(t *testing.T) {
 	r := httptest.NewRequest("GET", "/foo", nil)
 	r.Header.Set(headerRequestID, dummyRequestID)
 	r.Header.Set(b3.ParentSpanID, "0716f381a10c2a9b")
@@ -69,8 +68,7 @@ func TestOpenTelemetryContextSmapled(t *testing.T) {
 	data, err := ExtractHTTP(r)
 	assert.Nil(t, err)
 
-	ctx, err = addOtelSpanContextToContext(ctx, data)
-	assert.Nil(t, err)
+	ctx = addOtelSpanContextToContext(ctx, data)
 
 	spanContext := trace.RemoteSpanContextFromContext(ctx)
 
@@ -80,6 +78,28 @@ func TestOpenTelemetryContextSmapled(t *testing.T) {
 	assert.Equal(t, spanContext.TraceID.String(), data.TraceSpan.TraceID.String())
 }
 
+func TestAddOtelSpanContextToContext_InvalidParent(t *testing.T) {
+	r := httptest.NewRequest("GET", "/foo", nil)
+	r.Header.Set(headerRequestID, dummyRequestID)
+	r.Header.Set(b3.ParentSpanID, "")
+	r.Header.Set(b3.Sampled, "1")
+	r.Header.Set(b3.SpanID, "")
+	r.Header.Set(b3.TraceID, "")
+
+	ctx := context.Background()
+	data, err := ExtractHTTP(r)
+	assert.Nil(t, err)
+
+	ctx = addOtelSpanContextToContext(ctx, data)
+
+	// If there's no spanContext in the ctx, default EmptySpanContext is returned
+	spanContext := trace.RemoteSpanContextFromContext(ctx)
+
+	assert.NotNil(t, spanContext)
+	assert.False(t, spanContext.IsValid())
+	assert.Equal(t, spanContext, trace.EmptySpanContext())
+}
+
 func TestExtractHTTP(t *testing.T) {
 	r := httptest.NewRequest("GET", "/foo", nil)
 	r.Header.Set(headerRequestID, dummyRequestID)