Skip to content

Commit

Permalink
Merge pull request containerd#9488 from thaJeztah/plugin_context_cancel
Browse files Browse the repository at this point in the history
tracing/plugin: newTracer: ignore context.Canceled errors on Close()
  • Loading branch information
dmcgowan authored Dec 18, 2023
2 parents 2c8a996 + 2213854 commit 8f6892a
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions tracing/plugin/otlp.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ package plugin

import (
"context"
"errors"
"fmt"
"io"
"net/url"
Expand Down Expand Up @@ -66,7 +67,7 @@ func init() {
TraceSamplingRatio: 1.0,
},
InitFn: func(ic *plugin.InitContext) (interface{}, error) {
//get TracingProcessorPlugin which is a dependency
// get TracingProcessorPlugin which is a dependency
plugins, err := ic.GetByType(plugins.TracingProcessorPlugin)
if err != nil {
return nil, fmt.Errorf("failed to get tracing processors: %w", err)
Expand Down Expand Up @@ -178,13 +179,12 @@ func newTracer(ctx context.Context, config *TraceConfig, procs []trace.SpanProce

return &closer{close: func() error {
for _, p := range procs {
if err := p.Shutdown(ctx); err != nil {
if err := p.Shutdown(ctx); err != nil && !errors.Is(err, context.Canceled) {
return err
}
}
return nil
}}, nil

}

// Returns a composite TestMap propagator
Expand Down

0 comments on commit 8f6892a

Please sign in to comment.