Update per recent OT-go PRs

bench_test.go

@@ -100,7 +100,7 @@ func benchmarkInject(b *testing.B, format opentracing.BuiltinFormat, numItems in
 	var carrier interface{}
 	switch format {
 	case opentracing.TextMap:
-		carrier = opentracing.HTTPHeaderTextMapCarrier(http.Header{})
+		carrier = opentracing.HTTPHeadersCarrier(http.Header{})
 	case opentracing.Binary:
 		carrier = &bytes.Buffer{}
 	default:
@@ -123,7 +123,7 @@ func benchmarkExtract(b *testing.B, format opentracing.BuiltinFormat, numItems i
 	var carrier interface{}
 	switch format {
 	case opentracing.TextMap:
-		carrier = opentracing.HTTPHeaderTextMapCarrier(http.Header{})
+		carrier = opentracing.HTTPHeadersCarrier(http.Header{})
 	case opentracing.Binary:
 		carrier = &bytes.Buffer{}
 	default:

examples/dapperish.go

@@ -38,7 +38,7 @@ func client() {
 
 		httpClient := &http.Client{}
 		httpReq, _ := http.NewRequest("POST", "http://localhost:8080/", bytes.NewReader([]byte(text)))
-		textCarrier := opentracing.HTTPHeaderTextMapCarrier(httpReq.Header)
+		textCarrier := opentracing.HTTPHeadersCarrier(httpReq.Header)
 		err := span.Tracer().Inject(span.Context(), opentracing.TextMap, textCarrier)
 		if err != nil {
 			panic(err)
@@ -56,7 +56,7 @@ func client() {
 
 func server() {
 	http.HandleFunc("/", func(w http.ResponseWriter, req *http.Request) {
-		textCarrier := opentracing.HTTPHeaderTextMapCarrier(req.Header)
+		textCarrier := opentracing.HTTPHeadersCarrier(req.Header)
 		wireSpanContext, err := opentracing.GlobalTracer().Extract(
 			opentracing.TextMap, textCarrier)
 		if err != nil {

propagation_test.go

@@ -45,12 +45,13 @@ func TestSpanPropagator(t *testing.T) {
 	sp := tracer.StartSpan(op)
 	sp.Context().SetBaggageItem("foo", "bar")
 
-	tmc := opentracing.HTTPHeaderTextMapCarrier(http.Header{})
+	tmc := opentracing.HTTPHeadersCarrier(http.Header{})
 	tests := []struct {
 		typ, carrier interface{}
 	}{
 		{basictracer.Delegator, basictracer.DelegatingCarrier(&verbatimCarrier{b: map[string]string{}})},
 		{opentracing.Binary, &bytes.Buffer{}},
+		{opentracing.HTTPHeaders, tmc},
 		{opentracing.TextMap, tmc},
 	}
 

tracer.go

@@ -166,7 +166,7 @@ ReferencesLoop:
 		case opentracing.ChildOfRef,
 			opentracing.FollowsFromRef:
 
-			refMD := ref.Referee.(*SpanContext)
+			refMD := ref.ReferencedContext.(*SpanContext)
 			sp.raw.TraceID = refMD.TraceID
 			sp.raw.SpanID = randomID()
 			sp.raw.ParentSpanID = refMD.SpanID
@@ -226,7 +226,7 @@ var Delegator delegatorType
 
 func (t *tracerImpl) Inject(sc opentracing.SpanContext, format interface{}, carrier interface{}) error {
 	switch format {
-	case opentracing.TextMap:
+	case opentracing.TextMap, opentracing.HTTPHeaders:
 		return t.textPropagator.Inject(sc, carrier)
 	case opentracing.Binary:
 		return t.binaryPropagator.Inject(sc, carrier)
@@ -239,7 +239,7 @@ func (t *tracerImpl) Inject(sc opentracing.SpanContext, format interface{}, carr
 
 func (t *tracerImpl) Extract(format interface{}, carrier interface{}) (opentracing.SpanContext, error) {
 	switch format {
-	case opentracing.TextMap:
+	case opentracing.TextMap, opentracing.HTTPHeaders:
 		return t.textPropagator.Extract(carrier)
 	case opentracing.Binary:
 		return t.binaryPropagator.Extract(carrier)