fix tomcat integration test

Author: breedx-splk

jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/TomcatIntegrationTest.java

@@ -49,73 +49,97 @@ protected JmxScraperContainer customizeScraperContainer(
   protected MetricsVerifier createMetricsVerifier() {
     return MetricsVerifier.create()
         .add(
-            "tomcat.sessions",
+            "tomcat.session.active.count",
             metric ->
                 metric
-                    .hasDescription("The number of active sessions")
+                    .hasDescription("The number of currently active sessions.")
                     .hasUnit("{session}")
-                    .isGauge()
-                    .hasDataPointsWithOneAttribute(attributeWithAnyValue("context")))
+                    .isUpDownCounter()
+                    .hasDataPointsWithOneAttribute(attributeWithAnyValue("tomcat.context")))
         .add(
-            "tomcat.errors",
+            "tomcat.error.count",
             metric ->
                 metric
-                    .hasDescription("The number of errors encountered")
+                    .hasDescription("The number of errors.")
                     .hasUnit("{error}")
                     .isCounter()
-                    .hasDataPointsWithOneAttribute(attribute("proto_handler", "\"http-nio-8080\"")))
+                    .hasDataPointsWithOneAttribute(attribute("tomcat.request.processor.name", "\"http-nio-8080\"")))
         .add(
-            "tomcat.processing_time",
+            "tomcat.request.duration.sum",
             metric ->
                 metric
-                    .hasDescription("The total processing time")
-                    .hasUnit("ms")
+                    .hasDescription("Total time of processing all requests.")
+                    .hasUnit("s")
                     .isCounter()
-                    .hasDataPointsWithOneAttribute(attribute("proto_handler", "\"http-nio-8080\"")))
+                    .hasDataPointsWithOneAttribute(attribute("tomcat.request.processor.name", "\"http-nio-8080\"")))
         .add(
-            "tomcat.traffic",
+            "tomcat.network.io",
             metric ->
                 metric
-                    .hasDescription("The number of bytes transmitted and received")
+                    .hasDescription("The number of bytes transmitted.")
                     .hasUnit("By")
                     .isCounter()
                     .hasDataPointsWithAttributes(
                         attributeGroup(
-                            attribute("direction", "sent"),
-                            attribute("proto_handler", "\"http-nio-8080\"")),
+                            attribute("network.io.direction", "transmit"),
+                            attribute("tomcat.request.processor.name", "\"http-nio-8080\"")),
                         attributeGroup(
-                            attribute("direction", "received"),
-                            attribute("proto_handler", "\"http-nio-8080\""))))
+                            attribute("network.io.direction", "receive"),
+                            attribute("tomcat.request.processor.name", "\"http-nio-8080\""))))
         .add(
-            "tomcat.threads",
+            "tomcat.thread.count",
             metric ->
                 metric
-                    .hasDescription("The number of threads")
+                    .hasDescription("Total thread count of the thread pool.")
                     .hasUnit("{thread}")
-                    .isGauge()
+                    .isUpDownCounter()
                     .hasDataPointsWithAttributes(
+//                        attributeGroup(
+//                            attribute("state", "idle"),
+//                            attribute("tomcat.thread.pool.name", "\"http-nio-8080\"")),
                         attributeGroup(
-                            attribute("state", "idle"),
-                            attribute("proto_handler", "\"http-nio-8080\"")),
-                        attributeGroup(
-                            attribute("state", "busy"),
-                            attribute("proto_handler", "\"http-nio-8080\""))))
+//                            attribute("state", "busy"),
+                            attribute("tomcat.thread.pool.name", "\"http-nio-8080\""))))
         .add(
-            "tomcat.max_time",
+            "tomcat.request.duration.max",
             metric ->
                 metric
-                    .hasDescription("Maximum time to process a request")
-                    .hasUnit("ms")
+                    .hasDescription("The longest request processing time.")
+                    .hasUnit("s")
                     .isGauge()
-                    .hasDataPointsWithOneAttribute(attribute("proto_handler", "\"http-nio-8080\"")))
+                    .hasDataPointsWithOneAttribute(attribute("tomcat.request.processor.name", "\"http-nio-8080\"")))
         .add(
-            "tomcat.request_count",
+            "tomcat.request.count",
             metric ->
                 metric
-                    .hasDescription("The total requests")
+                    .hasDescription("The number of requests processed.")
                     .hasUnit("{request}")
                     .isCounter()
                     .hasDataPointsWithOneAttribute(
-                        attribute("proto_handler", "\"http-nio-8080\"")));
+                        attribute("tomcat.request.processor.name", "\"http-nio-8080\"")))
+        .add("tomcat.thread.busy.count",
+            metric ->
+                metric
+                    .hasDescription("Number of busy threads in the thread pool.")
+                    .hasUnit("{thread}")
+                    .isUpDownCounter()
+                    .hasDataPointsWithOneAttribute(
+                        attribute("tomcat.thread.pool.name", "\"http-nio-8080\"")))
+        .add("tomcat.session.active.limit",
+            metric ->
+                metric
+                    .hasDescription("Maximum possible number of active sessions.")
+                    .hasUnit("{session}")
+                    .isUpDownCounter()
+                    .hasDataPointsWithOneAttribute(
+                        attribute("tomcat.context", "/")))
+        .add("tomcat.thread.limit",
+            metric ->
+                metric
+                    .hasDescription("Maximum possible number of threads in the thread pool.")
+                    .hasUnit("{thread}")
+                    .isUpDownCounter()
+                    .hasDataPointsWithOneAttribute(
+                        attribute("tomcat.thread.pool.name", "\"http-nio-8080\"")));
   }
 }