Fix JVM composite bean definitions.

Author: jefchien

instrumentation/jmx-metrics/src/main/resources/jmx/rules/jvm.yaml

@@ -27,22 +27,49 @@ rules:
     prefix: jvm.memory.
     type: gauge
     mapping:
+      HeapMemoryUsage.init:
+        metric: heap.init
+        desc: The initial amount of memory that the JVM requests from the operating system for the heap
       HeapMemoryUsage.used:
-        metric: heap
+        metric: heap.used
         desc: The current heap usage
+      HeapMemoryUsage.committed:
+        metric: heap.committed
+        desc: The amount of memory that is guaranteed to be available for the heap
+      HeapMemoryUsage.max:
+        metric: heap.max
+        desc: The maximum amount of memory can be used for the heap
+      NonHeapMemoryUsage.init:
+        metric: nonheap.init
+        desc: The initial amount of memory that the JVM requests from the operating system for non-heap purposes
       NonHeapMemoryUsage.used:
-        metric: nonheap
-        desc: The current non-heap usage
+        metric: nonheap.used
+        desc: The current non-heap memory usage
+      NonHeapMemoryUsage.committed:
+        metric: nonheap.committed
+        desc: The amount of memory that is guaranteed to be available for non-heap purposes
+      NonHeapMemoryUsage.max:
+        metric: nonheap.max
+        desc: The maximum amount of memory can be used for non-heap purposes
   - bean: java.lang:type=MemoryPool,*
     unit: by
     prefix: jvm.memory.pool.
     type: gauge
     metricAttribute:
       name: param(name)
     mapping:
+      Usage.init:
+        metric: init
+        desc: The initial amount of memory that the JVM requests from the operating system for the memory pool
       Usage.used:
-        metric: usage
-        desc: Current memory pool usage
+        metric: used
+        desc: The current memory pool memory usage
+      Usage.committed:
+        metric: committed
+        desc: The amount of memory that is guaranteed to be available for the memory pool
+      Usage.max:
+        metric: max
+        desc: The maximum amount of memory can be used for the memory pool
   - bean: java.lang:type=Threading
     unit: "1"
     prefix: jvm.threads.