Merge pull request #5457 from laurazard/backport-dropped-defer

[27.x backport] telemetry: fix early meterprovider shutdown
docker · Sep 20, 2024 · f052003 · f052003
2 parents e85edf8 + 460f1be
commit f052003
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/cmd/docker/docker.go b/cmd/docker/docker.go
@@ -360,9 +360,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")
 	}