consolidate name on jvm.file_descriptor.count

Author: schmikei

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

@@ -5,15 +5,13 @@
 
 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() {

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

@@ -33,12 +33,8 @@ 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",
+otel.instrument(os, "jvm.file_descriptor.count", "open file descriptors",
         "1", "OpenFileDescriptorCount", otel.&longValueCallback)
 
 

jmx-scraper/src/main/resources/jvm.yaml

@@ -83,6 +83,13 @@ rules:
         metric: jvm.memory.pool.used
         desc: current memory pool usage
 
+  - bean: java.lang:type=OperatingSystem
+    mapping:
+      OpenFileDescriptorCount:
+        metric: jvm.file_descriptor.count
+        unit: 1
+        desc: open file descriptors
+
   - bean: java.lang:type=Threading
     mapping:
       ThreadCount: