Use hasValueSatisfying in metric assertions

Depends on SDK 1.62.0 (open-telemetry/opentelemetry-java#TBD) which adds
LongPointAssert#hasValueSatisfying and DoublePointAssert#hasValueSatisfying.

Converted:
- oshi AbstractProcessMetricsTest: drops raw AssertJ on getPoints() in
  favor of the typed fluent chain.
- runtime-telemetry BufferMetricTest: replaces point.satisfies(pointData
  -> ... assertThat(pointData.getValue())...) blocks with the typed
  hasValueSatisfying + hasAttributes.

Author: trask

instrumentation/oshi/testing/src/main/java/io/opentelemetry/instrumentation/oshi/AbstractProcessMetricsTest.java

@@ -6,13 +6,17 @@
 package io.opentelemetry.instrumentation.oshi;
 
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
+import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
 
+import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
 
 public abstract class AbstractProcessMetricsTest {
 
+  private static final AttributeKey<String> TYPE = AttributeKey.stringKey("type");
+
   protected abstract void registerMetrics();
 
   protected abstract InstrumentationExtension testing();
@@ -33,12 +37,17 @@ void test() {
                     metric ->
                         assertThat(metric)
                             .hasUnit("By")
-                            // TODO: Provide fuzzy value matching
                             .hasLongSumSatisfying(
                                 sum ->
-                                    assertThat(metric.getLongSumData().getPoints())
-                                        .anySatisfy(
-                                            point -> assertThat(point.getValue()).isPositive()))));
+                                    sum.hasPointsSatisfying(
+                                        point ->
+                                            point
+                                                .hasAttributesSatisfying(equalTo(TYPE, "rss"))
+                                                .hasValueSatisfying(v -> v.isPositive()),
+                                        point ->
+                                            point
+                                                .hasAttributesSatisfying(equalTo(TYPE, "vms"))
+                                                .hasValueSatisfying(v -> v.isPositive())))));
     testing()
         .waitAndAssertMetrics(
             "io.opentelemetry.oshi",
@@ -48,11 +57,16 @@ void test() {
                     metric ->
                         assertThat(metric)
                             .hasUnit("ms")
-                            // TODO: Provide fuzzy value matching
                             .hasLongGaugeSatisfying(
                                 gauge ->
-                                    assertThat(metric.getLongGaugeData().getPoints())
-                                        .anySatisfy(
-                                            point -> assertThat(point.getValue()).isPositive()))));
+                                    gauge.hasPointsSatisfying(
+                                        point ->
+                                            point
+                                                .hasAttributesSatisfying(equalTo(TYPE, "user"))
+                                                .hasValueSatisfying(v -> v.isNotNegative()),
+                                        point ->
+                                            point
+                                                .hasAttributesSatisfying(equalTo(TYPE, "system"))
+                                                .hasValueSatisfying(v -> v.isNotNegative())))));
   }
 }

instrumentation/runtime-telemetry/library/src/testJava17/java/io/opentelemetry/instrumentation/runtimetelemetry/BufferMetricTest.java

@@ -8,7 +8,6 @@
 import static io.opentelemetry.instrumentation.runtimetelemetry.internal.Constants.BYTES;
 import static io.opentelemetry.instrumentation.runtimetelemetry.internal.Constants.UNIT_BUFFERS;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.assertj.core.api.Assertions.assertThat;
 
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.common.Attributes;
@@ -55,11 +54,9 @@ void shouldHaveJfrLoadedClassesCountEvents() {
                     sum ->
                         sum.hasPointsSatisfying(
                             point ->
-                                point.satisfies(
-                                    pointData -> {
-                                      assertThat(pointData.getValue()).isGreaterThan(0);
-                                      assertThat(pointData.getAttributes()).isEqualTo(directBuffer);
-                                    }))),
+                                point
+                                    .hasAttributes(directBuffer)
+                                    .hasValueSatisfying(v -> v.isPositive()))),
         metric ->
             metric
                 .hasName("jvm.buffer.memory.limit")
@@ -69,11 +66,9 @@ void shouldHaveJfrLoadedClassesCountEvents() {
                     sum ->
                         sum.hasPointsSatisfying(
                             point ->
-                                point.satisfies(
-                                    pointData -> {
-                                      assertThat(pointData.getValue()).isGreaterThan(0);
-                                      assertThat(pointData.getAttributes()).isEqualTo(directBuffer);
-                                    }))),
+                                point
+                                    .hasAttributes(directBuffer)
+                                    .hasValueSatisfying(v -> v.isPositive()))),
         metric ->
             metric
                 .hasName("jvm.buffer.memory.used")
@@ -83,10 +78,8 @@ void shouldHaveJfrLoadedClassesCountEvents() {
                     sum ->
                         sum.hasPointsSatisfying(
                             point ->
-                                point.satisfies(
-                                    pointData -> {
-                                      assertThat(pointData.getValue()).isGreaterThan(0);
-                                      assertThat(pointData.getAttributes()).isEqualTo(directBuffer);
-                                    }))));
+                                point
+                                    .hasAttributes(directBuffer)
+                                    .hasValueSatisfying(v -> v.isPositive()))));
   }
 }