removed 'typed' attributes

Author: SylvainJuge

jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/assertions/MetricAssert.java

@@ -12,11 +12,8 @@
 import io.opentelemetry.proto.metrics.v1.Metric;
 import io.opentelemetry.proto.metrics.v1.NumberDataPoint;
 import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 import org.assertj.core.api.AbstractAssert;
@@ -199,31 +196,6 @@ private MetricAssert checkDataPoints(Consumer<List<NumberDataPoint>> listConsume
     return this;
   }
 
-  // TODO: To be removed and calls will be replaced with hasDataPointsWithAttributes()
-  @CanIgnoreReturnValue
-  public MetricAssert hasTypedDataPoints(Collection<String> types) {
-    return checkDataPoints(
-        dataPoints -> {
-          dataPointsCommonCheck(dataPoints);
-
-          Set<String> foundValues = new HashSet<>();
-          for (NumberDataPoint dataPoint : dataPoints) {
-            List<KeyValue> attributes = dataPoint.getAttributesList();
-
-            info.description(
-                "expected exactly one 'name' attribute for typed data point in metric '%s'",
-                actual.getName());
-            iterables.assertHasSize(info, attributes, 1);
-
-            objects.assertEqual(info, attributes.get(0).getKey(), "name");
-            foundValues.add(attributes.get(0).getValue().getStringValue());
-          }
-          info.description(
-              "missing or unexpected type attribute for metric '%s'", actual.getName());
-          iterables.assertContainsExactlyInAnyOrder(info, foundValues, types.toArray());
-        });
-  }
-
   private void dataPointsCommonCheck(List<NumberDataPoint> dataPoints) {
     info.description("unable to retrieve data points from metric '%s'", actual.getName());
     objects.assertNotNull(info, dataPoints);

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

@@ -5,11 +5,13 @@
 
 package io.opentelemetry.contrib.jmxscraper.target_systems;
 
+import static io.opentelemetry.contrib.jmxscraper.assertions.DataPointAttributes.attribute;
+import static io.opentelemetry.contrib.jmxscraper.assertions.DataPointAttributes.attributeGroup;
+
 import io.opentelemetry.contrib.jmxscraper.JmxScraperContainer;
 import io.opentelemetry.contrib.jmxscraper.TestAppContainer;
+import io.opentelemetry.contrib.jmxscraper.assertions.AttributeMatcherGroup;
 import java.nio.file.Path;
-import java.util.Arrays;
-import java.util.List;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
 
@@ -34,15 +36,16 @@ protected JmxScraperContainer customizeScraperContainer(
   @Override
   protected MetricsVerifier createMetricsVerifier() {
     // those values depend on the JVM GC configured
-    List<String> gcLabels =
-        Arrays.asList(
+    AttributeMatcherGroup[] memoryAttributes =
+        nameAttributeMatchers(
             "Code Cache",
             "PS Eden Space",
             "PS Old Gen",
             "Metaspace",
             "Compressed Class Space",
             "PS Survivor Space");
-    List<String> gcCollectionLabels = Arrays.asList("PS MarkSweep", "PS Scavenge");
+    AttributeMatcherGroup[] gcAlgorithmAttributes =
+        nameAttributeMatchers("PS MarkSweep", "PS Scavenge");
 
     return MetricsVerifier.create()
         .add(
@@ -60,7 +63,7 @@ protected MetricsVerifier createMetricsVerifier() {
                     .hasDescription("total number of collections that have occurred")
                     .hasUnit("1")
                     .isCounter()
-                    .hasTypedDataPoints(gcCollectionLabels))
+                    .hasDataPointsWithAttributes(gcAlgorithmAttributes))
         .add(
             "jvm.gc.collections.elapsed",
             metric ->
@@ -69,7 +72,7 @@ protected MetricsVerifier createMetricsVerifier() {
                         "the approximate accumulated collection elapsed time in milliseconds")
                     .hasUnit("ms")
                     .isCounter()
-                    .hasTypedDataPoints(gcCollectionLabels))
+                    .hasDataPointsWithAttributes(gcAlgorithmAttributes))
         .add(
             "jvm.memory.heap.committed",
             metric ->
@@ -141,31 +144,31 @@ protected MetricsVerifier createMetricsVerifier() {
                     .hasDescription("current memory pool usage")
                     .hasUnit("by")
                     .isGauge()
-                    .hasTypedDataPoints(gcLabels))
+                    .hasDataPointsWithAttributes(memoryAttributes))
         .add(
             "jvm.memory.pool.init",
             metric ->
                 metric
                     .hasDescription("current memory pool usage")
                     .hasUnit("by")
                     .isGauge()
-                    .hasTypedDataPoints(gcLabels))
+                    .hasDataPointsWithAttributes(memoryAttributes))
         .add(
             "jvm.memory.pool.max",
             metric ->
                 metric
                     .hasDescription("current memory pool usage")
                     .hasUnit("by")
                     .isGauge()
-                    .hasTypedDataPoints(gcLabels))
+                    .hasDataPointsWithAttributes(memoryAttributes))
         .add(
             "jvm.memory.pool.used",
             metric ->
                 metric
                     .hasDescription("current memory pool usage")
                     .hasUnit("by")
                     .isGauge()
-                    .hasTypedDataPoints(gcLabels))
+                    .hasDataPointsWithAttributes(memoryAttributes))
         .add(
             "jvm.threads.count",
             metric ->
@@ -175,4 +178,12 @@ protected MetricsVerifier createMetricsVerifier() {
                     .isGauge()
                     .hasDataPointsWithoutAttributes());
   }
+
+  private static AttributeMatcherGroup[] nameAttributeMatchers(String... values) {
+    AttributeMatcherGroup[] groups = new AttributeMatcherGroup[values.length];
+    for (int i = 0; i < values.length; i++) {
+      groups[i] = attributeGroup(attribute("name", values[i]));
+    }
+    return groups;
+  }
 }