Fix

Author: trask

agent/instrumentation/micrometer-1.0/src/test/java/MicrometerTest.java

@@ -3,8 +3,7 @@
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.awaitility.Awaitility.await;
-import static org.junit.jupiter.api.parallel.ExecutionMode.SAME_THREAD;
+import static org.awaitility.Awaitility.waitAtMost;
 
 import com.microsoft.applicationinsights.agent.bootstrap.MicrometerUtil;
 import io.micrometer.core.instrument.Clock;
@@ -26,9 +25,7 @@
 import java.util.stream.Collectors;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.parallel.Execution;
 
-@Execution(SAME_THREAD)
 class MicrometerTest {
 
   private static final AgentTestingMicrometerDelegate delegate = new AgentTestingMicrometerDelegate();
@@ -64,7 +61,7 @@ void shouldCaptureTimeGauge() {
     TimeGauge.builder("test-time-gauge", "", MILLISECONDS, obj -> 11.0).register(registry);
 
     // then
-    await().until(() -> getLastMeasurement("test-time-gauge") != null);
+    waitAtMost(Duration.ofSeconds(20)).until(() -> getLastMeasurement("test-time-gauge") != null);
 
     AgentTestingMicrometerDelegate.Measurement measurement = getLastMeasurement("test-time-gauge");
     assertThat(measurement.value).isEqualTo(11);
@@ -83,7 +80,7 @@ void shouldCaptureGauge() {
     Gauge.builder("test-gauge", () -> 22.0).register(registry);
 
     // then
-    await().until(() -> getLastMeasurement("test-gauge") != null);
+    waitAtMost(Duration.ofSeconds(20)).until(() -> getLastMeasurement("test-gauge") != null);
 
     AgentTestingMicrometerDelegate.Measurement measurement = getLastMeasurement("test-gauge");
     assertThat(measurement.value).isEqualTo(22);
@@ -104,7 +101,7 @@ void shouldCaptureCounter() {
     counter.increment(3.3);
 
     // then
-    await().until(() -> getLastMeasurement("test-counter") != null);
+    waitAtMost(Duration.ofSeconds(20)).until(() -> getLastMeasurement("test-counter") != null);
 
     AgentTestingMicrometerDelegate.Measurement measurement = getLastMeasurement("test-counter");
     assertThat(measurement.value).isEqualTo(3.3);
@@ -125,7 +122,7 @@ void shouldCaptureTimer() {
     timer.record(Duration.ofMillis(55));
 
     // then
-    await().until(() -> getLastMeasurement("test-timer") != null);
+    waitAtMost(Duration.ofSeconds(20)).until(() -> getLastMeasurement("test-timer") != null);
 
     AgentTestingMicrometerDelegate.Measurement measurement = getLastMeasurement("test-timer");
     assertThat(measurement.value).isEqualTo(99);
@@ -148,7 +145,7 @@ void shouldCaptureDistributionSummary() {
     distributionSummary.record(5.5);
 
     // then
-    await().until(() -> getLastMeasurement("test-summary") != null);
+    waitAtMost(Duration.ofSeconds(20)).until(() -> getLastMeasurement("test-summary") != null);
 
     AgentTestingMicrometerDelegate.Measurement measurement = getLastMeasurement("test-summary");
     assertThat(measurement.value).isEqualTo(9.9);
@@ -191,7 +188,7 @@ void shouldCaptureLongTaskTimer() {
         });
 
     // then
-    await().untilAsserted(() -> {
+    waitAtMost(Duration.ofSeconds(20)).untilAsserted(() -> {
       AgentTestingMicrometerDelegate.Measurement activeMeasurement =
           getLastMeasurement("test-long-task-timer_active");
       assertThat(activeMeasurement.value).isEqualTo(2);
@@ -223,7 +220,7 @@ void shouldCaptureFunctionCounter() {
     FunctionCounter.builder("test-function-counter", "", obj -> 6.6).register(registry);
 
     // then
-    await().until(() -> getLastMeasurement("test-function-counter") != null);
+    waitAtMost(Duration.ofSeconds(20)).until(() -> getLastMeasurement("test-function-counter") != null);
 
     AgentTestingMicrometerDelegate.Measurement measurements =
         getLastMeasurement("test-function-counter");
@@ -244,7 +241,7 @@ void shouldCaptureFunctionTimer() {
         .register(registry);
 
     // then
-    await().until(() -> getLastMeasurement("test-function-timer") != null);
+    waitAtMost(Duration.ofSeconds(20)).until(() -> getLastMeasurement("test-function-timer") != null);
 
     AgentTestingMicrometerDelegate.Measurement measurement =
         getLastMeasurement("test-function-timer");