Update to 0.3.35 of the CRT with minor API changes

.changes/next-release/bugfix-AWSSDKforJavav2-9a322a2.json

@@ -0,0 +1,5 @@
+{
+    "category": "AWS Common Runtime Client", 
+    "type": "bugfix", 
+    "description": "Upgrade to the latest version (0.3.35) of the AWS Common Runtime."
+}

http-clients/aws-crt-client/pom.xml

@@ -33,7 +33,7 @@
         <dependency>
             <groupId>software.amazon.awssdk.crt</groupId>
             <artifactId>aws-crt</artifactId>
-            <version>0.3.22</version>
+            <version>0.3.35</version>
         </dependency>
 
         <!--SDK dependencies-->
@@ -186,4 +186,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>

http-clients/aws-crt-client/src/it/java/software/amazon/awssdk/http/crt/AwsCrtClientCallingPatternIntegrationTest.java

@@ -143,11 +143,8 @@ public void checkAllCombinations(@FromDataPoints("EventLoop") int eventLoopSize,
                                      @FromDataPoints("SharedClient") boolean useSharedClient) throws Exception {
 
         try {
-            if (CrtResource.getAllocatedNativeResourceCount() > 0) {
-                System.err.println("Leaked Resources: " + String.join(", ", CrtResource.getAllocatedNativeResources()));
-            }
-            Assert.assertEquals("Expected Zero allocated AwsCrtResources", 0, CrtResource.getAllocatedNativeResourceCount());
 
+            CrtResource.waitForNoResources();
             String testName = String.format("Testing with eventLoopSize %d, connectionPoolSize %d, numberOfRequests %d, " +
                             "numberOfParallelJavaClients %d, useSharedClient %b", eventLoopSize, connectionPoolSize,
                     numberOfRequests, numberOfParallelClients, useSharedClient);
@@ -197,11 +194,7 @@ public void checkAllCombinations(@FromDataPoints("EventLoop") int eventLoopSize,
             awsCrtHttpClient.close();
             Assert.assertFalse(failed.get());
 
-            if (CrtResource.getAllocatedNativeResourceCount() > 0) {
-                System.err.println("Leaked Resources: " + String.join(", ", CrtResource.getAllocatedNativeResources()));
-            }
-
-            Assert.assertEquals("Expected Zero allocated AwsCrtResources", 0, CrtResource.getAllocatedNativeResourceCount());
+            CrtResource.waitForNoResources();
 
             float numSeconds = (float) ((System.currentTimeMillis() - start) / 1000.0);
             String timeElapsed = String.format("%.2f sec", numSeconds);

http-clients/aws-crt-client/src/it/java/software/amazon/awssdk/http/crt/AwsCrtClientKmsIntegrationTest.java

@@ -35,7 +35,7 @@ public class AwsCrtClientKmsIntegrationTest {
 
     @Before
     public void setup() {
-        Assert.assertEquals("Expected Zero allocated AwsCrtResources", 0, CrtResource.getAllocatedNativeResourceCount());
+        CrtResource.waitForNoResources();
 
         // Create an Http Client for each TLS Cipher Preference supported on the current platform
         for (TlsCipherPreference pref: TlsCipherPreference.values()) {
@@ -55,7 +55,7 @@ public void setup() {
 
     @After
     public void tearDown() {
-        Assert.assertEquals("Expected Zero allocated AwsCrtResources", 0, CrtResource.getAllocatedNativeResourceCount());
+        CrtResource.waitForNoResources();
     }
 
     private boolean doesKeyExist(KmsAsyncClient kms, String keyAlias) {

http-clients/aws-crt-client/src/it/java/software/amazon/awssdk/http/crt/AwsCrtClientS3IntegrationTest.java

@@ -56,7 +56,7 @@ public class AwsCrtClientS3IntegrationTest {
 
     @Before
     public void setup() {
-        Assert.assertEquals("Expected Zero allocated AwsCrtResources", 0, CrtResource.getAllocatedNativeResourceCount());
+        CrtResource.waitForNoResources();
 
         crtClient = AwsCrtAsyncHttpClient.builder()
                 .eventLoopSize(4)
@@ -74,7 +74,7 @@ public void tearDown() {
         s3.close();
         crtClient.close();
 
-        Assert.assertEquals("Expected Zero allocated AwsCrtResources", 0, CrtResource.getAllocatedNativeResourceCount());
+        CrtResource.waitForNoResources();
     }
 
     @Test

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

@@ -29,7 +29,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import software.amazon.awssdk.annotations.SdkPublicApi;
 import software.amazon.awssdk.crt.CrtResource;
-import software.amazon.awssdk.crt.http.HttpConnectionPoolManager;
+import software.amazon.awssdk.crt.http.HttpClientConnectionManager;
 import software.amazon.awssdk.crt.http.HttpHeader;
 import software.amazon.awssdk.crt.http.HttpRequest;
 import software.amazon.awssdk.crt.io.ClientBootstrap;
@@ -65,7 +65,7 @@ public class AwsCrtAsyncHttpClient implements SdkAsyncHttpClient {
     private static final String AWS_COMMON_RUNTIME = "AwsCommonRuntime";
     private static final int DEFAULT_STREAM_WINDOW_SIZE = 16 * 1024 * 1024; // 16 MB
 
-    private final Map<URI, HttpConnectionPoolManager> connectionPools = new ConcurrentHashMap<>();
+    private final Map<URI, HttpClientConnectionManager> connectionPools = new ConcurrentHashMap<>();
     private final LinkedList<CrtResource> ownedSubResources = new LinkedList<>();
     private final AtomicBoolean isClosed = new AtomicBoolean(false);
     private final ClientBootstrap bootstrap;
@@ -95,7 +95,7 @@ public AwsCrtAsyncHttpClient(DefaultBuilder builder, AttributeMap config) {
 
         bootstrap = own(new ClientBootstrap(builder.eventLoopSize));
         socketOptions = own(new SocketOptions());
-        tlsContextOptions = own(new TlsContextOptions().withCipherPreference(builder.cipherPreference));
+        tlsContextOptions = own(TlsContextOptions.createDefaultClient().withCipherPreference(builder.cipherPreference));
         tlsContextOptions.setVerifyPeer(builder.verifyPeer);
         tlsContext = own(new TlsContext(tlsContextOptions));
 
@@ -131,22 +131,22 @@ public String clientName() {
         return AWS_COMMON_RUNTIME;
     }
 
-    private HttpConnectionPoolManager createConnectionPool(URI uri) {
+    private HttpClientConnectionManager createConnectionPool(URI uri) {
         Validate.notNull(uri, "URI must not be null");
         log.debug(() -> "Creating ConnectionPool for: URI:" + uri + ", MaxConns: " + maxConnectionsPerEndpoint);
 
-        return new HttpConnectionPoolManager(bootstrap, socketOptions, tlsContext, uri,
-                                                HttpConnectionPoolManager.DEFAULT_MAX_BUFFER_SIZE, windowSize,
+        return new HttpClientConnectionManager(bootstrap, socketOptions, tlsContext, uri,
+                                                HttpClientConnectionManager.DEFAULT_MAX_BUFFER_SIZE, windowSize,
                                                 maxConnectionsPerEndpoint);
     }
 
-    private HttpConnectionPoolManager getOrCreateConnectionPool(URI uri) {
+    private HttpClientConnectionManager getOrCreateConnectionPool(URI uri) {
         Validate.notNull(uri, "URI must not be null");
-        HttpConnectionPoolManager connPool = connectionPools.get(uri);
+        HttpClientConnectionManager connPool = connectionPools.get(uri);
 
         if (connPool == null) {
-            HttpConnectionPoolManager newConnPool = createConnectionPool(uri);
-            HttpConnectionPoolManager alreadyExistingConnPool = connectionPools.putIfAbsent(uri, newConnPool);
+            HttpClientConnectionManager newConnPool = createConnectionPool(uri);
+            HttpClientConnectionManager alreadyExistingConnPool = connectionPools.putIfAbsent(uri, newConnPool);
 
             if (alreadyExistingConnPool == null) {
                 connPool = newConnPool;
@@ -222,7 +222,7 @@ public CompletableFuture<Void> execute(AsyncExecuteRequest asyncRequest) {
         Validate.notNull(asyncRequest.responseHandler(), "ResponseHandler must not be null");
 
         URI uri = toUri(asyncRequest.request());
-        HttpConnectionPoolManager crtConnPool = getOrCreateConnectionPool(uri);
+        HttpClientConnectionManager crtConnPool = getOrCreateConnectionPool(uri);
         HttpRequest crtRequest = toCrtRequest(uri, asyncRequest);
 
         CompletableFuture<Void> requestFuture = new CompletableFuture<>();
@@ -249,7 +249,7 @@ public CompletableFuture<Void> execute(AsyncExecuteRequest asyncRequest) {
     @Override
     public void close() {
         isClosed.set(true);
-        for (HttpConnectionPoolManager connPool : connectionPools.values()) {
+        for (HttpClientConnectionManager connPool : connectionPools.values()) {
             IoUtils.closeQuietly(connPool, log.logger());
         }
 

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

@@ -22,7 +22,7 @@
 import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.crt.CRT;
 import software.amazon.awssdk.crt.http.CrtHttpStreamHandler;
-import software.amazon.awssdk.crt.http.HttpConnection;
+import software.amazon.awssdk.crt.http.HttpClientConnection;
 import software.amazon.awssdk.crt.http.HttpException;
 import software.amazon.awssdk.crt.http.HttpHeader;
 import software.amazon.awssdk.crt.http.HttpStream;
@@ -38,15 +38,15 @@
 public class AwsCrtAsyncHttpStreamAdapter implements CrtHttpStreamHandler {
     private static final Logger log = Logger.loggerFor(AwsCrtAsyncHttpStreamAdapter.class);
 
-    private final HttpConnection connection;
+    private final HttpClientConnection connection;
     private final CompletableFuture<Void> responseComplete;
     private final AsyncExecuteRequest sdkRequest;
     private final SdkHttpResponse.Builder respBuilder = SdkHttpResponse.builder();
     private final int windowSize;
     private final AwsCrtRequestBodySubscriber requestBodySubscriber;
     private AwsCrtResponseBodyPublisher respBodyPublisher = null;
 
-    public AwsCrtAsyncHttpStreamAdapter(HttpConnection connection, CompletableFuture<Void> responseComplete,
+    public AwsCrtAsyncHttpStreamAdapter(HttpClientConnection connection, CompletableFuture<Void> responseComplete,
                                         AsyncExecuteRequest sdkRequest, int windowSize) {
         Validate.notNull(connection, "HttpConnection is null");
         Validate.notNull(responseComplete, "reqComplete Future is null");
@@ -69,7 +69,7 @@ private void initRespBodyPublisherIfNeeded(HttpStream stream) {
     }
 
     @Override
-    public void onResponseHeaders(HttpStream stream, int responseStatusCode, HttpHeader[] nextHeaders) {
+    public void onResponseHeaders(HttpStream stream, int responseStatusCode, int blockType, HttpHeader[] nextHeaders) {
         initRespBodyPublisherIfNeeded(stream);
 
         respBuilder.statusCode(responseStatusCode);

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

@@ -28,7 +28,7 @@
 import org.reactivestreams.Publisher;
 import org.reactivestreams.Subscriber;
 import software.amazon.awssdk.annotations.SdkInternalApi;
-import software.amazon.awssdk.crt.http.HttpConnection;
+import software.amazon.awssdk.crt.http.HttpClientConnection;
 import software.amazon.awssdk.crt.http.HttpStream;
 import software.amazon.awssdk.utils.Logger;
 import software.amazon.awssdk.utils.Validate;
@@ -41,7 +41,7 @@ public class AwsCrtResponseBodyPublisher implements Publisher<ByteBuffer> {
     private static final Logger log = Logger.loggerFor(AwsCrtResponseBodyPublisher.class);
     private static final LongUnaryOperator DECREMENT_IF_GREATER_THAN_ZERO = x -> ((x > 0) ? (x - 1) : (x));
 
-    private final HttpConnection connection;
+    private final HttpClientConnection connection;
     private final HttpStream stream;
     private final CompletableFuture<Void> responseComplete;
     private final AtomicLong outstandingRequests = new AtomicLong(0);
@@ -62,7 +62,7 @@ public class AwsCrtResponseBodyPublisher implements Publisher<ByteBuffer> {
      * @param windowSize The max allowed bytes to be queued. The sum of the sizes of all queued ByteBuffers should
      *                   never exceed this value.
      */
-    public AwsCrtResponseBodyPublisher(HttpConnection connection, HttpStream stream,
+    public AwsCrtResponseBodyPublisher(HttpClientConnection connection, HttpStream stream,
                                        CompletableFuture<Void> responseComplete, int windowSize) {
         Validate.notNull(connection, "HttpConnection must not be null");
         Validate.notNull(stream, "Stream must not be null");

http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/AwsCrtHttpClientSpiVerificationTest.java

@@ -68,7 +68,7 @@ public class AwsCrtHttpClientSpiVerificationTest {
 
     @Before
     public void setup() throws Exception {
-        Assert.assertEquals("Expected Zero allocated AwsCrtResources", 0, CrtResource.getAllocatedNativeResourceCount());
+        CrtResource.waitForNoResources();
 
         client = AwsCrtAsyncHttpClient.builder()
                 .build();
@@ -77,7 +77,7 @@ public void setup() throws Exception {
     @After
     public void tearDown() {
         client.close();
-        Assert.assertEquals("Expected Zero allocated AwsCrtResources", 0, CrtResource.getAllocatedNativeResourceCount());
+        CrtResource.waitForNoResources();
     }
 
     private byte[] generateRandomBody(int size) {

http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/AwsCrtResponseBodyPublisherReactiveStreamCompatTest.java

@@ -23,7 +23,7 @@
 import org.reactivestreams.Publisher;
 import org.reactivestreams.tck.PublisherVerification;
 import org.reactivestreams.tck.TestEnvironment;
-import software.amazon.awssdk.crt.http.HttpConnection;
+import software.amazon.awssdk.crt.http.HttpClientConnection;
 import software.amazon.awssdk.crt.http.HttpStream;
 import software.amazon.awssdk.http.crt.internal.AwsCrtResponseBodyPublisher;
 import software.amazon.awssdk.utils.Logger;
@@ -37,7 +37,7 @@ public AwsCrtResponseBodyPublisherReactiveStreamCompatTest() {
 
     @Override
     public Publisher<ByteBuffer> createPublisher(long elements) {
-        HttpConnection connection = mock(HttpConnection.class);
+        HttpClientConnection connection = mock(HttpClientConnection.class);
         HttpStream stream = mock(HttpStream.class);
         AwsCrtResponseBodyPublisher bodyPublisher = new AwsCrtResponseBodyPublisher(connection, stream, new CompletableFuture<>(), Integer.MAX_VALUE);
 

test/sdk-benchmarks/pom.xml

@@ -193,7 +193,7 @@
         <dependency>
             <groupId>software.amazon.awssdk.crt</groupId>
             <artifactId>aws-crt</artifactId>
-            <version>0.3.22</version>
+            <version>0.3.35</version>
             <scope>compile</scope>
         </dependency>
         <dependency>