remove useless attributes

Author: SylvainJuge

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

@@ -5,10 +5,9 @@
 
 package io.opentelemetry.instrumentation.jmx.rules;
 
-import static io.opentelemetry.instrumentation.jmx.rules.assertions.DataPointAttributes.attributeGroup;
 import static io.opentelemetry.instrumentation.jmx.rules.assertions.DataPointAttributes.attributeWithAnyValue;
 
-import io.opentelemetry.instrumentation.jmx.rules.assertions.AttributeMatcherGroup;
+import io.opentelemetry.instrumentation.jmx.rules.assertions.AttributeMatcher;
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -76,16 +75,6 @@ void testCollectedMetrics(int jettyMajorVersion) {
 
   private static MetricsVerifier createMetricsVerifier(int jettyMajorVersion) {
 
-    AttributeMatcherGroup threadPoolAttributes;
-    if (jettyMajorVersion >= 12) {
-      threadPoolAttributes =
-          attributeGroup(
-              attributeWithAnyValue("jetty.thread.pool.id"),
-              attributeWithAnyValue("jetty.thread.context"));
-    } else {
-      threadPoolAttributes = attributeGroup(attributeWithAnyValue("jetty.thread.pool.id"));
-    }
-
     MetricsVerifier verifier =
         MetricsVerifier.create()
             .add(
@@ -95,51 +84,49 @@ private static MetricsVerifier createMetricsVerifier(int jettyMajorVersion) {
                         .isUpDownCounter()
                         .hasDescription("The current number of threads")
                         .hasUnit("{thread}")
-                        .hasDataPointsWithAttributes(threadPoolAttributes))
+                        .hasDataPointsWithoutAttributes())
             .add(
                 "jetty.thread.limit",
                 metric ->
                     metric
                         .isUpDownCounter()
                         .hasDescription("The configured maximum number of threads in the pool")
                         .hasUnit("{thread}")
-                        .hasDataPointsWithAttributes(threadPoolAttributes))
+                        .hasDataPointsWithoutAttributes())
             .add(
                 "jetty.thread.idle.count",
                 metric ->
                     metric
                         .isUpDownCounter()
                         .hasDescription("The current number of idle threads")
                         .hasUnit("{thread}")
-                        .hasDataPointsWithAttributes(threadPoolAttributes))
+                        .hasDataPointsWithoutAttributes())
             .add(
                 "jetty.thread.busy.count",
                 metric ->
                     metric
                         .isUpDownCounter()
                         .hasDescription("The current number of busy threads")
                         .hasUnit("{thread}")
-                        .hasDataPointsWithAttributes(threadPoolAttributes))
+                        .hasDataPointsWithoutAttributes())
             .add(
                 "jetty.thread.queue.size",
                 metric ->
                     metric
                         .isUpDownCounter()
                         .hasDescription("The current job queue size")
                         .hasUnit("{thread}")
-                        .hasDataPointsWithAttributes(threadPoolAttributes))
+                        .hasDataPointsWithoutAttributes())
             .add(
                 "jetty.select.count",
                 metric ->
                     metric
                         .isCounter()
                         .hasDescription("The number of select calls")
                         .hasUnit("{operation}")
-                        .hasDataPointsWithAttributes(
-                            attributeGroup(
-                                attributeWithAnyValue("jetty.selector.id"),
-                                attributeWithAnyValue("jetty.selector.context"))));
+                        .hasDataPointsWithoutAttributes());
 
+    AttributeMatcher contextAttribute = attributeWithAnyValue("jetty.context");
     if (jettyMajorVersion >= 12) {
       verifier
           .add(
@@ -149,21 +136,15 @@ private static MetricsVerifier createMetricsVerifier(int jettyMajorVersion) {
                       .isUpDownCounter()
                       .hasDescription("Current number of active sessions")
                       .hasUnit("{session}")
-                      .hasDataPointsWithAttributes(
-                          attributeGroup(
-                              attributeWithAnyValue("jetty.context"),
-                              attributeWithAnyValue("jetty.session.cache.id"))))
+                      .hasDataPointsWithOneAttribute(contextAttribute))
           .add(
               "jetty.session.count.max",
               metric ->
                   metric
                       .isGauge()
                       .hasDescription("Maximum number of active sessions")
                       .hasUnit("{session}")
-                      .hasDataPointsWithAttributes(
-                          attributeGroup(
-                              attributeWithAnyValue("jetty.context"),
-                              attributeWithAnyValue("jetty.session.cache.id"))));
+                      .hasDataPointsWithOneAttribute(contextAttribute));
     } else {
       verifier
           .add(
@@ -173,43 +154,31 @@ private static MetricsVerifier createMetricsVerifier(int jettyMajorVersion) {
                       .isCounter()
                       .hasDescription("The total number of created sessions")
                       .hasUnit("{session}")
-                      .hasDataPointsWithAttributes(
-                          attributeGroup(
-                              attributeWithAnyValue("jetty.context"),
-                              attributeWithAnyValue("jetty.session.handler.id"))))
+                      .hasDataPointsWithOneAttribute(contextAttribute))
           .add(
               "jetty.session.duration.sum",
               metric ->
                   metric
                       .isCounter()
                       .hasDescription("The cumulated session duration")
                       .hasUnit("s")
-                      .hasDataPointsWithAttributes(
-                          attributeGroup(
-                              attributeWithAnyValue("jetty.context"),
-                              attributeWithAnyValue("jetty.session.handler.id"))))
+                      .hasDataPointsWithOneAttribute(contextAttribute))
           .add(
               "jetty.session.duration.max",
               metric ->
                   metric
                       .isGauge()
                       .hasDescription("The maximum session duration")
                       .hasUnit("s")
-                      .hasDataPointsWithAttributes(
-                          attributeGroup(
-                              attributeWithAnyValue("jetty.context"),
-                              attributeWithAnyValue("jetty.session.handler.id"))))
+                      .hasDataPointsWithOneAttribute(contextAttribute))
           .add(
               "jetty.session.duration.mean",
               metric ->
                   metric
                       .isGauge()
                       .hasDescription("The mean session duration")
                       .hasUnit("s")
-                      .hasDataPointsWithAttributes(
-                          attributeGroup(
-                              attributeWithAnyValue("jetty.context"),
-                              attributeWithAnyValue("jetty.session.handler.id"))));
+                      .hasDataPointsWithOneAttribute(contextAttribute));
     }
     return verifier;
   }