Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5456 from laurazard/fix-defer-mp-shutdown 

telemetry: fix early meterprovider shutdown
This commit is contained in:
Sebastiaan van Stijn 2024-09-20 02:41:45 +02:00 committed by GitHub
parent a5fb752ecf 1355d7e9f8
commit 48cfe2137c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/docker/docker.go
View File

@ -358,9 +358,11 @@ func runDocker(ctx context.Context, dockerCli *command.DockerCli) error {
mp := dockerCli.MeterProvider() mp := dockerCli.MeterProvider()
if mp, ok := mp.(command.MeterProvider); ok { if mp, ok := mp.(command.MeterProvider); ok {
defer func() {
if err := mp.Shutdown(ctx); err != nil { if err := mp.Shutdown(ctx); err != nil {
otel.Handle(err) otel.Handle(err)
} }
}()
} else { } else {
fmt.Fprint(dockerCli.Err(), "Warning: Unexpected OTEL error, metrics may not be flushed") fmt.Fprint(dockerCli.Err(), "Warning: Unexpected OTEL error, metrics may not be flushed")
} }