Fine tuning assertion messages.

Method names improvement.

Author: robsunday

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

@@ -46,12 +46,12 @@ protected MetricsVerifier createMetricsVerifier() {
 
     return MetricsVerifier.create()
         .assertGauge("jvm.classes.loaded", "number of loaded classes", "1")
-        .assertTypedSum(
+        .assertTypedCounter(
             "jvm.gc.collections.count",
             "total number of collections that have occurred",
             "1",
             gcCollectionLabels)
-        .assertTypedSum(
+        .assertTypedCounter(
             "jvm.gc.collections.elapsed",
             "the approximate accumulated collection elapsed time in milliseconds",
             "ms",

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

@@ -96,29 +96,8 @@ public final MetricsVerifier assertUpDownCounterWithAttributes(
         metricName, description, unit, /* isMonotonic= */ false, attributeGroupAssertions);
   }
 
-  @SafeVarargs
-  @SuppressWarnings("CanIgnoreReturnValueSuggester")
-  private final MetricsVerifier assertSumWithAttributes(
-      String metricName,
-      String description,
-      String unit,
-      boolean isMonotonic,
-      Consumer<MapAssert<String, String>>... attributeGroupAssertions) {
-    assertions.put(
-        metricName,
-        metric -> {
-          assertDescription(metric, description);
-          assertUnit(metric, unit);
-          assertMetricWithSum(metric, isMonotonic);
-          assertAttributedPoints(
-              metricName, metric.getSum().getDataPointsList(), attributeGroupAssertions);
-        });
-
-    return this;
-  }
-
   @SuppressWarnings("CanIgnoreReturnValueSuggester")
-  public MetricsVerifier assertTypedSum(
+  public MetricsVerifier assertTypedCounter(
       String metricName, String description, String unit, List<String> types) {
     assertions.put(
         metricName,
@@ -164,7 +143,7 @@ public void verify(List<Metric> metrics) {
     }
 
     if (strictMode && !unverifiedMetrics.isEmpty()) {
-      fail("The following metrics were received but not verified: " + unverifiedMetrics);
+      fail("Metrics received but not verified because no assertion exists: " + unverifiedMetrics);
     }
   }
 
@@ -176,7 +155,7 @@ private void verifyAllExpectedMetricsWereReceived(List<Metric> metrics) {
 
     assertionNames.removeAll(receivedMetricNames);
     if (!assertionNames.isEmpty()) {
-      fail("The following metrics were expected but not received: " + assertionNames);
+      fail("Metrics expected but not received: " + assertionNames);
     }
   }
 
@@ -196,6 +175,27 @@ private MetricsVerifier assertSum(
     return this;
   }
 
+  @SafeVarargs
+  @SuppressWarnings("CanIgnoreReturnValueSuggester")
+  private final MetricsVerifier assertSumWithAttributes(
+      String metricName,
+      String description,
+      String unit,
+      boolean isMonotonic,
+      Consumer<MapAssert<String, String>>... attributeGroupAssertions) {
+    assertions.put(
+        metricName,
+        metric -> {
+          assertDescription(metric, description);
+          assertUnit(metric, unit);
+          assertMetricWithSum(metric, isMonotonic);
+          assertAttributedPoints(
+              metricName, metric.getSum().getDataPointsList(), attributeGroupAssertions);
+        });
+
+    return this;
+  }
+
   private static void assertMetricWithGauge(Metric metric) {
     assertThat(metric.hasGauge()).withFailMessage("Metric with gauge expected").isTrue();
   }