Roll back Enable default connection health monitoring for CRT HTTP cli…

.changes/next-release/bugfix-AWSCRTHTTPClient-74b3f8f.json

@@ -0,0 +1,6 @@
+{
+    "type": "bugfix",
+    "category": "AWS CRT HTTP Client",
+    "contributor": "",
+    "description": "Roll back enabling default connection health monitoring for CRT HTTP clients"
+}

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,13 @@
 
 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;
 
@@ -72,15 +72,4 @@
 
         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/internal/AwsCrtConfigurationUtilsTest.java

@@ -26,12 +26,12 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 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.TcpKeepAliveConfiguration;
 import software.amazon.awssdk.utils.AttributeMap;
 
 class AwsCrtConfigurationUtilsTest {
     @ParameterizedTest
@@ -103,32 +103,4 @@
             )
         );
     }
-
-    @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),
-            Arguments.of(Duration.ofSeconds(60), Duration.ofSeconds(10), 60),
-            Arguments.of(Duration.ofSeconds(10), Duration.ofSeconds(45), 45),
-            // overflow: value exceeding Integer.MAX_VALUE should saturate
-            Arguments.of(Duration.ofSeconds((long) Integer.MAX_VALUE + 1), Duration.ofSeconds(1), Integer.MAX_VALUE),
-            Arguments.of(Duration.ofSeconds(1), Duration.ofSeconds((long) Integer.MAX_VALUE + 1), Integer.MAX_VALUE)
-        );
-    }
-
 }