diff --git a/examples/traces/app/message/main.go b/examples/traces/app/message/main.go index ca84ba408..165a5d2e6 100644 --- a/examples/traces/app/message/main.go +++ b/examples/traces/app/message/main.go @@ -14,7 +14,6 @@ import ( "github.com/go-kratos/kratos/v2/transport/grpc" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/exporters/trace/jaeger" - "go.opentelemetry.io/otel/propagation" "go.opentelemetry.io/otel/sdk/resource" tracesdk "go.opentelemetry.io/otel/sdk/trace" "go.opentelemetry.io/otel/semconv" @@ -85,9 +84,6 @@ func main() { // Configuring tracing Middleware tracing.Server( tracing.WithTracerProvider(tp), - tracing.WithPropagators( - propagation.NewCompositeTextMapPropagator(propagation.Baggage{}, propagation.TraceContext{}), - ), ), logging.Server(logger), ), diff --git a/examples/traces/app/user/main.go b/examples/traces/app/user/main.go index b709f483d..c892e5880 100644 --- a/examples/traces/app/user/main.go +++ b/examples/traces/app/user/main.go @@ -16,7 +16,6 @@ import ( "github.com/go-kratos/kratos/v2/transport/http" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/exporters/trace/jaeger" - "go.opentelemetry.io/otel/propagation" "go.opentelemetry.io/otel/sdk/resource" tracesdk "go.opentelemetry.io/otel/sdk/trace" "go.opentelemetry.io/otel/semconv" @@ -66,9 +65,6 @@ func (s *server) GetMyMessages(ctx context.Context, in *v1.GetMyMessagesRequest) recovery.Recovery(), tracing.Client( tracing.WithTracerProvider(s.tracer), - tracing.WithPropagators( - propagation.NewCompositeTextMapPropagator(propagation.Baggage{}, propagation.TraceContext{}), - ), ), ), grpc.WithTimeout(2*time.Second), @@ -107,9 +103,6 @@ func main() { // Configuring tracing middleware tracing.Server( tracing.WithTracerProvider(tp), - tracing.WithPropagators( - propagation.NewCompositeTextMapPropagator(propagation.Baggage{}, propagation.TraceContext{}), - ), ), logging.Server(logger), ), diff --git a/middleware/tracing/tracer.go b/middleware/tracing/tracer.go index 7a35c8878..e3ce2af42 100644 --- a/middleware/tracing/tracer.go +++ b/middleware/tracing/tracer.go @@ -26,8 +26,8 @@ func NewTracer(kind trace.SpanKind, opts ...Option) *Tracer { if options.TracerProvider != nil { otel.SetTracerProvider(options.TracerProvider) } - if options.Propagators != nil { - otel.SetTextMapPropagator(options.Propagators) + if options.Propagator != nil { + otel.SetTextMapPropagator(options.Propagator) } else { otel.SetTextMapPropagator(propagation.NewCompositeTextMapPropagator(propagation.Baggage{}, propagation.TraceContext{})) } diff --git a/middleware/tracing/tracing.go b/middleware/tracing/tracing.go index d978dc180..3f413116d 100644 --- a/middleware/tracing/tracing.go +++ b/middleware/tracing/tracing.go @@ -14,13 +14,13 @@ type Option func(*options) type options struct { TracerProvider trace.TracerProvider - Propagators propagation.TextMapPropagator + Propagator propagation.TextMapPropagator } -// WithPropagators with tracer proagators. -func WithPropagators(propagators propagation.TextMapPropagator) Option { +// WithPropagator with tracer proagator. +func WithPropagator(propagator propagation.TextMapPropagator) Option { return func(opts *options) { - opts.Propagators = propagators + opts.Propagator = propagator } } diff --git a/middleware/tracing/tracing_test.go b/middleware/tracing/tracing_test.go index 718667ecc..5ee2ca7ec 100644 --- a/middleware/tracing/tracing_test.go +++ b/middleware/tracing/tracing_test.go @@ -53,14 +53,14 @@ func TestTracing(t *testing.T) { tp := tracesdk.NewTracerProvider(tracesdk.WithSampler(tracesdk.TraceIDRatioBased(0))) // caller use Inject - tracer := NewTracer(trace.SpanKindClient, WithTracerProvider(tp), WithPropagators(propagation.NewCompositeTextMapPropagator(propagation.Baggage{}, propagation.TraceContext{}))) + tracer := NewTracer(trace.SpanKindClient, WithTracerProvider(tp), WithPropagator(propagation.NewCompositeTextMapPropagator(propagation.Baggage{}, propagation.TraceContext{}))) ts := &Transport{kind: transport.KindHTTP, header: carrier} ctx, aboveSpan := tracer.Start(transport.NewClientContext(context.Background(), ts), ts.Kind().String(), ts.Operation(), ts.Header()) defer tracer.End(ctx, aboveSpan, nil) // server use Extract fetch traceInfo from carrier - tracer = NewTracer(trace.SpanKindServer, WithPropagators(propagation.NewCompositeTextMapPropagator(propagation.Baggage{}, propagation.TraceContext{}))) + tracer = NewTracer(trace.SpanKindServer, WithPropagator(propagation.NewCompositeTextMapPropagator(propagation.Baggage{}, propagation.TraceContext{}))) ts = &Transport{kind: transport.KindHTTP, header: carrier} ctx, span := tracer.Start(transport.NewServerContext(ctx, ts), ts.Kind().String(), ts.Operation(), ts.Header())