Thread count related metrics fixed after code review

Author: robsunday

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

@@ -64,19 +64,15 @@ rules:
     - Catalina:type=ThreadPool,name=*
     - Tomcat:type=ThreadPool,name=*
     unit: "{thread}"
-    prefix: tomcat.
+    prefix: tomcat.thread.
     type: updowncounter
     metricAttribute:
       tomcat.thread_pool.name: param(name)
     mapping:
       currentThreadCount:
-        metric: &metric thread.count
-        desc: &desc Thread count of the thread pool.
-        metricAttribute:
-          tomcat.thread.state: const(idle)
+        metric: count
+        desc: Total thread count of the thread pool.
       currentThreadsBusy:
-        metric: *metric
-        desc: *desc
-        metricAttribute:
-          tomcat.thread.state: const(busy)
+        metric: busy.count
+        desc: Number of busy threads in the thread pool.
 

instrumentation/jmx-metrics/library/src/test/java/io/opentelemetry/instrumentation/jmx/rules/TomcatIntegrationTest.java

@@ -122,13 +122,17 @@ private static MetricsVerifier createMetricsVerifier() {
             "tomcat.thread.count",
             metric ->
                 metric
-                    .hasDescription("Thread count of the thread pool.")
+                    .hasDescription("Total thread count of the thread pool.")
                     .hasUnit("{thread}")
                     .isUpDownCounter()
-                    .hasDataPointsWithAttributes(
-                        attributeGroup(
-                            attribute("tomcat.thread.state", "idle"), threadPoolNameAttribute),
-                        attributeGroup(
-                            attribute("tomcat.thread.state", "busy"), threadPoolNameAttribute)));
+                    .hasDataPointsWithOneAttribute(threadPoolNameAttribute))
+        .add(
+            "tomcat.thread.busy.count",
+            metric ->
+                metric
+                    .hasDescription("Number of busy threads in the thread pool.")
+                    .hasUnit("{thread}")
+                    .isUpDownCounter()
+                    .hasDataPointsWithOneAttribute(threadPoolNameAttribute));
   }
 }