fix minor metrics units

Author: SylvainJuge

jmx-metrics/src/integrationTest/java/io/opentelemetry/contrib/jmxmetrics/target_systems/JettyIntegrationTest.java

@@ -56,7 +56,7 @@ void endToEnd() throws InterruptedException {
                 metric,
                 "jetty.session.count",
                 "The number of sessions established in total.",
-                "{sessions}",
+                "{session}",
                 attrs -> attrs.containsKey("resource")),
         metric ->
             assertSumWithAttributes(
@@ -73,20 +73,20 @@ void endToEnd() throws InterruptedException {
                 "s",
                 attrs -> attrs.containsKey("resource")),
         metric ->
-            assertSum(metric, "jetty.select.count", "The number of select calls.", "{operations}"),
+            assertSum(metric, "jetty.select.count", "The number of select calls.", "{operation}"),
         metric ->
             assertGaugeWithAttributes(
                 metric,
                 "jetty.thread.count",
                 "The current number of threads.",
-                "{threads}",
+                "{thread}",
                 attrs -> attrs.contains(entry("state", "busy")),
                 attrs -> attrs.contains(entry("state", "idle"))),
         metric ->
             assertGauge(
                 metric,
                 "jetty.thread.queue.count",
                 "The current number of threads in the queue.",
-                "{threads}"));
+                "{thread}"));
   }
 }

jmx-metrics/src/main/resources/target-systems/jetty.groovy

@@ -15,10 +15,10 @@
  */
 
 def beanSelector = otel.mbean("org.eclipse.jetty.io:context=*,type=managedselector,id=*")
-otel.instrument(beanSelector, "jetty.select.count", "The number of select calls.", "{operations}","selectCount", otel.&longCounterCallback)
+otel.instrument(beanSelector, "jetty.select.count", "The number of select calls.", "{operation}","selectCount", otel.&longCounterCallback)
 
 def beanSessions = otel.mbean("org.eclipse.jetty.server.session:context=*,type=sessionhandler,id=*")
-otel.instrument(beanSessions, "jetty.session.count", "The number of sessions established in total.", "{sessions}",
+otel.instrument(beanSessions, "jetty.session.count", "The number of sessions established in total.", "{session}",
   ["resource" : { mbean -> mbean.name().getKeyProperty("context") }],
   "sessionsCreated", otel.&longCounterCallback)
 otel.instrument(beanSessions, "jetty.session.time.total", "The total time sessions have been active.", "s",
@@ -29,9 +29,9 @@ otel.instrument(beanSessions, "jetty.session.time.max", "The maximum amount of t
   "sessionTimeMax", otel.&longValueCallback)
 
 def beanThreads = otel.mbean("org.eclipse.jetty.util.thread:type=queuedthreadpool,id=*")
-otel.instrument(beanThreads, "jetty.thread.count", "The current number of threads.", "{threads}",
+otel.instrument(beanThreads, "jetty.thread.count", "The current number of threads.", "{thread}",
   [
     "busyThreads":["state" : {"busy"}],
     "idleThreads": ["state" : {"idle"}]
   ], otel.&longValueCallback)
-otel.instrument(beanThreads, "jetty.thread.queue.count", "The current number of threads in the queue.", "{threads}","queueSize", otel.&longValueCallback)
+otel.instrument(beanThreads, "jetty.thread.queue.count", "The current number of threads in the queue.", "{thread}","queueSize", otel.&longValueCallback)

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

@@ -57,7 +57,7 @@ protected void verifyMetrics() {
                 metric,
                 "jetty.session.count",
                 "The number of sessions established in total.",
-                "{sessions}",
+                "{session}",
                 attrs -> attrs.containsKey("resource")),
         metric ->
             assertSumWithAttributes(
@@ -78,7 +78,7 @@ protected void verifyMetrics() {
                 metric,
                 "jetty.select.count",
                 "The number of select calls.",
-                "{operations}",
+                "{operation}",
                 /* isMonotonic= */ true,
                 // minor divergence from jetty.groovy with extra metrics attributes
                 attrs -> attrs.containsKey("context").containsKey("id")),
@@ -87,14 +87,14 @@ protected void verifyMetrics() {
                 metric,
                 "jetty.thread.count",
                 "The current number of threads.",
-                "{threads}",
+                "{thread}",
                 attrs -> attrs.containsEntry("state", "busy"),
                 attrs -> attrs.containsEntry("state", "idle")),
         metric ->
             assertGauge(
                 metric,
                 "jetty.thread.queue.count",
                 "The current number of threads in the queue.",
-                "{threads}"));
+                "{thread}"));
   }
 }

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

@@ -7,9 +7,7 @@ rules:
       selectCount:
         metric: jetty.select.count
         type: counter
-        # Unit should not use a plural form, left as-is for compatibility with jetty.groovy
-        # https://opentelemetry.io/docs/specs/semconv/general/metrics/#instrument-units
-        unit: "{operations}"
+        unit: "{operation}"
         desc: The number of select calls.
         metricAttribute:
           # minor divergence from jetty.groovy with extra attribute(s)
@@ -27,9 +25,7 @@ rules:
       sessionsCreated:
         metric: count
         type: counter
-        # Unit should not use a plural form, left as-is for compatibility with jetty.groovy
-        # https://opentelemetry.io/docs/specs/semconv/general/metrics/#instrument-units
-        unit: "{sessions}"
+        unit: "{session}"
         desc: The number of sessions established in total.
       sessionTimeTotal:
         metric: time.total
@@ -46,9 +42,7 @@ rules:
   - bean: org.eclipse.jetty.util.thread:type=queuedthreadpool,id=*
     # here the 'id' can be ignored as it's usually a single value equal to '0'
     prefix: jetty.thread.
-    # Unit should not use a plural form, left as-is for compatibility with jetty.groovy
-    # https://opentelemetry.io/docs/specs/semconv/general/metrics/#instrument-units
-    unit: "{threads}"
+    unit: "{thread}"
     mapping:
       busyThreads:
         metric: count