singular units + tomcat fix

instrumentation/jmx-metrics/javaagent/src/main/resources/jmx/rules/jetty.yaml

@@ -8,7 +8,7 @@ rules:
       resource: param(context)
     mapping:
       sessionsCreated:
-        unit: "{sessions}"
+        unit: "{session}"
         type: counter
         desc: The number of sessions established in total
       sessionTimeTotal:
@@ -23,7 +23,7 @@ rules:
 
   - bean: org.eclipse.jetty.util.thread:type=queuedthreadpool,id=*
     prefix: jetty.thread.
-    unit: "{threads}"
+    unit: "{thread}"
     type: updowncounter
     mapping:
       busyThreads:

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

@@ -13,10 +13,12 @@ rules:
       errorCount:
         metric: request.errorCount
         type: gauge
+        unit: "{request}"
         desc: The number of errors per second on all request processors
       requestCount:
-        metric: requestCount
+        metric: request.requestCount
         type: gauge
+        unit: "{request}"
         desc: The number of requests per second across all request processors
       maxTime:
         metric: request.maxTime
@@ -51,10 +53,12 @@ rules:
       errorCount:
         metric: request.errorCount
         type: gauge
+        unit: "{request}"
         desc: The number of errors per second on all request processors
       requestCount:
         metric: request.requestCount
         type: gauge
+        unit: "{request}"
         desc: The number of requests per second across all request processors
       maxTime:
         metric: request.maxTime
@@ -82,7 +86,7 @@ rules:
           network.io.direction: const(transmit)
 
   - bean: Catalina:type=Manager,host=localhost,context=*
-    unit: "1"
+    unit: "{session}"
     prefix: tomcat.session.
     type: updowncounter
     metricAttribute:
@@ -92,7 +96,7 @@ rules:
         metric: activeSessions
         desc: The number of active sessions
   - bean: Tomcat:type=Manager,host=localhost,context=*
-    unit: "1"
+    unit: "{session}"
     prefix: tomcat.session.
     type: updowncounter
     metricAttribute:
@@ -103,8 +107,8 @@ rules:
         desc: The number of active sessions
 
   - bean: Catalina:type=ThreadPool,name=*
-    unit: "{threads}"
-    prefix: tomcat.threads.
+    unit: "{thread}"
+    prefix: tomcat.thread.
     type: updowncounter
     metricAttribute:
       name: param(name)
@@ -116,8 +120,8 @@ rules:
         metric: currentThreadsBusy
         desc: Busy thread count of the thread pool
   - bean: Tomcat:type=ThreadPool,name=*
-    unit: "{threads}"
-    prefix: tomcat.threads.
+    unit: "{thread}"
+    prefix: tomcat.thread.
     type: updowncounter
     metricAttribute:
       name: param(name)

instrumentation/jmx-metrics/javaagent/src/main/resources/jmx/rules/wildfly.yaml

@@ -3,7 +3,7 @@ rules:
   - bean: jboss.as:deployment=*,subsystem=undertow
     metricAttribute:
       deployment: param(deployment)
-    prefix: wildfly.sessions.
+    prefix: wildfly.session.
     type: counter
     unit: "1"
     mapping:
@@ -64,7 +64,7 @@ rules:
   - bean: jboss.as:subsystem=transactions
     type: counter
     prefix: wildfly.db.client.
-    unit: "{transactions}"
+    unit: "{transaction}"
     mapping:
       numberOfTransactions:
         metric: transaction.NumberOfTransactions

instrumentation/jmx-metrics/javaagent/tomcat.md

@@ -4,11 +4,11 @@ Here is the list of metrics based on MBeans exposed by Tomcat.
 
 | Metric Name                       | Type          | Attributes                 | Description                                                     |
 |-----------------------------------|---------------|----------------------------|-----------------------------------------------------------------|
-| tomcat.sessions.activeSessions    | UpDownCounter | context                    | The number of active sessions                                   |
-| tomcat.errorCount                 | Gauge         | name                       | The number of errors per second on all request processors       |
-| tomcat.requestCount               | Gauge         | name                       | The number of requests per second across all request processors |
-| tomcat.maxTime                    | Gauge         | name                       | The longest request processing time                             |
-| tomcat.processingTime             | Counter       | name                       | Represents the total time for processing all requests           |
+| tomcat.session.activeSessions     | UpDownCounter | context                    | The number of active sessions                                   |
+| tomcat.request.errorCount         | Gauge         | name                       | The number of errors per second on all request processors       |
+| tomcat.request.requestCount       | Gauge         | name                       | The number of requests per second across all request processors |
+| tomcat.request.maxTime            | Gauge         | name                       | The longest request processing time                             |
+| tomcat.request.processingTime     | Counter       | name                       | Represents the total time for processing all requests           |
 | tomcat.network.io                 | Counter       | name, network.io.direction | The number of bytes transmitted                                 |
 | tomcat.threads.currentThreadCount | UpDownCounter | name                       | Total thread count of the thread pool                           |
 | tomcat.threads.currentThreadsBusy | UpDownCounter | name                       | Busy thread count of the thread pool                            |