WIP

open-policy-agent · May 7, 2024 · abc8f58 · abc8f58
1 parent 1b39bd1
commit abc8f58
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/runtime/runtime.go b/runtime/runtime.go
@@ -540,6 +540,13 @@ func (rt *Runtime) Serve(ctx context.Context) error {
 			rt.logger.WithFields(map[string]interface{}{"err": err}).Error("Failed to start OpenTelemetry trace exporter.")
 			return err
 		}
+
+		defer func() {
+			err := rt.traceExporter.Shutdown(ctx)
+			if err != nil {
+				rt.logger.WithFields(map[string]interface{}{"err": err}).Error("Failed to shutdown OpenTelemetry trace exporter gracefully.")
+			}
+		}()
 	}
 
 	rt.server = server.New().
@@ -856,13 +863,6 @@ func (rt *Runtime) gracefulServerShutdown(s *server.Server) error {
 		return err
 	}
 	rt.logger.Info("Server shutdown.")
-
-	if rt.traceExporter != nil {
-		err = rt.traceExporter.Shutdown(ctx)
-		if err != nil {
-			rt.logger.WithFields(map[string]interface{}{"err": err}).Error("Failed to shutdown OpenTelemetry trace exporter gracefully.")
-		}
-	}
 	return nil
 }