Merge pull request #1 from waahm7/sync_crt

Synchronous CRT Http Client SPI with tests PR Feedback

Author: JonathanHenson

http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/AwsCrtAsyncHttpClient.java

@@ -81,7 +81,6 @@ public CompletableFuture<Void> execute(AsyncExecuteRequest asyncRequest) {
         paramNotNull(asyncRequest.responseHandler(), "ResponseHandler");
 
         asyncRequest.metricCollector()
-                    .filter(metricCollector -> !(metricCollector instanceof NoOpMetricCollector))
                     .ifPresent(metricCollector -> metricCollector.reportMetric(HTTP_CLIENT_NAME, clientName()));
 
         /*

http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/AwsCrtHttpClient.java

@@ -80,7 +80,6 @@ public String clientName() {
     @Override
     public ExecutableHttpRequest prepareRequest(HttpExecuteRequest request) {
         request.metricCollector()
-               .filter(metricCollector -> !(metricCollector instanceof NoOpMetricCollector))
                .ifPresent(metricCollector -> metricCollector.reportMetric(HTTP_CLIENT_NAME, clientName()));
 
         /*

http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/internal/AwsCrtHttpClientBase.java

@@ -68,7 +68,7 @@ public abstract class AwsCrtHttpClientBase implements SdkAutoCloseable {
 
     protected AwsCrtHttpClientBase(AwsCrtClientBuilderBase builder, AttributeMap config) {
         if (config.get(PROTOCOL) == Protocol.HTTP2) {
-            throw new UnsupportedOperationException("HTTP/2 is not supported in AwsCrtAsyncHttpClient yet. Use "
+            throw new UnsupportedOperationException("HTTP/2 is not supported in AwsCrtHttpClient yet. Use "
                                                + "NettyNioAsyncHttpClient instead.");
         }
 

http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/internal/CrtRequestExecutor.java

@@ -272,18 +272,13 @@ public int onResponseBody(HttpStream stream, byte[] bodyBytesIn) {
 
             CompletableFuture<Void> writeFuture = simplePublisher.send(ByteBuffer.wrap(bodyBytesIn));
 
-            // go ahead and let back pressure know we consumed the data.
-            if (writeFuture.isDone() && !writeFuture.isCompletedExceptionally()) {
-                return bodyBytesIn.length;
-            }
-
             writeFuture.whenComplete((result, failure) -> {
                 if (failure != null) {
                     requestCompletionFuture.completeExceptionally(failure);
                     return;
                 }
 
-                // otherwise, increment the window upon buffer consumption.
+                // increment the window upon buffer consumption.
                 stream.incrementWindow(bodyBytesIn.length);
             });
 

http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/internal/request/CrtRequestInputStreamAdapter.java

@@ -29,7 +29,7 @@ final class CrtRequestInputStreamAdapter implements HttpRequestBodyStream {
     private static final int READ_BUFFER_SIZE = 16 * 1024;
 
     private final ContentStreamProvider provider;
-    private InputStream providerStream;
+    private volatile InputStream providerStream;
     private final byte[] readBuffer = new byte[READ_BUFFER_SIZE];
 
     CrtRequestInputStreamAdapter(ContentStreamProvider provider) {

test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/BenchmarkRunner.java

@@ -42,6 +42,7 @@
 import software.amazon.awssdk.benchmark.apicall.httpclient.async.NettyHttpClientH1Benchmark;
 import software.amazon.awssdk.benchmark.apicall.httpclient.async.NettyHttpClientH2Benchmark;
 import software.amazon.awssdk.benchmark.apicall.httpclient.sync.ApacheHttpClientBenchmark;
+import software.amazon.awssdk.benchmark.apicall.httpclient.sync.CrtHttpClientBenchmark;
 import software.amazon.awssdk.benchmark.apicall.httpclient.sync.UrlConnectionHttpClientBenchmark;
 import software.amazon.awssdk.benchmark.apicall.protocol.Ec2ProtocolBenchmark;
 import software.amazon.awssdk.benchmark.apicall.protocol.JsonProtocolBenchmark;
@@ -75,7 +76,8 @@ public class BenchmarkRunner {
 
     private static final List<String> SYNC_BENCHMARKS = Arrays.asList(
         ApacheHttpClientBenchmark.class.getSimpleName(),
-        UrlConnectionHttpClientBenchmark.class.getSimpleName());
+        UrlConnectionHttpClientBenchmark.class.getSimpleName(),
+        CrtHttpClientBenchmark.class.getSimpleName());
 
     private static final List<String> COLD_START_BENCHMARKS = Arrays.asList(
         V2OptimizedClientCreationBenchmark.class.getSimpleName(),