From 7ad73c2899c953f7bcca7968ae5465e493679a11 Mon Sep 17 00:00:00 2001 From: Nicolas De Loof Date: Thu, 23 May 2024 11:02:18 +0200 Subject: [PATCH] fix opentelemetry Signed-off-by: Nicolas De Loof --- cmd/cmdtrace/cmd_span.go | 3 ++- internal/tracing/tracing.go | 2 -- internal/tracing/wrap.go | 5 +++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmd/cmdtrace/cmd_span.go b/cmd/cmdtrace/cmd_span.go index 9c1e66d230..77329e94e9 100644 --- a/cmd/cmdtrace/cmd_span.go +++ b/cmd/cmdtrace/cmd_span.go @@ -30,6 +30,7 @@ import ( "github.com/docker/compose/v2/internal/tracing" "github.com/spf13/cobra" flag "github.com/spf13/pflag" + "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/codes" "go.opentelemetry.io/otel/trace" @@ -50,7 +51,7 @@ func Setup(cmd *cobra.Command, dockerCli command.Cli, args []string) error { } ctx := cmd.Context() - ctx, cmdSpan := tracing.Tracer.Start( + ctx, cmdSpan := otel.Tracer("").Start( ctx, "cli/"+strings.Join(commandName(cmd), "-"), ) diff --git a/internal/tracing/tracing.go b/internal/tracing/tracing.go index f5760628b5..1ee0267641 100644 --- a/internal/tracing/tracing.go +++ b/internal/tracing/tracing.go @@ -46,8 +46,6 @@ func init() { otel.SetErrorHandler(skipErrors{}) } -var Tracer = otel.Tracer("compose") - // OTLPConfig contains the necessary values to initialize an OTLP client // manually. // diff --git a/internal/tracing/wrap.go b/internal/tracing/wrap.go index d78b53191b..e525b738b4 100644 --- a/internal/tracing/wrap.go +++ b/internal/tracing/wrap.go @@ -20,6 +20,7 @@ import ( "context" "github.com/acarl005/stripansi" + "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/codes" semconv "go.opentelemetry.io/otel/semconv/v1.19.0" @@ -36,7 +37,7 @@ import ( // adding even more levels of function wrapping/indirection. func SpanWrapFunc(spanName string, opts SpanOptions, fn func(ctx context.Context) error) func(context.Context) error { return func(ctx context.Context) error { - ctx, span := Tracer.Start(ctx, spanName, opts.SpanStartOptions()...) + ctx, span := otel.Tracer("").Start(ctx, spanName, opts.SpanStartOptions()...) defer span.End() if err := fn(ctx); err != nil { @@ -59,7 +60,7 @@ func SpanWrapFunc(spanName string, opts SpanOptions, fn func(ctx context.Context // adding even more levels of function wrapping/indirection. func SpanWrapFuncForErrGroup(ctx context.Context, spanName string, opts SpanOptions, fn func(ctx context.Context) error) func() error { return func() error { - ctx, span := Tracer.Start(ctx, spanName, opts.SpanStartOptions()...) + ctx, span := otel.Tracer("").Start(ctx, spanName, opts.SpanStartOptions()...) defer span.End() if err := fn(ctx); err != nil {