Merge pull request quarkusio#50952 from geoand/aot-qit

Use `@QuarkusIntegrationTest` tests as a test run for AOT file generation

Author: geoand

core/deployment/src/main/java/io/quarkus/runner/bootstrap/AugmentActionImpl.java

@@ -11,6 +11,7 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
+import java.util.ListIterator;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
@@ -244,14 +245,14 @@ private void writeDebugSourceFile(BuildResult result) {
 
     private void writeArtifactResultMetadataFile(BuildSystemTargetBuildItem outputTargetBuildItem,
             List<ArtifactResultBuildItem> artifactResultBuildItems) {
-        ArtifactResultBuildItem lastArtifact = artifactResultBuildItems.get(artifactResultBuildItems.size() - 1);
+        ArtifactResultBuildItem effectiveArtifact = effectiveArtifact(artifactResultBuildItems);
         Path quarkusArtifactMetadataPath = outputTargetBuildItem.getOutputDirectory().resolve("quarkus-artifact.properties");
         Properties properties = new Properties();
-        properties.put("type", lastArtifact.getType());
-        if (lastArtifact.getPath() != null) {
-            properties.put("path", artifactPathForResultMetadata(outputTargetBuildItem, lastArtifact));
+        properties.put("type", effectiveArtifact.getType());
+        if (effectiveArtifact.getPath() != null) {
+            properties.put("path", artifactPathForResultMetadata(outputTargetBuildItem, effectiveArtifact));
         } else {
-            if (lastArtifact.getType().endsWith("-container")) {
+            if (effectiveArtifact.getType().endsWith("-container")) {
                 // in this case we write "path" as to contain the path to the artifact from which the container was built
                 try {
                     ArtifactResultBuildItem baseArtifact = artifactResultBuildItems.get(artifactResultBuildItems.size() - 2);
@@ -264,7 +265,7 @@ private void writeArtifactResultMetadataFile(BuildSystemTargetBuildItem outputTa
                 }
             }
         }
-        Map<String, String> metadata = lastArtifact.getMetadata();
+        Map<String, String> metadata = effectiveArtifact.getMetadata();
         if (metadata != null) {
             for (Map.Entry<String, String> entry : metadata.entrySet()) {
                 properties.put("metadata." + entry.getKey(), entry.getValue());
@@ -277,6 +278,18 @@ private void writeArtifactResultMetadataFile(BuildSystemTargetBuildItem outputTa
         }
     }
 
+    private ArtifactResultBuildItem effectiveArtifact(List<ArtifactResultBuildItem> artifactResultBuildItems) {
+        ListIterator li = artifactResultBuildItems.listIterator(artifactResultBuildItems.size());
+        while (li.hasPrevious()) {
+            ArtifactResultBuildItem result = (ArtifactResultBuildItem) li.previous();
+            if ("appCDS".equals(result.getType())) {
+                continue;
+            }
+            return result;
+        }
+        throw new IllegalStateException("Unable to locate effective artifact");
+    }
+
     private static String artifactPathForResultMetadata(BuildSystemTargetBuildItem outputTargetBuildItem,
             ArtifactResultBuildItem artifactResultBuildItem) {
         return outputTargetBuildItem.getOutputDirectory().relativize(artifactResultBuildItem.getPath()).toString();

test-framework/common/src/main/java/io/quarkus/test/common/DefaultJarLauncher.java

@@ -50,6 +50,7 @@ public class DefaultJarLauncher implements JarArtifactLauncher {
     private List<String> argLine;
     private Map<String, String> env;
     private Path jarPath;
+    private boolean generateAotFile;
 
     private final Map<String, String> systemProps = new HashMap<>();
     private Process quarkusProcess;
@@ -65,6 +66,7 @@ public void init(JarArtifactLauncher.JarInitContext initContext) {
         this.argLine = initContext.argLine();
         this.env = initContext.env();
         this.jarPath = initContext.jarPath();
+        this.generateAotFile = initContext.generateAotFile();
     }
 
     public void start() throws IOException {
@@ -112,6 +114,9 @@ public void start(String[] programArgs, boolean handleIo) throws IOException {
         if (!argLine.isEmpty()) {
             args.addAll(argLine);
         }
+        if (generateAotFile) {
+            args.add("-XX:AOTCacheOutput=%s".formatted(jarPath.resolveSibling("app.aot")));
+        }
         if (HTTP_PRESENT) {
             args.add("-Dquarkus.http.port=" + httpPort);
             args.add("-Dquarkus.http.ssl-port=" + httpsPort);

test-framework/common/src/main/java/io/quarkus/test/common/JarArtifactLauncher.java

@@ -11,5 +11,7 @@ public interface JarArtifactLauncher extends ArtifactLauncher<JarArtifactLaunche
     interface JarInitContext extends InitContext {
 
         Path jarPath();
+
+        boolean generateAotFile();
     }
 }

test-framework/common/src/main/java/io/quarkus/test/common/LauncherUtil.java

@@ -9,7 +9,6 @@
 import java.nio.file.Path;
 import java.time.Duration;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.ServiceLoader;
@@ -46,32 +45,24 @@ public static Config installAndGetSomeConfig() {
      * as can be seen in <a href="https://github.com/quarkusio/quarkus/issues/33229">here</a>
      */
     static Process launchProcessAndDrainIO(List<String> args, Map<String, String> env) throws IOException {
-        Process process = launchProcess(args, env);
-        new Thread(new ProcessReader(process.getInputStream())).start();
-        new Thread(new ProcessReader(process.getErrorStream())).start();
+        ProcessBuilder pb = new ProcessBuilder(args)
+                .redirectOutput(ProcessBuilder.Redirect.DISCARD)
+                .redirectError(ProcessBuilder.Redirect.DISCARD)
+                .redirectInput(ProcessBuilder.Redirect.INHERIT);
+        pb.environment().putAll(env);
+        Process process = pb.start();
+        //        new Thread(new ProcessReader(process.getInputStream())).start();
+        //        new Thread(new ProcessReader(process.getErrorStream())).start();
         return process;
     }
 
     /**
-     * Launches a process using the supplied arguments but does drain the IO
+     * Launches a process using the supplied arguments but does not drain the IO
      */
     static Process launchProcess(List<String> args, Map<String, String> env) throws IOException {
-        Process process;
-        if (env.isEmpty()) {
-            process = Runtime.getRuntime().exec(args.toArray(new String[0]));
-        } else {
-            Map<String, String> currentEnv = System.getenv();
-            Map<String, String> finalEnv = new HashMap<>(currentEnv);
-            finalEnv.putAll(env);
-            String[] envArray = new String[finalEnv.size()];
-            int i = 0;
-            for (var entry : finalEnv.entrySet()) {
-                envArray[i] = entry.getKey() + "=" + entry.getValue();
-                i++;
-            }
-            process = Runtime.getRuntime().exec(args.toArray(new String[0]), envArray);
-        }
-        return process;
+        ProcessBuilder pb = new ProcessBuilder(args);
+        pb.environment().putAll(env);
+        return pb.start();
     }
 
     /**
@@ -128,7 +119,7 @@ private static void ensureProcessIsAlive(Process quarkusProcess) {
     static void destroyProcess(Process quarkusProcess) {
         quarkusProcess.destroy();
         int i = 0;
-        while (i++ < 10) {
+        while (i++ < 200) {
             try {
                 Thread.sleep(LOG_CHECK_INTERVAL);
             } catch (InterruptedException ignored) {

test-framework/junit5/src/main/java/io/quarkus/test/junit/launcher/JarLauncherProvider.java

@@ -51,7 +51,9 @@ public JarArtifactLauncher create(CreateContext context) {
                     TestConfigUtil.argLineValues(testConfig.argLine().orElse("")),
                     testConfig.env(),
                     context.devServicesLaunchResult(),
-                    context.buildOutputDirectory().resolve(pathStr)));
+                    context.buildOutputDirectory().resolve(pathStr),
+                    config.getOptionalValue("quarkus.package.jar.appcds.use-aot", Boolean.class)
+                            .orElse(Boolean.FALSE)));
             return launcher;
         } else {
             throw new IllegalStateException("The path of the native binary could not be determined");
@@ -61,18 +63,26 @@ public JarArtifactLauncher create(CreateContext context) {
     static class DefaultJarInitContext extends DefaultInitContextBase implements JarArtifactLauncher.JarInitContext {
 
         private final Path jarPath;
+        private final boolean generateAotFile;
 
         DefaultJarInitContext(int httpPort, int httpsPort, Duration waitTime, String testProfile,
                 List<String> argLine, Map<String, String> env,
-                ArtifactLauncher.InitContext.DevServicesLaunchResult devServicesLaunchResult, Path jarPath) {
+                ArtifactLauncher.InitContext.DevServicesLaunchResult devServicesLaunchResult, Path jarPath,
+                boolean generateAotFile) {
             super(httpPort, httpsPort, waitTime, testProfile, argLine, env, devServicesLaunchResult);
             this.jarPath = jarPath;
+            this.generateAotFile = generateAotFile;
         }
 
         @Override
         public Path jarPath() {
             return jarPath;
         }
+
+        @Override
+        public boolean generateAotFile() {
+            return generateAotFile;
+        }
     }
 
 }