Convert 3-arg waitAndAssertMetrics to 2-arg form (opentelemetry-api + misc)

Part 2 of 3. Covers opentelemetry-api-1.10..1.38 MeterTest variants plus
avaje-jex, dropwizard, javalin, spring-boot-actuator, and testing-common.

Mechanical conversion: wherever the body was
  metrics -> metrics.anySatisfy(metric -> assertThat(metric).X)
it becomes
  metric -> metric.hasName(NAME).X

Author: trask

instrumentation/avaje-jex-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/avaje/jex/v3_0/JexTest.java

@@ -121,14 +121,12 @@ void testHttpRouteMetricWithPathParamResponseSuccessful() {
     assertThat(response.status().code()).isEqualTo(200);
     testing.waitAndAssertMetrics(
         instrumentation,
-        "http.server.request.duration",
-        metrics ->
-            metrics.anySatisfy(
-                metric ->
-                    assertThat(metric)
-                        .hasHistogramSatisfying(
-                            histogram ->
-                                histogram.hasPointsSatisfying(
-                                    point -> point.hasAttribute(HTTP_ROUTE, "/test/param/{id}")))));
+        metric ->
+            metric
+                .hasName("http.server.request.duration")
+                .hasHistogramSatisfying(
+                    histogram ->
+                        histogram.hasPointsSatisfying(
+                            point -> point.hasAttribute(HTTP_ROUTE, "/test/param/{id}"))));
   }
 }

instrumentation/dropwizard/dropwizard-metrics-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/dropwizardmetrics/v4_0/DropwizardMetricsTest.java

@@ -5,7 +5,6 @@
 
 package io.opentelemetry.javaagent.instrumentation.dropwizardmetrics.v4_0;
 
-import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.NANOSECONDS;
 import static java.util.concurrent.TimeUnit.SECONDS;
@@ -42,13 +41,10 @@ void gauge() throws InterruptedException {
     // then
     testing.waitAndAssertMetrics(
         INSTRUMENTATION_NAME,
-        "testgauge",
-        metrics ->
-            metrics.anySatisfy(
-                metric ->
-                    assertThat(metric)
-                        .hasDoubleGaugeSatisfying(
-                            g -> g.hasPointsSatisfying(point -> point.hasValue(42)))));
+        metric ->
+            metric
+                .hasName("testgauge")
+                .hasDoubleGaugeSatisfying(g -> g.hasPointsSatisfying(point -> point.hasValue(42))));
 
     // when
     metricRegistry.remove("test'gauge");
@@ -75,15 +71,11 @@ void counter() throws InterruptedException {
     // then
     testing.waitAndAssertMetrics(
         INSTRUMENTATION_NAME,
-        "testcounter",
-        metrics ->
-            metrics.anySatisfy(
-                metric ->
-                    assertThat(metric)
-                        .hasLongSumSatisfying(
-                            sum ->
-                                sum.isNotMonotonic()
-                                    .hasPointsSatisfying(point -> point.hasValue(7)))));
+        metric ->
+            metric
+                .hasName("testcounter")
+                .hasLongSumSatisfying(
+                    sum -> sum.isNotMonotonic().hasPointsSatisfying(point -> point.hasValue(7))));
     testing.clearData();
 
     // when
@@ -109,15 +101,13 @@ void histogram() throws InterruptedException {
     // then
     testing.waitAndAssertMetrics(
         INSTRUMENTATION_NAME,
-        "testhistogram",
-        metrics ->
-            metrics.anySatisfy(
-                metric ->
-                    assertThat(metric)
-                        .hasHistogramSatisfying(
-                            histogramMetric ->
-                                histogramMetric.hasPointsSatisfying(
-                                    point -> point.hasSum(42).hasCount(2)))));
+        metric ->
+            metric
+                .hasName("testhistogram")
+                .hasHistogramSatisfying(
+                    histogramMetric ->
+                        histogramMetric.hasPointsSatisfying(
+                            point -> point.hasSum(42).hasCount(2))));
     testing.clearData();
 
     // when
@@ -143,15 +133,11 @@ void meter() throws InterruptedException {
     // then
     testing.waitAndAssertMetrics(
         INSTRUMENTATION_NAME,
-        "testmeter",
-        metrics ->
-            metrics.anySatisfy(
-                metric ->
-                    assertThat(metric)
-                        .hasLongSumSatisfying(
-                            sum ->
-                                sum.isMonotonic()
-                                    .hasPointsSatisfying(point -> point.hasValue(12)))));
+        metric ->
+            metric
+                .hasName("testmeter")
+                .hasLongSumSatisfying(
+                    sum -> sum.isMonotonic().hasPointsSatisfying(point -> point.hasValue(12))));
     testing.clearData();
 
     // when
@@ -178,16 +164,13 @@ void timer() throws InterruptedException {
     // then
     testing.waitAndAssertMetrics(
         INSTRUMENTATION_NAME,
-        "testtimer",
-        metrics ->
-            metrics.anySatisfy(
-                metric ->
-                    assertThat(metric)
-                        .hasUnit("ms")
-                        .hasHistogramSatisfying(
-                            histogram ->
-                                histogram.hasPointsSatisfying(
-                                    point -> point.hasSum(1.234).hasCount(2)))));
+        metric ->
+            metric
+                .hasName("testtimer")
+                .hasUnit("ms")
+                .hasHistogramSatisfying(
+                    histogram ->
+                        histogram.hasPointsSatisfying(point -> point.hasSum(1.234).hasCount(2))));
     testing.clearData();
 
     // when

instrumentation/javalin/testing/src/main/java/io/opentelemetry/instrumentation/javalin/AbstractJavalinTest.java

@@ -161,14 +161,12 @@ void testHttpRouteMetricWithPathParamResponseSuccessful() {
     testing()
         .waitAndAssertMetrics(
             getJettyInstrumentation(),
-            "http.server.request.duration",
-            metrics ->
-                metrics.anySatisfy(
-                    metric ->
-                        assertThat(metric)
-                            .hasHistogramSatisfying(
-                                histogram ->
-                                    histogram.hasPointsSatisfying(
-                                        point -> point.hasAttribute(HTTP_ROUTE, "/param/{id}")))));
+            metric ->
+                metric
+                    .hasName("http.server.request.duration")
+                    .hasHistogramSatisfying(
+                        histogram ->
+                            histogram.hasPointsSatisfying(
+                                point -> point.hasAttribute(HTTP_ROUTE, "/param/{id}"))));
   }
 }

instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/CallbackGcCloseTest.java

@@ -83,13 +83,11 @@ void instrumentClosedWhenClassLoaderCollected() throws Exception {
     // 3. Verify the gauge is producing metrics.
     testing.waitAndAssertMetrics(
         instrumentationName,
-        "test.gc.close",
-        metrics ->
-            metrics.anySatisfy(
-                metric ->
-                    assertThat(metric)
-                        .hasLongGaugeSatisfying(
-                            gauge -> gauge.hasPointsSatisfying(point -> point.hasValue(42)))));
+        metric ->
+            metric
+                .hasName("test.gc.close")
+                .hasLongGaugeSatisfying(
+                    gauge -> gauge.hasPointsSatisfying(point -> point.hasValue(42))));
 
     // 4. Release the classloader — simulates app undeploy.
     WeakReference<ClassLoader> clRef = new WeakReference<>(childCl);
@@ -125,13 +123,11 @@ void instrumentContinuesWhileCallbackAnchored() {
 
     testing.waitAndAssertMetrics(
         instrumentationName,
-        "test.gc.alive",
-        metrics ->
-            metrics.anySatisfy(
-                metric ->
-                    assertThat(metric)
-                        .hasLongGaugeSatisfying(
-                            gauge -> gauge.hasPointsSatisfying(point -> point.hasValue(99)))));
+        metric ->
+            metric
+                .hasName("test.gc.alive")
+                .hasLongGaugeSatisfying(
+                    gauge -> gauge.hasPointsSatisfying(point -> point.hasValue(99))));
 
     // prevent callback from being collected during the test
     assertThat(callback).isNotNull();