Fix CloudWatchMeterRegistryTest to be Java 8 compatible

See gh-4775

Author: jonatan-ivanov

implementations/micrometer-registry-cloudwatch2/src/main/java/io/micrometer/cloudwatch2/CloudWatchMeterRegistry.java

@@ -132,8 +132,8 @@ void sendMetricData(List<MetricDatum> metricData) throws InterruptedException {
         try {
             @SuppressWarnings("deprecation")
             long readTimeoutMillis = config.readTimeout().toMillis();
-            boolean success = latch.await(readTimeoutMillis, TimeUnit.MILLISECONDS);
-            if (!success) {
+            boolean awaitSuccess = latch.await(readTimeoutMillis, TimeUnit.MILLISECONDS);
+            if (!awaitSuccess) {
                 logger.warn("metrics push to cloudwatch took longer than expected");
             }
         }

implementations/micrometer-registry-cloudwatch2/src/test/java/io/micrometer/cloudwatch2/CloudWatchMeterRegistryTest.java

@@ -28,8 +28,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
@@ -287,8 +286,9 @@ void putMetricDataShouldBeCalledOnPublish() {
     @Test
     void shouldHandleAbortedExceptionDuringPutMetricDataCallWithoutFailing() {
         CloudWatchAsyncClient client = mock(CloudWatchAsyncClient.class);
-        when(client.putMetricData(isA(PutMetricDataRequest.class)))
-            .thenReturn(CompletableFuture.failedFuture(AbortedException.create("simulated")));
+        CompletableFuture<PutMetricDataResponse> future = new CompletableFuture<>();
+        future.completeExceptionally(AbortedException.create("simulated"));
+        when(client.putMetricData(isA(PutMetricDataRequest.class))).thenReturn(future);
 
         CloudWatchMeterRegistry registry = new CloudWatchMeterRegistry(config, clock, client);
         registry.counter("test").increment();
@@ -300,8 +300,9 @@ void shouldHandleAbortedExceptionDuringPutMetricDataCallWithoutFailing() {
     @Test
     void shouldHandleExceptionsDuringPutMetricDataCallWithoutFailing() {
         CloudWatchAsyncClient client = mock(CloudWatchAsyncClient.class);
-        when(client.putMetricData(isA(PutMetricDataRequest.class)))
-            .thenReturn(CompletableFuture.failedFuture(new SocketTimeoutException("simulated")));
+        CompletableFuture<PutMetricDataResponse> future = new CompletableFuture<>();
+        future.completeExceptionally(new SocketTimeoutException("simulated"));
+        when(client.putMetricData(isA(PutMetricDataRequest.class))).thenReturn(future);
 
         CloudWatchMeterRegistry registry = new CloudWatchMeterRegistry(config, clock, client);
         registry.counter("test").increment();
@@ -311,11 +312,16 @@ void shouldHandleExceptionsDuringPutMetricDataCallWithoutFailing() {
     }
 
     @Test
-    @SuppressWarnings("deprecation")
     void shouldHandleTimeoutsDuringPutMetricDataCallWithoutFailing() {
         CloudWatchAsyncClient client = mock(CloudWatchAsyncClient.class);
-        when(client.putMetricData(isA(PutMetricDataRequest.class))).thenReturn(CompletableFuture.supplyAsync(() -> null,
-                CompletableFuture.delayedExecutor(config.readTimeout().toMillis() + 1_000, TimeUnit.MILLISECONDS)));
+        Executor nonExecutingExecutor = new Executor() {
+            @Override
+            public void execute(Runnable command) {
+                // intentionally noop
+            }
+        };
+        when(client.putMetricData(isA(PutMetricDataRequest.class)))
+            .thenReturn(CompletableFuture.supplyAsync(() -> null, nonExecutingExecutor));
 
         CloudWatchMeterRegistry registry = new CloudWatchMeterRegistry(config, clock, client);
         registry.counter("test").increment();