Merge pull request #4863 from aws/zoewang/rollback6818

Roll back enabling default connection health monitoring for CRT HTTP …

Author: zoewangg

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

@@ -19,7 +19,6 @@
 import static software.amazon.awssdk.crtcore.CrtConfigurationUtils.resolveProxy;
 import static software.amazon.awssdk.http.SdkHttpConfigurationOption.PROTOCOL;
 import static software.amazon.awssdk.http.crt.internal.AwsCrtConfigurationUtils.buildSocketOptions;
-import static software.amazon.awssdk.http.crt.internal.AwsCrtConfigurationUtils.defaultConnectionHealthConfiguration;
 import static software.amazon.awssdk.http.crt.internal.AwsCrtConfigurationUtils.resolveCipherPreference;
 import static software.amazon.awssdk.utils.FunctionalUtils.invokeSafely;
 
@@ -99,7 +98,7 @@ abstract class AwsCrtHttpClientBase implements SdkAutoCloseable {
         this.maxStreamsPerEndpoint = config.get(SdkHttpConfigurationOption.MAX_CONNECTIONS);
         this.monitoringOptions =
             resolveHttpMonitoringOptions(builder.getConnectionHealthConfiguration())
-                .orElseGet(() -> defaultConnectionHealthConfiguration(config));
+                .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);

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

@@ -18,13 +18,10 @@
 
 import java.time.Duration;
 import software.amazon.awssdk.annotations.SdkInternalApi;
-import software.amazon.awssdk.crt.http.HttpMonitoringOptions;
 import software.amazon.awssdk.crt.io.SocketOptions;
 import software.amazon.awssdk.crt.io.TlsCipherPreference;
-import software.amazon.awssdk.http.SdkHttpConfigurationOption;
 import software.amazon.awssdk.http.crt.AwsCrtAsyncHttpClient;
 import software.amazon.awssdk.http.crt.TcpKeepAliveConfiguration;
-import software.amazon.awssdk.utils.AttributeMap;
 import software.amazon.awssdk.utils.Logger;
 import software.amazon.awssdk.utils.NumericUtils;
 
@@ -73,14 +70,4 @@ public static TlsCipherPreference resolveCipherPreference(Boolean postQuantumTls
         return pqTls;
     }
 
-    public static HttpMonitoringOptions defaultConnectionHealthConfiguration(AttributeMap config) {
-        HttpMonitoringOptions httpMonitoringOptions = new HttpMonitoringOptions();
-        httpMonitoringOptions.setMinThroughputBytesPerSecond(1);
-        long readTimeout = config.get(SdkHttpConfigurationOption.READ_TIMEOUT).getSeconds();
-        long writeTimeout = config.get(SdkHttpConfigurationOption.WRITE_TIMEOUT).getSeconds();
-        int maxTimeout = NumericUtils.saturatedCast(Math.max(readTimeout, writeTimeout));
-        httpMonitoringOptions.setAllowableThroughputFailureIntervalSeconds(maxTimeout);
-        return httpMonitoringOptions;
-    }
-
 }

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

@@ -104,22 +104,6 @@ private static Stream<Arguments> tcpKeepAliveConfiguration() {
         );
     }
 
-    @ParameterizedTest
-    @MethodSource("defaultConnectionHealthConfigurationCases")
-    void defaultConnectionHealthConfiguration_shouldUseMaxOfReadWriteTimeout(Duration readTimeout,
-                                                                             Duration writeTimeout,
-                                                                             int expectedInterval) {
-        AttributeMap config = AttributeMap.builder()
-                                          .put(SdkHttpConfigurationOption.READ_TIMEOUT, readTimeout)
-                                          .put(SdkHttpConfigurationOption.WRITE_TIMEOUT, writeTimeout)
-                                          .build();
-
-        HttpMonitoringOptions result = AwsCrtConfigurationUtils.defaultConnectionHealthConfiguration(config);
-
-        assertThat(result.getMinThroughputBytesPerSecond()).isEqualTo(1);
-        assertThat(result.getAllowableThroughputFailureIntervalSeconds()).isEqualTo(expectedInterval);
-    }
-
     private static Stream<Arguments> defaultConnectionHealthConfigurationCases() {
         return Stream.of(
             Arguments.of(Duration.ofSeconds(30), Duration.ofSeconds(30), 30),