Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions reports/report.py
Original file line number Diff line number Diff line change
Expand Up @@ -1581,7 +1581,8 @@ def print_action_summary():
report_json_fh.close()

config_json = jb["config"]
createConfigReport(config_json, config_filename)
java_json = jb["java"]
createConfigReport(config_json, java_json, config_filename)

os.chdir(cwd)

Expand All @@ -1607,9 +1608,8 @@ def print_action_summary():
| id | value
'''

def createConfigReport(config_json, config_filename):
def createConfigReport(config_json, java_json, config_filename):
#print(config_filename)
#print(config_json)

def printf(s):
report_fh.write(s)
Expand Down Expand Up @@ -1851,19 +1851,18 @@ def action_name(s):
printf("\n")
printf("== JVM System Properties\n")
printf("\n")
printf("* java.vendor: %s\n"%(System.getProperty("java.vendor")))
printf("* java.version: %s\n"%(System.getProperty("java.version")))
printf("* os.name: %s\n"%(System.getProperty("os.name")))
printf("* os.arch: %s\n"%(System.getProperty("os.arch")))
printf("* java.vendor: %s\n"%(java_json["jvm.system.properties"]["java.vendor"]))
printf("* java.version: %s\n"%(java_json["jvm.system.properties"]["java.version"]))
printf("* java.runtime.version: %s\n"%(java_json["jvm.system.properties"]["java.runtime.version"]))
printf("* os.name: %s\n"%(java_json["jvm.system.properties"]["os.name"]))
printf("* os.arch: %s\n"%(java_json["jvm.system.properties"]["os.arch"]))

# JVM Runtime Options
printf("\n")
printf("== JVM Runtime Options\n")
printf("\n")
jvmArgs = ManagementFactory.getRuntimeMXBean().getInputArguments()
jvmArgs = jvmArgs.stream().distinct().collect(Collectors.toList())
idx = 0
for arg in jvmArgs:
for arg in java_json["jvm.runtime.options"]:
idx += 1
printf("* Option %d: %s\n"%(idx, arg))

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStreamReader;
import java.lang.management.ManagementFactory;
import java.nio.charset.StandardCharsets;
import java.util.concurrent.Callable;
import java.util.stream.Collectors;
import picocli.CommandLine;
import picocli.CommandLine.ArgGroup;
import picocli.CommandLine.Command;
Expand Down Expand Up @@ -121,6 +123,30 @@ public static boolean isUtf8Terminal() {
}
}

public static String getJavaInformation() {
var s = "{ \"jvm.system.properties\": {";
s += "\"java.vendor\"" + ":\"" + System.getProperty("java.vendor") + "\", ";
s += "\"java.version\"" + ":\"" + System.getProperty("java.version") + "\", ";
s +=
"\"java.runtime.version\""
+ ":\""
+ System.getProperty("java.runtime.version")
+ "\", ";
s += "\"os.name\"" + ":\"" + System.getProperty("os.name") + "\", ";
s += "\"os.arch\"" + ":\"" + System.getProperty("os.arch") + "\"}, ";
s += " \"jvm.runtime.options\": ";
var jvmArgs = ManagementFactory.getRuntimeMXBean().getInputArguments();
if (!jvmArgs.isEmpty()) {
s +=
jvmArgs.stream()
.distinct()
.map(arg -> "\"" + arg.replace("\"", "\\\"") + "\"")
.collect(Collectors.joining(", ", "[", "]"));
}
s += " }";
return s;
}

/**
* displayElapsedTime
*
Expand Down
Loading