Add the ability to configure connection timeout, keep-alive settings, and advanced SocketOptions on the AwsCrtAsyncHttpClient. This is necessary for any clients with long-running connections that exceed default socket timeouts of services along the call path, and need to enable keep-alive settings which the CRT client supports, but the Java client wasn't exposing to callers

nikp · nikp · commit 5afb2eecfac4 · 2022-10-05T14:08:23.000-07:00
diff --git a/.changes/next-release/feature-AWSSDKforJavav2-c2b1dfc.json b/.changes/next-release/feature-AWSSDKforJavav2-c2b1dfc.json
@@ -0,0 +1,6 @@
+{
+    "type": "feature",
+    "category": "AWS SDK for Java v2",
+    "contributor": "nikp",
+    "description": "Add the ability to configure connection timeout, and enabling keep-alive with interval/timeout settings on the AwsCrtAsyncHttpClient to support long-running connections"
+}
diff --git a/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/AwsCrtAsyncHttpClient.java b/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/AwsCrtAsyncHttpClient.java
@@ -46,6 +46,7 @@
 import software.amazon.awssdk.utils.AttributeMap;
 import software.amazon.awssdk.utils.IoUtils;
 import software.amazon.awssdk.utils.Logger;
+import software.amazon.awssdk.utils.NumericUtils;
 import software.amazon.awssdk.utils.Validate;
 
 /**
@@ -76,6 +77,14 @@ public final class AwsCrtAsyncHttpClient implements SdkAsyncHttpClient {
     private final int maxConnectionsPerEndpoint;
     private boolean isClosed = false;
 
+    private static final Duration CRT_SDK_DEFAULT_CONNECTION_TIMEOUT = Duration.ofSeconds(3);
+    // Override default connection timeout for Crt client to be in line with the CRT default:
+    // https://github.com/awslabs/aws-crt-java/blob/main/src/main/java/software/amazon/awssdk/crt/io/SocketOptions.java#L79
+    private static final AttributeMap CRT_HTTP_DEFAULTS =
+        AttributeMap.builder()
+                    .put(SdkHttpConfigurationOption.CONNECTION_TIMEOUT, CRT_SDK_DEFAULT_CONNECTION_TIMEOUT)
+                    .build();
+
     private AwsCrtAsyncHttpClient(DefaultBuilder builder, AttributeMap config) {
         int maxConns = config.get(SdkHttpConfigurationOption.MAX_CONNECTIONS);
 
@@ -84,7 +93,7 @@ private AwsCrtAsyncHttpClient(DefaultBuilder builder, AttributeMap config) {
         Validate.isPositive(builder.readBufferSize, "readBufferSize");
 
         try (ClientBootstrap clientBootstrap = new ClientBootstrap(null, null);
-             SocketOptions clientSocketOptions = new SocketOptions();
+             SocketOptions clientSocketOptions = buildSocketOptions(builder, config);
              TlsContextOptions clientTlsContextOptions = TlsContextOptions.createDefaultClient() // NOSONAR
                      .withCipherPreference(builder.cipherPreference)
                      .withVerifyPeer(!config.get(SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES));
@@ -138,6 +147,24 @@ private HttpProxyOptions buildProxyOptions(ProxyConfiguration proxyConfiguration
         return clientProxyOptions;
     }
 
+    private SocketOptions buildSocketOptions(DefaultBuilder builder, AttributeMap config) {
+        SocketOptions clientSocketOptions = new SocketOptions();
+
+        Duration connectionTimeout = config.get(SdkHttpConfigurationOption.CONNECTION_TIMEOUT);
+        if (connectionTimeout != null) {
+            clientSocketOptions.connectTimeoutMs = NumericUtils.saturatedCast(connectionTimeout.toMillis());
+        }
+
+        TcpKeepAliveConfiguration tcpKeepAliveConfiguration = builder.tcpKeepAliveConfiguration;
+        if (tcpKeepAliveConfiguration != null) {
+            clientSocketOptions.keepAliveIntervalSecs = NumericUtils.saturatedCast(tcpKeepAliveConfiguration.keepAliveInterval().getSeconds());
+            clientSocketOptions.keepAliveTimeoutSecs = NumericUtils.saturatedCast(tcpKeepAliveConfiguration.keepAliveTimeout().getSeconds());
+
+        }
+
+        return clientSocketOptions;
+    }
+
     /**
      * Marks a Native CrtResource as owned by the current Java Object.
      *
@@ -312,10 +339,10 @@ public interface Builder extends SdkAsyncHttpClient.Builder<AwsCrtAsyncHttpClien
         Builder proxyConfiguration(Consumer<ProxyConfiguration.Builder> proxyConfigurationBuilderConsumer);
 
         /**
-         * Configure the health checks for for all connections established by this client.
+         * Configure the health checks for all connections established by this client.
          *
          * <p>
-         * eg: you can set a throughput threshold for the a connection to be considered healthy.
+         * eg: you can set a throughput threshold for a connection to be considered healthy.
          * If the connection falls below this threshold for a configurable amount of time,
          * then the connection is considered unhealthy and will be shut down.
          *
@@ -325,10 +352,10 @@ public interface Builder extends SdkAsyncHttpClient.Builder<AwsCrtAsyncHttpClien
         Builder connectionHealthChecksConfiguration(ConnectionHealthChecksConfiguration healthChecksConfiguration);
 
         /**
-         * A convenience method to configure the health checks for for all connections established by this client.
+         * A convenience method to configure the health checks for all connections established by this client.
          *
          * <p>
-         * eg: you can set a throughput threshold for the a connection to be considered healthy.
+         * eg: you can set a throughput threshold for a connection to be considered healthy.
          * If the connection falls below this threshold for a configurable amount of time,
          * then the connection is considered unhealthy and will be shut down.
          *
@@ -340,9 +367,46 @@ Builder connectionHealthChecksConfiguration(Consumer<ConnectionHealthChecksConfi
                                                         healthChecksConfigurationBuilder);
 
         /**
-         * Configure the maximum amount of time that a connection should be allowed to remain open while idle.
+         * The amount of time to wait when initially establishing a connection before giving up and timing out. The maximum
+         * possible value, in ms, is the value of {@link Integer#MAX_VALUE}, any longer duration will be reduced to the maximum
+         * possible value. If not specified, the connection timeout duration will be set to value defined in
+         * {@link AwsCrtAsyncHttpClient#CRT_SDK_DEFAULT_CONNECTION_TIMEOUT}.
          */
         Builder connectionMaxIdleTime(Duration connectionMaxIdleTime);
+
+        /**
+         * Configure connection socket timeout
+         */
+        Builder connectionTimeout(Duration connectionTimeout);
+
+        /**
+         * Configure whether to enable TCP Keep-alive and relevant configuration for all connections established by this client.
+         *
+         * <p>
+         * By default, keepAlive is disabled and this is not required.
+         * tcpKeepAlive is enabled by providing this configuration and specifying
+         * periodic keepalive packet intervals and timeouts
+         * This may be required for certain connections for longer durations than default socket timeouts
+         *
+         * @param tcpKeepAliveConfiguration The TCP keep-alive configuration to use
+         * @return The builder of the method chaining.
+         */
+        Builder tcpKeepAliveConfiguration(TcpKeepAliveConfiguration tcpKeepAliveConfiguration);
+
+        /**
+         * Configure whether to enable TCP Keep-alive and relevant configuration for all connections established by this client.
+         *
+         * <p>
+         * By default, keepAlive is disabled and this is not required.
+         * tcpKeepAlive is enabled by providing this configuration and specifying
+         * periodic keepalive packet intervals and timeouts
+         * This may be required for certain connections for longer durations than default socket timeouts
+         *
+         * @param tcpKeepAliveConfigurationBuilder The TCP keep-alive configuration builder to use
+         * @return The builder of the method chaining.
+         */
+        Builder tcpKeepAliveConfiguration(Consumer<TcpKeepAliveConfiguration.Builder>
+                                              tcpKeepAliveConfigurationBuilder);
     }
 
     /**
@@ -355,20 +419,23 @@ private static final class DefaultBuilder implements Builder {
         private int readBufferSize = DEFAULT_STREAM_WINDOW_SIZE;
         private ProxyConfiguration proxyConfiguration;
         private ConnectionHealthChecksConfiguration connectionHealthChecksConfiguration;
+        private TcpKeepAliveConfiguration tcpKeepAliveConfiguration;
 
         private DefaultBuilder() {
         }
 
         @Override
         public SdkAsyncHttpClient build() {
             return new AwsCrtAsyncHttpClient(this, standardOptions.build()
+                                                                  .merge(CRT_HTTP_DEFAULTS)
                                                                   .merge(SdkHttpConfigurationOption.GLOBAL_HTTP_DEFAULTS));
         }
 
         @Override
         public SdkAsyncHttpClient buildWithDefaults(AttributeMap serviceDefaults) {
             return new AwsCrtAsyncHttpClient(this, standardOptions.build()
                                                            .merge(serviceDefaults)
+                                                           .merge(CRT_HTTP_DEFAULTS)
                                                            .merge(SdkHttpConfigurationOption.GLOBAL_HTTP_DEFAULTS));
         }
 
@@ -417,10 +484,32 @@ public Builder connectionHealthChecksConfiguration(Consumer<ConnectionHealthChec
 
         @Override
         public Builder connectionMaxIdleTime(Duration connectionMaxIdleTime) {
+            Validate.isPositive(connectionMaxIdleTime, "connectionMaxIdleTime");
             standardOptions.put(SdkHttpConfigurationOption.CONNECTION_MAX_IDLE_TIMEOUT, connectionMaxIdleTime);
             return this;
         }
 
+        @Override
+        public Builder connectionTimeout(Duration connectionTimeout) {
+            Validate.isPositive(connectionTimeout, "connectionTimeout");
+            standardOptions.put(SdkHttpConfigurationOption.CONNECTION_TIMEOUT, connectionTimeout);
+            return this;
+        }
+
+        @Override
+        public Builder tcpKeepAliveConfiguration(TcpKeepAliveConfiguration tcpKeepAliveConfiguration) {
+            this.tcpKeepAliveConfiguration = tcpKeepAliveConfiguration;
+            return this;
+        }
+
+        @Override
+        public Builder tcpKeepAliveConfiguration(Consumer<TcpKeepAliveConfiguration.Builder>
+                                                             tcpKeepAliveConfigurationBuilder) {
+            TcpKeepAliveConfiguration.Builder builder = TcpKeepAliveConfiguration.builder();
+            tcpKeepAliveConfigurationBuilder.accept(builder);
+            return tcpKeepAliveConfiguration(builder.build());
+        }
+
         @Override
         public Builder proxyConfiguration(Consumer<ProxyConfiguration.Builder> proxyConfigurationBuilderConsumer) {
             ProxyConfiguration.Builder builder = ProxyConfiguration.builder();
diff --git a/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/ConnectionHealthChecksConfiguration.java b/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/ConnectionHealthChecksConfiguration.java
@@ -21,8 +21,8 @@
 import software.amazon.awssdk.utils.Validate;
 
 /**
- * Configuration that defines health checks for for all connections established by
- * the{@link ConnectionHealthChecksConfiguration}.
+ * Configuration that defines health checks for all connections established by
+ * the {@link ConnectionHealthChecksConfiguration}.
  *
  * <b>NOTE:</b> This is a Preview API and is subject to change so it should not be used in production.
  */
diff --git a/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/TcpKeepAliveConfiguration.java b/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/TcpKeepAliveConfiguration.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package software.amazon.awssdk.http.crt;
+
+import java.time.Duration;
+import software.amazon.awssdk.annotations.SdkPreviewApi;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.utils.Validate;
+
+/**
+ * Configuration that defines keep-alive options for all connections established by
+ * the {@link TcpKeepAliveConfiguration}.
+ *
+ * <b>NOTE:</b> This is a Preview API and is subject to change so it should not be used in production.
+ */
+@SdkPublicApi
+@SdkPreviewApi
+public final class TcpKeepAliveConfiguration {
+
+    private final Duration keepAliveInterval;
+    private final Duration keepAliveTimeout;
+
+    private TcpKeepAliveConfiguration(DefaultTcpKeepAliveConfigurationBuilder builder) {
+        this.keepAliveInterval = Validate.isPositive(builder.keepAliveInterval,
+                                                     "keepAliveInterval");
+        this.keepAliveTimeout = Validate.isPositive(builder.keepAliveTimeout,
+                                                    "keepAliveTimeout");
+    }
+
+    /**
+     * @return number of seconds between TCP keepalive packets being sent to the peer
+     */
+    public Duration keepAliveInterval() {
+        return keepAliveInterval;
+    }
+
+    /**
+     * @return number of seconds to wait for a keepalive response before considering the connection timed out
+     */
+    public Duration keepAliveTimeout() {
+        return keepAliveTimeout;
+    }
+
+    public static Builder builder() {
+        return new DefaultTcpKeepAliveConfigurationBuilder();
+    }
+
+    /**
+     * A builder for {@link TcpKeepAliveConfiguration}.
+     *
+     * <p>All implementations of this interface are mutable and not thread safe.</p>
+     */
+    public interface Builder {
+        /**
+         * Sets the Duration between TCP keepalive packets being sent to the peer
+         * @param keepAliveInterval Duration between TCP keepalive packets being sent to the peer
+         * @return Builder
+         */
+        Builder keepAliveInterval(Duration keepAliveInterval);
+
+        /**
+         * Sets the Duration to wait for a keepalive response before considering the connection timed out
+         * @param keepAliveTimeout Duration to wait for a keepalive response before considering the connection timed out
+         * @return Builder
+         */
+        Builder keepAliveTimeout(Duration keepAliveTimeout);
+
+        TcpKeepAliveConfiguration build();
+    }
+
+    /**
+     * An SDK-internal implementation of {@link Builder}.
+     */
+    private static final class DefaultTcpKeepAliveConfigurationBuilder implements Builder {
+        private Duration keepAliveInterval;
+        private Duration keepAliveTimeout;
+
+        private DefaultTcpKeepAliveConfigurationBuilder() {
+        }
+
+        /**
+         * Sets the Duration between TCP keepalive packets being sent to the peer
+         * @param keepAliveInterval Duration between TCP keepalive packets being sent to the peer
+         * @return Builder
+         */
+        @Override
+        public Builder keepAliveInterval(Duration keepAliveInterval) {
+            this.keepAliveInterval = keepAliveInterval;
+            return this;
+        }
+
+        /**
+         * Sets the Duration to wait for a keepalive response before considering the connection timed out
+         * @param keepAliveTimeout Duration to wait for a keepalive response before considering the connection timed out
+         * @return Builder
+         */
+        @Override
+        public Builder keepAliveTimeout(Duration keepAliveTimeout) {
+            this.keepAliveTimeout = keepAliveTimeout;
+            return this;
+        }
+
+        @Override
+        public TcpKeepAliveConfiguration build() {
+            return new TcpKeepAliveConfiguration(this);
+        }
+    }
+}
diff --git a/http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/TcpKeepAliveConfigurationTest.java b/http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/TcpKeepAliveConfigurationTest.java
