Clean up metric definitions.

Author: jefchien

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

@@ -8,7 +8,7 @@ rules:
       LoadedClassCount:
         metric: loaded
         desc: Number of loaded classes
-  - bean: java.lang:type=GarbageCollector,*
+  - bean: java.lang:type=GarbageCollector,name=*
     prefix: jvm.gc.collections.
     type: counter
     metricAttribute:
@@ -51,7 +51,7 @@ rules:
       NonHeapMemoryUsage.max:
         metric: nonheap.max
         desc: The maximum amount of memory can be used for non-heap purposes
-  - bean: java.lang:type=MemoryPool,*
+  - bean: java.lang:type=MemoryPool,name=*
     unit: by
     prefix: jvm.memory.pool.
     type: gauge
@@ -81,7 +81,7 @@ rules:
       ThreadCount:
         metric: count
         desc: Number of threads
-  - bean: java.lang:type=OperatingSystem,*
+  - bean: java.lang:type=OperatingSystem
     prefix: jvm.cpu.
     type: gauge
     mapping:

instrumentation/jmx-metrics/src/main/resources/jmx/rules/kafka-consumer.yaml

@@ -1,6 +1,6 @@
 ---
 rules:
-  - bean: kafka.consumer:client-id=*,type=consumer-fetch-manager-metrics
+  - bean: kafka.consumer:type=consumer-fetch-manager-metrics,client-id=*
     metricAttribute:
       client-id: param(client-id)
     mapping:
@@ -29,7 +29,7 @@ rules:
         type: gauge
         desc: The average number of records consumed for all topics per second
         unit: "1"
-  - bean: kafka.consumer:client-id=*,topic=*,type=consumer-fetch-manager-metrics
+  - bean: kafka.consumer:type=consumer-fetch-manager-metrics,client-id=*,topic=*
     metricAttribute:
       client-id: param(client-id)
       topic: param(topic)

instrumentation/jmx-metrics/src/main/resources/jmx/rules/kafka-producer.yaml

@@ -1,6 +1,6 @@
 ---
 rules:
-  - bean: kafka.producer:client-id=*,type=producer-metrics
+  - bean: kafka.producer:type=producer-metrics,client-id=*
     metricAttribute:
       client-id: param(client-id)
     mapping:
@@ -29,7 +29,7 @@ rules:
         type: gauge
         desc: Responses received per second
         unit: "1"
-  - bean: kafka.producer:client-id=*,topic=*,type=producer-topic-metrics
+  - bean: kafka.producer:type=producer-topic-metrics,client-id=*,topic=*
     metricAttribute:
       client-id: param(client-id)
       topic: param(topic)

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

@@ -1,6 +1,8 @@
 ---
 rules:
   - bean: Catalina:type=Manager,host=localhost,context=*
+    metricAttribute:
+      context: param(context)
     mapping:
       activeSessions:
         metric: tomcat.sessions
@@ -64,6 +66,8 @@ rules:
         unit: threads
         desc: The number of threads
   - bean: Tomcat:type=Manager,host=localhost,context=*
+    metricAttribute:
+      context: param(context)
     mapping:
       activeSessions:
         metric: tomcat.sessions