Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions cmd/cmdtrace/cmd_span.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (

dockercli "github.com/docker/cli/cli"
"github.com/docker/cli/cli/command"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
flag "github.com/spf13/pflag"
"go.opentelemetry.io/otel"
Expand Down Expand Up @@ -110,9 +111,9 @@ func wrapRunE(c *cobra.Command, cmdSpan trace.Span, tracingShutdown tracing.Shut
// been canceled already
ctx, cancel := context.WithTimeout(context.Background(), 100*time.Millisecond)
defer cancel()
// TODO(milas): add an env var to enable logging from the
// OTel components for debugging purposes
_ = tracingShutdown(ctx)
if err := tracingShutdown(ctx); err != nil {
logrus.WithError(err).Debug("otel: shutdown error")
}
}
return cmdErr
}
Expand Down
29 changes: 0 additions & 29 deletions internal/tracing/errors.go

This file was deleted.

2 changes: 0 additions & 2 deletions internal/tracing/tracing.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ import (

func init() {
detect.ServiceName = "compose"
// do not log tracing errors to stdio
otel.SetErrorHandler(skipErrors{})
}

// OTLPConfig contains the necessary values to initialize an OTLP client
Expand Down