add jvm.fd.open and jvm.runtime.uptime to jmx configs

Author: schmikei

jmx-metrics/src/integrationTest/java/io/opentelemetry/contrib/jmxmetrics/target_systems/JvmTargetSystemIntegrationTest.java

@@ -5,13 +5,15 @@
 
 package io.opentelemetry.contrib.jmxmetrics.target_systems;
 
-import io.opentelemetry.contrib.jmxmetrics.AbstractIntegrationTest;
 import java.util.Arrays;
 import java.util.List;
+
 import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.junit.jupiter.Container;
 
+import io.opentelemetry.contrib.jmxmetrics.AbstractIntegrationTest;
+
 class JvmTargetSystemIntegrationTest extends AbstractIntegrationTest {
 
   JvmTargetSystemIntegrationTest() {
@@ -55,6 +57,8 @@ void endToEnd() {
         metric -> assertGauge(metric, "jvm.memory.nonheap.init", "current non-heap usage", "By"),
         metric -> assertGauge(metric, "jvm.memory.nonheap.max", "current non-heap usage", "By"),
         metric -> assertGauge(metric, "jvm.memory.nonheap.used", "current non-heap usage", "By"),
+        metric -> assertGauge(metric, "jvm.runtime.uptime", "uptime", "ms"),
+        metric -> assertGauge(metric, "jvm.fd.open", "open file descriptors", "1"),
         metric ->
             assertTypedGauge(
                 metric, "jvm.memory.pool.committed", "current memory pool usage", "By", gcLabels),

jmx-metrics/src/main/resources/target-systems/jvm.groovy

@@ -33,6 +33,15 @@ otel.instrument(memory, "jvm.memory.heap", "current heap usage",
 otel.instrument(memory, "jvm.memory.nonheap", "current non-heap usage",
         "By", "NonHeapMemoryUsage", otel.&longValueCallback)
 
+def runtime = otel.mbean("java.lang:type=Runtime")
+otel.instrument(runtime, "jvm.runtime.uptime", "uptime",
+        "ms", "Uptime", otel.&longValueCallback)
+
+def os = otel.mbean("java.lang:type=OperatingSystem")
+otel.instrument(os, "jvm.fd.open", "open file descriptors",
+        "1", "OpenFileDescriptorCount", otel.&longValueCallback)
+
+
 def memoryPool = otel.mbeans("java.lang:type=MemoryPool,*")
 otel.instrument(memoryPool, "jvm.memory.pool", "current memory pool usage",
         "By", ["name" : { mbean -> mbean.name().getKeyProperty("name") }],