Units updated to align with semconv

Author: robsunday

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

@@ -53,15 +53,15 @@ protected MetricsVerifier createMetricsVerifier() {
             metric ->
                 metric
                     .hasDescription("The number of active sessions")
-                    .hasUnit("sessions") // TODO: not aligned with semconv. Should be "{session}"
+                    .hasUnit("{session}")
                     .isGauge()
                     .hasDataPointsWithOneAttribute(attributeWithAnyValue("context")))
         .add(
             "tomcat.errors",
             metric ->
                 metric
                     .hasDescription("The number of errors encountered")
-                    .hasUnit("errors") // TODO: not aligned with semconv. Should be "{error}"
+                    .hasUnit("{error}")
                     .isCounter()
                     .hasDataPointsWithOneAttribute(attribute("proto_handler", "\"http-nio-8080\"")))
         .add(
@@ -77,7 +77,7 @@ protected MetricsVerifier createMetricsVerifier() {
             metric ->
                 metric
                     .hasDescription("The number of bytes transmitted and received")
-                    .hasUnit("by") // TODO: not aligned with semconv. Should be "By"
+                    .hasUnit("By")
                     .isCounter()
                     .hasDataPointsWithAttributes(
                         attributeGroup(
@@ -91,7 +91,7 @@ protected MetricsVerifier createMetricsVerifier() {
             metric ->
                 metric
                     .hasDescription("The number of threads")
-                    .hasUnit("threads") // TODO: not aligned with semconv. Should be "{thread}"
+                    .hasUnit("{thread}")
                     .isGauge()
                     .hasDataPointsWithAttributes(
                         attributeGroup(
@@ -113,7 +113,7 @@ protected MetricsVerifier createMetricsVerifier() {
             metric ->
                 metric
                     .hasDescription("The total requests")
-                    .hasUnit("requests") // TODO: not aligned with semconv. Should be "{request}"
+                    .hasUnit("{request}")
                     .isCounter()
                     .hasDataPointsWithOneAttribute(
                         attribute("proto_handler", "\"http-nio-8080\"")));

jmx-scraper/src/main/resources/tomcat.yaml

@@ -15,7 +15,7 @@ rules:
       activeSessions:
         metric: tomcat.sessions
         type: gauge
-        unit: sessions
+        unit: "{session}"
         desc: The number of active sessions
 
   - beans:
@@ -28,12 +28,12 @@ rules:
       errorCount:
         metric: errors
         type: counter
-        unit: errors
+        unit: "{error}"
         desc: The number of errors encountered
       requestCount:
         metric: request_count
         type: counter
-        unit: requests
+        unit: "{request}"
         desc: The total requests
       maxTime:
         metric: max_time
@@ -48,14 +48,14 @@ rules:
       bytesSent:
         metric: traffic
         type: counter
-        unit: by
+        unit: By
         desc: The number of bytes transmitted and received
         metricAttribute:
           direction: const(sent)
       bytesReceived:
         metric: traffic
         type: counter
-        unit: by
+        unit: By
         desc: The number of bytes transmitted and received
         metricAttribute:
           direction: const(received)
@@ -71,13 +71,13 @@ rules:
         metric: threads
         desc: The number of threads
         type: gauge
-        unit: threads
+        unit: "{thread}"
         metricAttribute:
           state: const(idle)
       currentThreadsBusy:
         metric: threads
         desc: The number of threads
         type: gauge
-        unit: threads
+        unit: "{thread}"
         metricAttribute:
           state: const(busy)