expose crt connection timeout (#5835)

* expose connectionAqusitionTimeout in crtHttpClient

* dependency version changed

* changelog added

* rollback to test

* change added back

* changed the default connectionacquiretimeout value

* changed value back

* test case config changed

* invalid input testcases added

* changelog modified

Author: Fred1155

.changes/next-release/feature-AwsCrtHttpClientforJavav2-c8d7d24.json

@@ -0,0 +1,6 @@
+{
+    "type": "feature",
+    "category": "AWS CRT HTTP Client",
+    "contributor": "",
+    "description": "Allow users to configure connectionAcquisitionTimeout for AwsCrtHttpClient and AwsCrtAsyncHttpClient"
+}

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

@@ -182,6 +182,13 @@ AwsCrtAsyncHttpClient.Builder connectionHealthConfiguration(Consumer<ConnectionH
          */
         AwsCrtAsyncHttpClient.Builder connectionTimeout(Duration connectionTimeout);
 
+        /**
+         * The amount of time to wait when acquiring a connection from the pool before giving up and timing out.
+         * @param connectionAcquisitionTimeout the timeout duration
+         * @return this builder for method chaining.
+         */
+        AwsCrtAsyncHttpClient.Builder connectionAcquisitionTimeout(Duration connectionAcquisitionTimeout);
+
         /**
          * Configure whether to enable {@code tcpKeepAlive} and relevant configuration for all connections established by this
          * client.

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

@@ -225,6 +225,13 @@ AwsCrtHttpClient.Builder connectionHealthConfiguration(Consumer<ConnectionHealth
          */
         AwsCrtHttpClient.Builder connectionTimeout(Duration connectionTimeout);
 
+        /**
+         * The amount of time to wait when acquiring a connection from the pool before giving up and timing out.
+         * @param connectionAcquisitionTimeout the timeout duration
+         * @return this builder for method chaining.
+         */
+        AwsCrtHttpClient.Builder connectionAcquisitionTimeout(Duration connectionAcquisitionTimeout);
+
         /**
          * Configure whether to enable {@code tcpKeepAlive} and relevant configuration for all connections established by this
          * client.

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

@@ -65,6 +65,7 @@ abstract class AwsCrtHttpClientBase implements SdkAutoCloseable {
     private final HttpMonitoringOptions monitoringOptions;
     private final long maxConnectionIdleInMilliseconds;
     private final int maxConnectionsPerEndpoint;
+    private final long connectionAcquisitionTimeout;
     private boolean isClosed = false;
 
     AwsCrtHttpClientBase(AwsCrtClientBuilderBase builder, AttributeMap config) {
@@ -90,6 +91,7 @@ abstract class AwsCrtHttpClientBase implements SdkAutoCloseable {
             this.maxConnectionsPerEndpoint = config.get(SdkHttpConfigurationOption.MAX_CONNECTIONS);
             this.monitoringOptions = resolveHttpMonitoringOptions(builder.getConnectionHealthConfiguration()).orElse(null);
             this.maxConnectionIdleInMilliseconds = config.get(SdkHttpConfigurationOption.CONNECTION_MAX_IDLE_TIMEOUT).toMillis();
+            this.connectionAcquisitionTimeout = config.get(SdkHttpConfigurationOption.CONNECTION_ACQUIRE_TIMEOUT).toMillis();
             this.proxyOptions = resolveProxy(builder.getProxyConfiguration(), tlsContext).orElse(null);
         }
     }
@@ -126,7 +128,8 @@ private HttpClientConnectionManager createConnectionPool(URI uri) {
                 .withManualWindowManagement(true)
                 .withProxyOptions(proxyOptions)
                 .withMonitoringOptions(monitoringOptions)
-                .withMaxConnectionIdleInMilliseconds(maxConnectionIdleInMilliseconds);
+                .withMaxConnectionIdleInMilliseconds(maxConnectionIdleInMilliseconds)
+                .withConnectionAcquisitionTimeoutInMilliseconds(connectionAcquisitionTimeout);
 
         return HttpClientConnectionManager.create(options);
     }

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

@@ -100,6 +100,12 @@ public BuilderT connectionTimeout(Duration connectionTimeout) {
         return thisBuilder();
     }
 
+    public BuilderT connectionAcquisitionTimeout(Duration connectionAcquisitionTimeout) {
+        Validate.isPositive(connectionAcquisitionTimeout, "connectionAcquisitionTimeout");
+        standardOptions.put(SdkHttpConfigurationOption.CONNECTION_ACQUIRE_TIMEOUT, connectionAcquisitionTimeout);
+        return thisBuilder();
+    }
+
     public BuilderT tcpKeepAliveConfiguration(TcpKeepAliveConfiguration tcpKeepAliveConfiguration) {
         this.tcpKeepAliveConfiguration = tcpKeepAliveConfiguration;
         return thisBuilder();

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

@@ -15,11 +15,15 @@
 
 package software.amazon.awssdk.http.crt;
 
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static software.amazon.awssdk.http.SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES;
 
 
+import java.time.Duration;
+import org.junit.Test;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
+
 import software.amazon.awssdk.crt.CrtResource;
 import software.amazon.awssdk.crt.Log;
 import software.amazon.awssdk.http.SdkHttpClient;
@@ -42,13 +46,27 @@ public static void afterAll() {
         CrtResource.waitForNoResources();
     }
 
+    /**
+     * default value of connectionAcquisitionTimeout of 10 will fail validatesHttpsCertificateIssuer() test
+     * */
     @Override
     protected SdkHttpClient createSdkHttpClient(SdkHttpClientOptions options) {
         boolean trustAllCerts = options.trustAll();
         return AwsCrtHttpClient.builder()
+                               .connectionAcquisitionTimeout(Duration.ofSeconds(40))
                                .buildWithDefaults(AttributeMap.builder().put(TRUST_ALL_CERTIFICATES, trustAllCerts).build());
     }
 
+    @Test
+    public void negativeConnectionAcquisitionTimeout_shouldFail() {
+        assertThatThrownBy(() -> {
+            SdkHttpClient client = AwsCrtHttpClient.builder()
+                    .connectionAcquisitionTimeout(Duration.ofSeconds(-1))
+                    .build();
+            client.close();
+        }).hasMessage("connectionAcquisitionTimeout must be positive");
+    }
+
     // Empty test; behavior not supported when using custom factory
     @Override
     public void testCustomTlsTrustManagerAndTrustAllFails() {

pom.xml

@@ -124,7 +124,7 @@
         <rxjava.version>2.2.21</rxjava.version>
         <commons-codec.verion>1.17.1</commons-codec.verion>
         <jmh.version>1.37</jmh.version>
-        <awscrt.version>0.33.6</awscrt.version>
+        <awscrt.version>0.33.9</awscrt.version>
 
         <!--Test dependencies -->
         <junit5.version>5.10.0</junit5.version>