[DEMO] preview of redesign tracing instrumentation layer

api/transport/propagation.go

@@ -22,13 +22,20 @@ package transport
 
 import (
 	"context"
+	"strings"
+	"sync"
 	"time"
 
 	"github.com/opentracing/opentracing-go"
 	"github.com/opentracing/opentracing-go/ext"
 	opentracinglog "github.com/opentracing/opentracing-go/log"
 )
 
+const (
+	tchannelTracingKeyPrefix      = "$tracing$"
+	tchannelTracingKeyMappingSize = 100
+)
+
 // CreateOpenTracingSpan creates a new context with a started span
 type CreateOpenTracingSpan struct {
 	Tracer        opentracing.Tracer
@@ -119,3 +126,95 @@ func UpdateSpanWithErr(span opentracing.Span, err error) error {
 	}
 	return err
 }
+
+// GetPropagationFormat returns the opentracing propagation depends on transport.
+// For TChannel, the format is opentracing.TextMap
+// For HTTP and gRPC, the format is opentracing.HTTPHeaders
+func GetPropagationFormat(transport string) opentracing.BuiltinFormat {
+	if transport == "tchannel" {
+		return opentracing.TextMap
+	}
+	return opentracing.HTTPHeaders
+}
+
+// PropagationCarrier is an interface to combine both reader and writer interface
+type PropagationCarrier interface {
+	opentracing.TextMapReader
+	opentracing.TextMapWriter
+}
+
+// GetPropagationCarrier get the propagation carrier depends on the transport.
+// The carrier is used for accessing the transport headers.
+// For TChannel, a special carrier is used. For details, see comments of TChannelHeadersCarrier
+func GetPropagationCarrier(headers map[string]string, transport string) PropagationCarrier {
+	if transport == "tchannel" {
+		return TChannelHeadersCarrier(headers)
+	}
+	return opentracing.TextMapCarrier(headers)
+}
+
+// TChannelHeadersCarrier is a dedicated carrier for TChannel.
+// When writing the tracing headers into headers, the $tracing$ prefix is added to each tracing header key.
+// When reading the tracing headers from headers, the $tracing$ prefix is removed from each tracing header key.
+type TChannelHeadersCarrier map[string]string
+
+var _ PropagationCarrier = TChannelHeadersCarrier{}
+
+func (c TChannelHeadersCarrier) ForeachKey(handler func(string, string) error) error {
+	for k, v := range c {
+		if !strings.HasPrefix(k, tchannelTracingKeyPrefix) {
+			continue
+		}
+		noPrefixKey := tchannelTracingKeyDecoding.mapAndCache(k)
+		if err := handler(noPrefixKey, v); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func (c TChannelHeadersCarrier) Set(key, value string) {
+	prefixedKey := tchannelTracingKeyEncoding.mapAndCache(key)
+	c[prefixedKey] = value
+}
+
+// tchannelTracingKeysMapping is to optimize the efficiency of tracing header key manipulations.
+// The implementation is forked from tchannel-go: https://github.com/uber/tchannel-go/blob/dev/tracing_keys.go#L36
+type tchannelTracingKeysMapping struct {
+	sync.RWMutex
+	mapping map[string]string
+	mapper  func(key string) string
+}
+
+var tchannelTracingKeyEncoding = &tchannelTracingKeysMapping{
+	mapping: make(map[string]string),
+	mapper: func(key string) string {
+		return tchannelTracingKeyPrefix + key
+	},
+}
+
+var tchannelTracingKeyDecoding = &tchannelTracingKeysMapping{
+	mapping: make(map[string]string),
+	mapper: func(key string) string {
+		return key[len(tchannelTracingKeyPrefix):]
+	},
+}
+
+func (m *tchannelTracingKeysMapping) mapAndCache(key string) string {
+	m.RLock()
+	v, ok := m.mapping[key]
+	m.RUnlock()
+	if ok {
+		return v
+	}
+	m.Lock()
+	defer m.Unlock()
+	if v, ok := m.mapping[key]; ok {
+		return v
+	}
+	mappedKey := m.mapper(key)
+	if len(m.mapping) < tchannelTracingKeyMappingSize {
+		m.mapping[key] = mappedKey
+	}
+	return mappedKey
+}

internal/tracinginterceptor/interceptor.go

@@ -0,0 +1,177 @@
+// Copyright (c) 2024 Uber Technologies, Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+package tracinginterceptor
+
+import (
+	"context"
+	"time"
+
+	"github.com/opentracing/opentracing-go"
+	"github.com/opentracing/opentracing-go/ext"
+	"github.com/opentracing/opentracing-go/log"
+	"go.uber.org/yarpc/api/transport"
+	"go.uber.org/yarpc/internal/transportinterceptor"
+	"go.uber.org/yarpc/yarpcerrors"
+)
+
+var (
+	_ transportinterceptor.UnaryInbound   = (*Interceptor)(nil)
+	_ transportinterceptor.UnaryOutbound  = (*Interceptor)(nil)
+	_ transportinterceptor.OnewayInbound  = (*Interceptor)(nil)
+	_ transportinterceptor.OnewayOutbound = (*Interceptor)(nil)
+	_ transportinterceptor.StreamInbound  = (*Interceptor)(nil)
+	_ transportinterceptor.StreamOutbound = (*Interceptor)(nil)
+)
+
+// Params defines the parameters for creating the Middleware
+type Params struct {
+	Tracer    opentracing.Tracer
+	Transport string
+}
+
+// Interceptor is the tracing interceptor for all RPC types.
+// It handles both observability and inter-process context propagation.
+type Interceptor struct {
+	tracer            opentracing.Tracer
+	transport         string
+	propagationFormat opentracing.BuiltinFormat
+}
+
+// New constructs a tracing interceptor with the provided configuration.
+func New(p Params) *Interceptor {
+	m := &Interceptor{
+		tracer:            p.Tracer,
+		transport:         p.Transport,
+		propagationFormat: transport.GetPropagationFormat(p.Transport),
+	}
+	if m.tracer == nil {
+		m.tracer = opentracing.GlobalTracer()
+	}
+
+	return m
+}
+
+func (m *Interceptor) Handle(ctx context.Context, req *transport.Request, resw transport.ResponseWriter, h transport.UnaryHandler) error {
+	parentSpanCtx, _ := m.tracer.Extract(m.propagationFormat, transport.GetPropagationCarrier(req.Headers.Items(), req.Transport))
+	extractOpenTracingSpan := &transport.ExtractOpenTracingSpan{
+		ParentSpanContext: parentSpanCtx,
+		Tracer:            m.tracer,
+		TransportName:     req.Transport,
+		StartTime:         time.Now(),
+		// circular dependencies - we need to relocate the tracing tags
+		// ExtraTags:         yarpc.OpentracingTags,
+	}
+	ctx, span := extractOpenTracingSpan.Do(ctx, req)
+	defer span.Finish()
+
+	err := h.Handle(ctx, req, resw)
+	return updateSpanWithError(span, err)
+}
+
+func (m *Interceptor) Call(ctx context.Context, req *transport.Request, out transport.UnaryOutbound) (*transport.Response, error) {
+	createOpenTracingSpan := &transport.CreateOpenTracingSpan{
+		Tracer:        m.tracer,
+		TransportName: m.transport,
+		StartTime:     time.Now(),
+		// circular dependencies - we need to relocate the tracing tags
+		//ExtraTags:     yarpc.OpentracingTags
+	}
+	ctx, span := createOpenTracingSpan.Do(ctx, req)
+	defer span.Finish()
+
+	tracingHeaders := make(map[string]string)
+	if err := m.tracer.Inject(span.Context(), m.propagationFormat, transport.GetPropagationCarrier(tracingHeaders, m.transport)); err != nil {
+		ext.Error.Set(span, true)
+		span.LogFields(log.String("event", "error"), log.String("message", err.Error()))
+		return nil, err
+	}
+	for k, v := range tracingHeaders {
+		req.Headers = req.Headers.With(k, v)
+	}
+
+	res, err := out.Call(ctx, req)
+	return res, updateSpanWithOutboundError(span, res, err)
+}
+
+func (m *Interceptor) HandleOneway(ctx context.Context, req *transport.Request, h transport.OnewayHandler) error {
+	// TODO implement me
+	panic("implement me")
+}
+
+func (m *Interceptor) CallOneway(ctx context.Context, request *transport.Request, out transport.OnewayOutbound) (transport.Ack, error) {
+	// TODO implement me
+	panic("implement me")
+}
+
+func (m *Interceptor) HandleStream(s *transport.ServerStream, h transport.StreamHandler) error {
+	// TODO implement me
+	panic("implement me")
+}
+
+func (m *Interceptor) CallStream(ctx context.Context, req *transport.StreamRequest, out transport.StreamOutbound) (*transport.ClientStream, error) {
+	// TODO implement me
+	panic("implement me")
+}
+
+func updateSpanWithError(span opentracing.Span, err error) error {
+	if err == nil {
+		return err
+	}
+
+	ext.Error.Set(span, true)
+	if yarpcerrors.IsStatus(err) {
+		status := yarpcerrors.FromError(err)
+		errCode := status.Code()
+		span.SetTag("rpc.yarpc.status_code", errCode.String())
+		span.SetTag("error.type", errCode.String())
+		return err
+	}
+
+	span.SetTag("error.type", "unknown_internal_yarpc")
+	return err
+}
+
+func updateSpanWithOutboundError(span opentracing.Span, res *transport.Response, err error) error {
+	isApplicationError := false
+	if res != nil {
+		isApplicationError = res.ApplicationError
+	}
+	if err == nil && !isApplicationError {
+		return err
+	}
+
+	ext.Error.Set(span, true)
+	if yarpcerrors.IsStatus(err) {
+		status := yarpcerrors.FromError(err)
+		errCode := status.Code()
+		span.SetTag("rpc.yarpc.status_code", errCode.String())
+		span.SetTag("error.type", errCode.String())
+		return err
+	}
+
+	if isApplicationError {
+		span.SetTag("error.type", "application_error")
+		return err
+	}
+
+	span.SetTag("error.type", "unknown_internal_yarpc")
+	return err
+}

internal/transportinterceptor/inbound.go

@@ -0,0 +1,31 @@
+// Copyright (c) 2024 Uber Technologies, Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+package transportinterceptor
+
+import (
+	"go.uber.org/yarpc/api/middleware"
+)
+
+type (
+	UnaryInbound  = middleware.UnaryInbound
+	OnewayInbound = middleware.OnewayInbound
+	StreamInbound = middleware.StreamInbound
+)