Add tracecontextb3 HTTPFormats

test/spoof/spoof.go

@@ -34,9 +34,9 @@ import (
 	"knative.dev/pkg/test/ingress"
 	"knative.dev/pkg/test/logging"
 	"knative.dev/pkg/test/zipkin"
+	"knative.dev/pkg/tracing/b3tracecontext"
 
 	"go.opencensus.io/plugin/ochttp"
-	"go.opencensus.io/plugin/ochttp/propagation/b3"
 	"go.opencensus.io/trace"
 )
 
@@ -135,7 +135,7 @@ func New(
 	// Enable Zipkin tracing
 	roundTripper := &ochttp.Transport{
 		Base:        transport,
-		Propagation: &b3.HTTPFormat{},
+		Propagation: &b3tracecontext.HTTPFormat{},
 	}
 
 	sc := SpoofingClient{

tracing/b3tracecontext/b3_traceparent.go

@@ -0,0 +1,53 @@
+/*
+Copyright 2020 The Knative Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package b3tracecontext
+
+import (
+	"net/http"
+
+	"go.opencensus.io/plugin/ochttp/propagation/b3"
+	"go.opencensus.io/plugin/ochttp/propagation/tracecontext"
+	"go.opencensus.io/trace"
+	"go.opencensus.io/trace/propagation"
+)
+
+// The propagation.HTTPFormats that this is built on.
+var (
+	b3Format     = &b3.HTTPFormat{}
+	traceContext = &tracecontext.HTTPFormat{}
+)
+
+// HTTPFormat is a propagation.HTTPFormat that reads both B3 and TraceContext tracing headers,
+// preferring TraceContext. It will write both formats.
+type HTTPFormat struct{}
+
+var _ propagation.HTTPFormat = (*HTTPFormat)(nil)
+
+func (H *HTTPFormat) SpanContextFromRequest(req *http.Request) (trace.SpanContext, bool) {
+	if sc, ok := traceContext.SpanContextFromRequest(req); ok {
+		return sc, true
+	}
+	if sc, ok := b3Format.SpanContextFromRequest(req); ok {
+		return sc, true
+	}
+	return trace.SpanContext{}, false
+}
+
+func (H *HTTPFormat) SpanContextToRequest(sc trace.SpanContext, req *http.Request) {
+	traceContext.SpanContextToRequest(sc, req)
+	b3Format.SpanContextToRequest(sc, req)
+}

tracing/b3tracecontext/b3_traceparent_test.go

@@ -0,0 +1,139 @@
+/*
+Copyright 2020 The Knative Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package b3tracecontext
+
+import (
+	"fmt"
+	"net/http"
+	"testing"
+
+	"github.com/google/go-cmp/cmp"
+	"go.opencensus.io/plugin/ochttp/propagation/b3"
+	"go.opencensus.io/plugin/ochttp/propagation/tracecontext"
+	"go.opencensus.io/trace"
+	"go.opencensus.io/trace/propagation"
+
+	_ "knative.dev/pkg/metrics/testing"
+)
+
+var (
+	sampled    trace.TraceOptions = 1
+	notSampled trace.TraceOptions = 1
+
+	traceID = trace.TraceID{99, 108, 97, 101, 114, 115, 105, 103, 104, 116, 101, 100, 110, 101, 115, 115}
+	spanID  = trace.SpanID{107, 110, 97, 116, 105, 118, 101, 0}
+
+	tracePropagators = []propagation.HTTPFormat{
+		&b3.HTTPFormat{},
+		&tracecontext.HTTPFormat{},
+		&HTTPFormat{},
+	}
+)
+
+func TestSpanContextFromRequest(t *testing.T) {
+	testCases := map[string]struct {
+		sc *trace.SpanContext
+	}{
+		"no incoming trace": {},
+		"not sampled": {
+			sc: &trace.SpanContext{
+				TraceID:      traceID,
+				SpanID:       spanID,
+				TraceOptions: notSampled,
+			},
+		},
+		"sampled": {
+			sc: &trace.SpanContext{
+				TraceID:      traceID,
+				SpanID:       spanID,
+				TraceOptions: sampled,
+			},
+		},
+	}
+
+	for _, tracePropagator := range tracePropagators {
+		for n, tc := range testCases {
+			t.Run(fmt.Sprintf("%T-%s", tracePropagator, n), func(t *testing.T) {
+				r := &http.Request{}
+				r.Header = http.Header{}
+				if tc.sc != nil {
+					tracePropagator.SpanContextToRequest(*tc.sc, r)
+				}
+				// Check we extract the correct SpanContext with both the original and the
+				// b3tracecontext propagators.
+				for _, extractFormat := range []propagation.HTTPFormat{tracePropagator, &HTTPFormat{}} {
+					actual, ok := extractFormat.SpanContextFromRequest(r)
+					if tc.sc == nil {
+						if ok {
+							t.Errorf("Expected no span context using %T, found %v", extractFormat, actual)
+						}
+						continue
+					}
+					if diff := cmp.Diff(*tc.sc, actual); diff != "" {
+						t.Errorf("Unexpected span context using %T (-want +got): %s", extractFormat, diff)
+					}
+				}
+			})
+		}
+	}
+}
+
+func TestSpanContextToRequest(t *testing.T) {
+	testCases := map[string]struct {
+		sc *trace.SpanContext
+	}{
+		"no incoming trace": {},
+		"not sampled": {
+			sc: &trace.SpanContext{
+				TraceID:      traceID,
+				SpanID:       spanID,
+				TraceOptions: notSampled,
+			},
+		},
+		"sampled": {
+			sc: &trace.SpanContext{
+				TraceID:      traceID,
+				SpanID:       spanID,
+				TraceOptions: sampled,
+			},
+		},
+	}
+
+	for n, tc := range testCases {
+		t.Run(n, func(t *testing.T) {
+			r := &http.Request{}
+			r.Header = http.Header{}
+			if tc.sc != nil {
+				// Apply using the b3tracecontext propagator.
+				(&HTTPFormat{}).SpanContextToRequest(*tc.sc, r)
+			}
+			// Verify that we extract the correct SpanContext with all three formats.
+			for _, tracePropagator := range tracePropagators {
+				actual, ok := tracePropagator.SpanContextFromRequest(r)
+				if tc.sc == nil {
+					if ok {
+						t.Errorf("Expected no span context using %T, found %v", tracePropagator, actual)
+					}
+					continue
+				}
+				if diff := cmp.Diff(*tc.sc, actual); diff != "" {
+					t.Errorf("Unexpected span context using %T (-want +got): %s", tracePropagator, diff)
+				}
+			}
+		})
+	}
+}

tracing/http.go

@@ -22,6 +22,7 @@ import (
 	"go.opencensus.io/plugin/ochttp"
 	"go.opencensus.io/trace"
 	"k8s.io/apimachinery/pkg/util/sets"
+	"knative.dev/pkg/tracing/b3tracecontext"
 )
 
 var (
@@ -50,6 +51,7 @@ func HTTPSpanIgnoringPaths(pathsToIgnore ...string) func(http.Handler) http.Hand
 				}
 				return underlyingSampling
 			},
+			Propagation: &b3tracecontext.HTTPFormat{},
 		}
 	}
 }