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

telemetry: fix early meterprovider shutdown
docker · Sep 20, 2024 · 48cfe21 · 48cfe21
2 parents a5fb752 + 1355d7e
commit 48cfe21
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/cmd/docker/docker.go b/cmd/docker/docker.go
@@ -358,9 +358,11 @@ func runDocker(ctx context.Context, dockerCli *command.DockerCli) error {
 
 	mp := dockerCli.MeterProvider()
 	if mp, ok := mp.(command.MeterProvider); ok {
-		if err := mp.Shutdown(ctx); err != nil {
-			otel.Handle(err)
-		}
+		defer func() {
+			if err := mp.Shutdown(ctx); err != nil {
+				otel.Handle(err)
+			}
+		}()
 	} else {
 		fmt.Fprint(dockerCli.Err(), "Warning: Unexpected OTEL error, metrics may not be flushed")
 	}