Improve logging in native image builder

quarkusio · Feb 24, 2021 · 7975a6b · 7975a6b
1 parent a8969db
commit 7975a6b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/.../src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildRemoteContainerRunner.java b/.../src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildRemoteContainerRunner.java
@@ -6,10 +6,14 @@
 import java.nio.file.Path;
 import java.util.List;
 
+import org.jboss.logging.Logger;
+
 import io.quarkus.deployment.pkg.NativeConfig;
 
 public class NativeImageBuildRemoteContainerRunner extends NativeImageBuildContainerRunner {
 
+    private static final Logger log = Logger.getLogger(NativeImageBuildRemoteContainerRunner.class);
+
     private final String nativeImageName;
     private String containerId;
 
@@ -22,13 +26,15 @@ public NativeImageBuildRemoteContainerRunner(NativeConfig nativeConfig, Path out
     protected void preBuild(List<String> buildArgs) throws InterruptedException, IOException {
         List<String> containerRuntimeArgs = getContainerRuntimeBuildArgs();
         String[] createContainerCommand = buildCommand("create", containerRuntimeArgs, buildArgs);
+        log.info(String.join(" ", createContainerCommand).replace("$", "\\$"));
         Process createContainerProcess = new ProcessBuilder(createContainerCommand).start();
         createContainerProcess.waitFor();
         try (BufferedReader reader = new BufferedReader(new InputStreamReader(createContainerProcess.getInputStream()))) {
             containerId = reader.readLine();
         }
         String[] copyCommand = new String[] { containerRuntime.getExecutableName(), "cp", outputPath + "/.",
                 containerId + ":" + NativeImageBuildStep.CONTAINER_BUILD_VOLUME_PATH };
+        log.info(String.join(" ", copyCommand).replace("$", "\\$"));
         Process copyProcess = new ProcessBuilder(copyCommand).start();
         copyProcess.waitFor();
         super.preBuild(buildArgs);
@@ -45,13 +51,15 @@ protected void postBuild() throws InterruptedException, IOException {
         copy("sources");
         String[] removeCommand = new String[] { containerRuntime.getExecutableName(), "container", "rm", "--volumes",
                 containerId };
+        log.info(String.join(" ", removeCommand).replace("$", "\\$"));
         Process removeProcess = new ProcessBuilder(removeCommand).start();
         removeProcess.waitFor();
     }
 
     private void copy(String path) throws IOException, InterruptedException {
         String[] copyCommand = new String[] { containerRuntime.getExecutableName(), "cp",
                 containerId + ":" + NativeImageBuildStep.CONTAINER_BUILD_VOLUME_PATH + "/" + path, outputPath };
+        log.info(String.join(" ", copyCommand).replace("$", "\\$"));
         Process copyProcess = new ProcessBuilder(copyCommand).start();
         copyProcess.waitFor();
     }

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildRunner.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildRunner.java
@@ -12,11 +12,15 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
+import org.jboss.logging.Logger;
+
 import io.quarkus.deployment.pkg.steps.NativeImageBuildStep.GraalVM;
 import io.quarkus.deployment.util.ProcessUtil;
 
 public abstract class NativeImageBuildRunner {
 
+    private static final Logger log = Logger.getLogger(NativeImageBuildRunner.class);
+
     public GraalVM.Version getGraalVMVersion() {
         final GraalVM.Version graalVMVersion;
         try {
@@ -46,8 +50,10 @@ public int build(List<String> args, Path outputDir, boolean processInheritIODisa
         preBuild(args);
         try {
             CountDownLatch errorReportLatch = new CountDownLatch(1);
-            final ProcessBuilder processBuilder = new ProcessBuilder(getBuildCommand(args))
+            final String[] buildCommand = getBuildCommand(args);
+            final ProcessBuilder processBuilder = new ProcessBuilder(buildCommand)
                     .directory(outputDir.toFile());
+            log.info(String.join(" ", buildCommand).replace("$", "\\$"));
             final Process process = ProcessUtil.launchProcessStreamStdOut(processBuilder, processInheritIODisabled);
             ExecutorService executor = Executors.newSingleThreadExecutor();
             executor.submit(new ErrorReplacingProcessReader(process.getErrorStream(), outputDir.resolve("reports").toFile(),

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java
@@ -175,7 +175,6 @@ public NativeImageBuildItem build(NativeConfig nativeConfig, NativeImageSourceJa
 
             List<String> nativeImageArgs = commandAndExecutable.args;
 
-            log.info(String.join(" ", nativeImageArgs).replace("$", "\\$"));
             int exitCode = buildRunner.build(nativeImageArgs, outputDir, processInheritIODisabled.isPresent());
             if (exitCode != 0) {
                 throw imageGenerationFailed(exitCode, nativeImageArgs);