Revert the change to offload metrics reporting and remove false comment

Author: zoewangg

core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/MakeAsyncHttpRequestStage.java

@@ -174,11 +174,10 @@ private CompletableFuture<Void> doExecuteHttpRequest(RequestExecutionContext con
         long callStart = System.nanoTime();
         CompletableFuture<Void> httpClientFuture = sdkAsyncHttpClient.execute(executeRequest);
 
-        // Offload the metrics reporting from this stage onto the future completion executor
-        CompletableFuture<Void> result = httpClientFuture.whenCompleteAsync((r, t) -> {
+        CompletableFuture<Void> result = httpClientFuture.whenComplete((r, t) -> {
             long duration = System.nanoTime() - callStart;
             metricCollector.reportMetric(CoreMetric.SERVICE_CALL_DURATION, Duration.ofNanos(duration));
-        }, futureCompletionExecutor);
+        });
 
         // Make sure failures on the result future are forwarded to the http client future.
         CompletableFutureUtils.forwardExceptionTo(result, httpClientFuture);

test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/AsyncResponseThreadingTest.java

@@ -23,7 +23,6 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
 import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static software.amazon.awssdk.core.client.config.SdkAdvancedAsyncClientOption.FUTURE_COMPLETION_EXECUTOR;
 
@@ -69,8 +68,7 @@ public void completionWithNioThreadWorksCorrectly() {
                 client.streamingOutputOperation(StreamingOutputOperationRequest.builder().build(),
                                                 AsyncResponseTransformer.toBytes()).join();
 
-        // #1 reporting metrics, #2 completing response
-        verify(mockExecutor, times(2)).execute(any());
+        verify(mockExecutor).execute(any());
 
         byte[] arrayCopy = response.asByteArray();
         assertThat(arrayCopy).containsExactly('t', 'e', 's', 't');
@@ -96,8 +94,7 @@ public void connectionError_completionWithNioThreadWorksCorrectly() {
                                             AsyncResponseTransformer.toBytes()).join())
             .hasCauseInstanceOf(SdkClientException.class);
 
-        // #1 reporting metrics, #2 completing response
-        verify(mockExecutor, times(2)).execute(any());
+        verify(mockExecutor).execute(any());
     }
 
     @Test
@@ -118,8 +115,7 @@ public void serverError_completionWithNioThreadWorksCorrectly() {
         assertThatThrownBy(() ->
             client.streamingOutputOperation(StreamingOutputOperationRequest.builder().build(),
                                             AsyncResponseTransformer.toBytes()).join()).hasCauseInstanceOf(ProtocolRestJsonException.class);
-        // #1 reporting metrics, #2 completing response
-        verify(mockExecutor, times(2)).execute(any());
+        verify(mockExecutor).execute(any());
     }
 
     private static class SpyableExecutor implements Executor {