Skip to content

Commit 80b44dc

Browse files
matzewbrian-brazil
authored andcommitted
Adding info for the java runtime name (#338)
1 parent 9d14f76 commit 80b44dc

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

simpleclient_hotspot/src/main/java/io/prometheus/client/hotspot/VersionInfoExports.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
* </pre>
1919
* Metrics being exported:
2020
* <pre>
21-
* jvm_info{version="1.8.0_45-b14",vendor="Oracle Corporation"} 1.0
21+
* jvm_info{version="1.8.0_151-b12",vendor="Oracle Corporation",runtime="OpenJDK Runtime Environment",} 1.0
2222
* </pre>
2323
*/
2424

@@ -31,8 +31,13 @@ public List<MetricFamilySamples> collect() {
3131
GaugeMetricFamily jvmInfo = new GaugeMetricFamily(
3232
"jvm_info",
3333
"JVM version info",
34-
Arrays.asList("version", "vendor"));
35-
jvmInfo.addMetric(Arrays.asList(System.getProperty("java.runtime.version", "unknown"), System.getProperty("java.vm.vendor", "unknown")), 1L);
34+
Arrays.asList("version", "vendor", "runtime"));
35+
jvmInfo.addMetric(
36+
Arrays.asList(
37+
System.getProperty("java.runtime.version", "unknown"),
38+
System.getProperty("java.vm.vendor", "unknown"),
39+
System.getProperty("java.runtime.name", "unknown")),
40+
1L);
3641
mfs.add(jvmInfo);
3742

3843
return mfs;

simpleclient_hotspot/src/test/java/io/prometheus/client/hotspot/VersionInfoExportsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public void testVersionInfo() {
2121
assertEquals(
2222
1L,
2323
registry.getSampleValue(
24-
"jvm_info", new String[]{"version", "vendor"}, new String[]{System.getProperty("java.runtime.version", "unknown"), System.getProperty("java.vm.vendor", "unknown")}),
24+
"jvm_info", new String[]{"version", "vendor", "runtime"}, new String[]{System.getProperty("java.runtime.version", "unknown"), System.getProperty("java.vm.vendor", "unknown"), System.getProperty("java.runtime.name", "unknown")}),
2525
.0000001);
2626
}
2727
}

0 commit comments

Comments
 (0)