Test fixed.

Tomcat metrics description md file moved to library
Code review followup

Author: robsunday

instrumentation/jmx-metrics/javaagent/README.md

@@ -29,7 +29,7 @@ No targets are enabled by default. The supported target environments are listed
 - [camel](camel.md)
 - [jetty](jetty.md)
 - [kafka-broker](kafka-broker.md)
-- [tomcat](tomcat.md)
+- [tomcat](../library/tomcat.md)
 - [wildfly](wildfly.md)
 - [hadoop](hadoop.md)
 

instrumentation/jmx-metrics/javaagent/src/test/java/io/opentelemetry/instrumentation/javaagent/jmx/JmxMetricInsightInstallerTest.java

@@ -22,6 +22,12 @@
 import java.util.Set;
 import org.junit.jupiter.api.Test;
 
+/**
+ * TODO: This test will eventually go away when all yaml files are moved from javaagent to library
+ * directory. When yaml file is moved from javaagent to library then appropriate item must be
+ * removed from JmxMetricInsightInstallerTest#FILES_TO_BE_TESTED and corresponding test must be
+ * added in the library.
+ */
 class JmxMetricInsightInstallerTest {
   private static final String PATH_TO_ALL_EXISTING_RULES = "src/main/resources/jmx/rules";
   private static final Set<String> FILES_TO_BE_TESTED =
@@ -32,7 +38,6 @@ class JmxMetricInsightInstallerTest {
               "hadoop.yaml",
               "jetty.yaml",
               "kafka-broker.yaml",
-              "tomcat.yaml",
               "wildfly.yaml"));
 
   @Test

instrumentation/jmx-metrics/javaagent/tomcat.md

@@ -38,21 +38,21 @@ rules:
         unit: &unit By
         desc: &desc The number of bytes transmitted.
         metricAttribute:
-          tomcat.network.io.direction: const(received)
+          network.io.direction: const(receive)
       bytesSent:
         metric: *metric
         type: *type
         unit: *unit
         desc: *desc
         metricAttribute:
-          tomcat.network.io.direction: const(sent)
+          network.io.direction: const(transmit)
 
   - beans:
     - Catalina:type=Manager,host=localhost,context=*
     - Tomcat:type=Manager,host=localhost,context=*
     prefix: tomcat.
     metricAttribute:
-      tomcat.web_app_context: param(context)
+      tomcat.context: param(context)
     mapping:
       activeSessions:
         metric: active_session.count

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

@@ -105,10 +105,10 @@ private static MetricsVerifier createMetricsVerifier() {
                     .isCounter()
                     .hasDataPointsWithAttributes(
                         attributeGroup(
-                            attribute("tomcat.network.io.direction", "sent"),
+                            attribute("network.io.direction", "receive"),
                             requestProcessorNameAttribute),
                         attributeGroup(
-                            attribute("tomcat.network.io.direction", "received"),
+                            attribute("network.io.direction", "transmit"),
                             requestProcessorNameAttribute)))
         .add(
             "tomcat.active_session.count",

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

@@ -0,0 +1,13 @@
+# Tomcat Metrics
+
+Here is the list of metrics based on MBeans exposed by Tomcat.
+
+| Metric Name                    | Type          | Attributes                                          | Description                             |
+|--------------------------------|---------------|-----------------------------------------------------|-----------------------------------------|
+| tomcat.active_session.count    | UpDownCounter | tomcat.context                                      | The number of active sessions.          |
+| tomcat.error.count             | Counter       | tomcat.request_processor.name                       | The number of errors.                   |
+| tomcat.request.count           | Counter       | tomcat.request_processor.name                       | The number of requests processed.       |
+| tomcat.request.duration.max    | Gauge         | tomcat.request_processor.name                       | The longest request processing time.    |
+| tomcat.request.processing_time | Counter       | tomcat.request_processor.name                       | Total time for processing all requests. |
+| tomcat.network.io              | Counter       | tomcat.request_processor.name, network.io.direction | The number of bytes transmitted.        |
+| tomcat.thread.count            | UpDownCounter | tomcat.thread_pool.name, tomcat.thread.state        | Thread Count of the Thread Pool         |