cleanup

Author: zeitlinger

testing-common/src/main/java/io/opentelemetry/instrumentation/testing/InstrumentationTestRunner.java

@@ -5,10 +5,10 @@
 
 package io.opentelemetry.instrumentation.testing;
 
+import static io.opentelemetry.instrumentation.testing.internal.AwaitUtil.awaitUntilAsserted;
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
 
 import io.opentelemetry.api.OpenTelemetry;
-import io.opentelemetry.instrumentation.testing.internal.AwaitUtil;
 import io.opentelemetry.instrumentation.testing.util.TelemetryDataUtil;
 import io.opentelemetry.instrumentation.testing.util.ThrowingRunnable;
 import io.opentelemetry.instrumentation.testing.util.ThrowingSupplier;
@@ -117,8 +117,7 @@ private <T extends Consumer<TraceAssert>> void waitAndAssertTraces(
     List<T> assertionsList = new ArrayList<>();
     assertions.forEach(assertionsList::add);
 
-    AwaitUtil.awaitUntilAsserted(
-        () -> doAssertTraces(traceComparator, assertionsList, verifyScopeVersion));
+    awaitUntilAsserted(() -> doAssertTraces(traceComparator, assertionsList, verifyScopeVersion));
   }
 
   private <T extends Consumer<TraceAssert>> void doAssertTraces(
@@ -142,7 +141,7 @@ private <T extends Consumer<TraceAssert>> void doAssertTraces(
   public final void waitAndAssertMetrics(
       String instrumentationName, String metricName, Consumer<ListAssert<MetricData>> assertion) {
 
-    AwaitUtil.awaitUntilAsserted(
+    awaitUntilAsserted(
         () ->
             assertion.accept(
                 assertThat(getExportedMetrics())
@@ -158,7 +157,7 @@ public final void waitAndAssertMetrics(
   @SafeVarargs
   public final void waitAndAssertMetrics(
       String instrumentationName, Consumer<MetricAssert>... assertions) {
-    AwaitUtil.awaitUntilAsserted(
+    awaitUntilAsserted(
         () -> {
           Collection<MetricData> metrics = instrumentationMetrics(instrumentationName);
           assertThat(metrics).isNotEmpty();

testing-common/src/main/java/io/opentelemetry/instrumentation/testing/internal/AwaitUtil.java

@@ -14,7 +14,7 @@
  * This class is internal and is hence not for public use. Its APIs are unstable and can change at
  * any time.
  */
-public class AwaitUtil {
+public final class AwaitUtil {
   private AwaitUtil() {}
 
   public static void awaitUntilAsserted(Runnable runnable) {

testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/InstrumentationExtension.java

@@ -5,14 +5,14 @@
 
 package io.opentelemetry.instrumentation.testing.junit;
 
+import static io.opentelemetry.instrumentation.testing.internal.AwaitUtil.awaitUntilAsserted;
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
 import static org.awaitility.Awaitility.await;
 
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.context.ContextStorage;
 import io.opentelemetry.instrumentation.testing.InstrumentationTestRunner;
 import io.opentelemetry.instrumentation.testing.LibraryTestRunner;
-import io.opentelemetry.instrumentation.testing.internal.AwaitUtil;
 import io.opentelemetry.instrumentation.testing.util.ContextStorageCloser;
 import io.opentelemetry.instrumentation.testing.util.ThrowingRunnable;
 import io.opentelemetry.instrumentation.testing.util.ThrowingSupplier;
@@ -126,7 +126,7 @@ public List<List<SpanData>> waitForTraces(int numberOfTraces) {
    * This waits up to 20 seconds, then times out.
    */
   public List<LogRecordData> waitForLogRecords(int numberOfLogRecords) {
-    AwaitUtil.awaitUntilAsserted(
+    awaitUntilAsserted(
         () -> assertThat(testRunner.getExportedLogRecords().size()).isEqualTo(numberOfLogRecords),
         await().timeout(Duration.ofSeconds(20)));
     return testRunner.getExportedLogRecords();