Refactor artifact creation and reporting.

Author: fniephaus

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/BuildArtifacts.java

@@ -40,6 +40,7 @@ enum ArtifactType {
         DEBUG_INFO,
         JSON,
         MARKDOWN,
+        TXT,
     }
 
     static BuildArtifacts singleton() {

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ProgressReporter.java

@@ -615,12 +615,7 @@ private void printBreakdowns() {
 
     public void printEpilog(String imageName, NativeImageGenerator generator, ImageClassLoader classLoader, Throwable error, OptionValues parsedHostedOptions) {
         executor.shutdown();
-
-        if (error != null && !NativeImageOptions.ErrorFileToStdout.getValue()) {
-            Path errorReportPath = NativeImageOptions.getErrorFilePath();
-            ReportUtils.report("GraalVM Native Image Error Report", errorReportPath, p -> VMErrorReporter.generateErrorReport(p, classLoader, error), false);
-            BuildArtifacts.singleton().add(ArtifactType.MARKDOWN, errorReportPath);
-        }
+        createAdditionalArtifacts(imageName, generator, classLoader, error, parsedHostedOptions);
 
         if (imageName == null || generator == null) {
             printErrorMessage(error);
@@ -633,12 +628,14 @@ public void printEpilog(String imageName, NativeImageGenerator generator, ImageC
         double totalSeconds = Utils.millisToSeconds(getTimer(TimerCollection.Registry.TOTAL).getTotalTime());
         recordJsonMetric(ResourceUsageKey.TOTAL_SECS, totalSeconds);
 
+        if (jsonHelper != null) {
+            BuildArtifacts.singleton().add(ArtifactType.JSON, jsonHelper.printToFile());
+        }
         Map<ArtifactType, List<Path>> artifacts = generator.getBuildArtifacts();
-
         if (!artifacts.isEmpty()) {
-            l().printLineSeparator();
-            printArtifacts(imageName, generator, parsedHostedOptions, artifacts, error);
+            BuildArtifacts.singleton().add(ArtifactType.TXT, reportBuildArtifacts(NativeImageGenerator.generatedFiles(HostedOptionValues.singleton()), imageName, artifacts));
         }
+        printArtifacts(artifacts);
 
         l().printHeadlineSeparator();
 
@@ -654,6 +651,17 @@ public void printEpilog(String imageName, NativeImageGenerator generator, ImageC
         printErrorMessage(error);
     }
 
+    private static void createAdditionalArtifacts(String imageName, NativeImageGenerator generator, ImageClassLoader classLoader, Throwable error, OptionValues parsedHostedOptions) {
+        if (error != null && !NativeImageOptions.ErrorFileToStdout.getValue()) {
+            Path errorReportPath = NativeImageOptions.getErrorFilePath();
+            ReportUtils.report("GraalVM Native Image Error Report", errorReportPath, p -> VMErrorReporter.generateErrorReport(p, classLoader, error), false);
+            BuildArtifacts.singleton().add(ArtifactType.MARKDOWN, errorReportPath);
+        }
+        if (generator.getBigbang() != null && ImageBuildStatistics.Options.CollectImageBuildStatistics.getValue(parsedHostedOptions)) {
+            BuildArtifacts.singleton().add(ArtifactType.JSON, reportImageBuildStatistics(imageName, generator.getBigbang()));
+        }
+    }
+
     private void printErrorMessage(Throwable error) {
         if (error == null) {
             return;
@@ -677,7 +685,11 @@ private void printErrorMessage(Throwable error) {
         }
     }
 
-    private void printArtifacts(String imageName, NativeImageGenerator generator, OptionValues parsedHostedOptions, Map<ArtifactType, List<Path>> artifacts, Throwable error) {
+    private void printArtifacts(Map<ArtifactType, List<Path>> artifacts) {
+        if (artifacts.isEmpty()) {
+            return;
+        }
+        l().printLineSeparator();
         l().yellowBold().a("Produced artifacts:").reset().println();
         // Use TreeMap to sort paths alphabetically.
         Map<Path, List<String>> pathToTypes = new TreeMap<>();
@@ -686,15 +698,6 @@ private void printArtifacts(String imageName, NativeImageGenerator generator, Op
                 pathToTypes.computeIfAbsent(path, p -> new ArrayList<>()).add(artifactType.name().toLowerCase());
             }
         });
-        if (error == null && jsonHelper != null) {
-            Path jsonMetric = jsonHelper.printToFile();
-            pathToTypes.computeIfAbsent(jsonMetric, p -> new ArrayList<>()).add("json");
-        }
-        if (generator.getBigbang() != null && ImageBuildStatistics.Options.CollectImageBuildStatistics.getValue(parsedHostedOptions)) {
-            Path buildStatisticsPath = reportImageBuildStatistics(imageName, generator.getBigbang());
-            pathToTypes.computeIfAbsent(buildStatisticsPath, p -> new ArrayList<>()).add("raw");
-        }
-        pathToTypes.computeIfAbsent(reportBuildArtifacts(NativeImageGenerator.generatedFiles(HostedOptionValues.singleton()), imageName, artifacts), p -> new ArrayList<>()).add("txt");
         pathToTypes.forEach((path, typeNames) -> {
             l().a(" ").link(path).dim().a(" (").a(String.join(", ", typeNames)).a(")").reset().println();
         });