Merge branch 'main' into graalvm-support

Author: maschnetwork

crt/aws-c-auth

@@ -88,6 +88,11 @@ int getValue() {
      */
     public int keepAliveTimeoutSecs = 0;
 
+    /**
+     * If true, enables periodic transmits of keepalive messages for detecting a disconnected peer.
+     */
+    public boolean keepAlive = false;
+
     /**
      * Creates a new set of socket options
      */
@@ -103,7 +108,8 @@ public long getNativeHandle() {
                 type.getValue(),
                 connectTimeoutMs,
                 keepAliveIntervalSecs,
-                keepAliveTimeoutSecs
+                keepAliveTimeoutSecs,
+                keepAlive
             ));
         }
         return super.getNativeHandle();
@@ -129,7 +135,7 @@ protected void releaseNativeHandle() {
     /*******************************************************************************
      * native methods
      ******************************************************************************/
-    private static native long socketOptionsNew(int domain, int type, int connectTimeoutMs, int keepAliveIntervalSecs, int keepAliveTimeoutSecs);
+    private static native long socketOptionsNew(int domain, int type, int connectTimeoutMs, int keepAliveIntervalSecs, int keepAliveTimeoutSecs, boolean keepAlive);
 
     private static native void socketOptionsDestroy(long elg);
 };

crt/aws-c-event-stream

@@ -133,13 +133,26 @@ public void start() throws CrtRuntimeException {
      *
      * This is an asynchronous operation.
      *
-     * @param disconnectPacket (optional) Properties of a DISCONNECT packet to send as part of the shutdown process
+     * @param disconnectPacket (optional) Properties of a DISCONNECT packet to send as part of the shutdown process. When
+     * disconnectPacket is null, no DISCONNECT packets will be sent.
      * @throws CrtRuntimeException If the native client is unable to initialize the stop process.
      */
     public void stop(DisconnectPacket disconnectPacket) throws CrtRuntimeException {
         mqtt5ClientInternalStop(getNativeHandle(), disconnectPacket);
     }
 
+    /**
+     * Notifies the Mqtt5Client that you want it to end connectivity to the configured endpoint, disconnecting any
+     * existing connection and halting any reconnect attempts. No DISCONNECT packets will be sent.
+     *
+     * This is an asynchronous operation.
+     *
+     * @throws CrtRuntimeException If the native client is unable to initialize the stop process.
+     */
+    public void stop() throws CrtRuntimeException {
+        stop(null);
+    }
+
     /**
      * Tells the Mqtt5Client to attempt to send a PUBLISH packet.
      *

crt/aws-c-io

@@ -105,7 +105,8 @@ public S3Client(S3ClientOptions options) throws CrtRuntimeException {
                 monitoringThroughputThresholdInBytesPerSecond,
                 monitoringFailureIntervalInSeconds,
                 options.getEnableS3Express(),
-                options.getS3ExpressCredentialsProviderFactory()));
+                options.getS3ExpressCredentialsProviderFactory(),
+                options.getMemoryLimitInBytes()));
 
         addReferenceTo(options.getClientBootstrap());
         if(didCreateSigningConfig) {
@@ -225,7 +226,8 @@ private static native long s3ClientNew(S3Client thisObj, byte[] region, long cli
             long monitoringThroughputThresholdInBytesPerSecond,
             int monitoringFailureIntervalInSeconds,
             boolean enableS3Express,
-            S3ExpressCredentialsProviderFactory s3expressCredentialsProviderFactory) throws CrtRuntimeException;
+            S3ExpressCredentialsProviderFactory s3expressCredentialsProviderFactory,
+            long memoryLimitInBytes) throws CrtRuntimeException;
 
     private static native void s3ClientDestroy(long client);
 

crt/aws-c-s3

@@ -30,6 +30,7 @@ public class S3ClientOptions {
     private long initialReadWindowSize;
     private int maxConnections;
     private boolean enableS3Express;
+    private long memoryLimitInBytes;
     private S3ExpressCredentialsProviderFactory s3expressCredentialsProviderFactory;
     /**
      * For multi-part upload, content-md5 will be calculated if the
@@ -346,4 +347,27 @@ public S3ClientOptions withS3ExpressCredentialsProviderFactory(S3ExpressCredenti
     public S3ExpressCredentialsProviderFactory getS3ExpressCredentialsProviderFactory() {
         return s3expressCredentialsProviderFactory;
     }
+
+    /**
+     * The amount of memory the CRT client is allowed to use.
+     * The client makes a best-effort attempt at memory limiting but might exceed this limit in some cases.
+     * If not provided, the client calculates this optimally from other settings, such as targetThroughput.
+     * On a 64-bit system, the default is between 2Gib-8Gib.
+     * It must be at least 1GiB and will be capped to SIZE_MAX of the system.
+     * @param memoryLimitBytes Memory limit in bytes.
+     * @return this
+     */
+    public S3ClientOptions withMemoryLimitInBytes(long memoryLimitBytes) {
+        this.memoryLimitInBytes = memoryLimitBytes;
+        return this;
+    }
+
+    /**
+     * Retrieves the memory limit set for the CRT client in bytes.
+     * If not set, this will return 0.
+     * @return long memory limit in bytes
+     */
+    public long getMemoryLimitInBytes() {
+        return memoryLimitInBytes;
+    }
 }

crt/aws-c-sdkutils

@@ -13,8 +13,9 @@
 public interface S3MetaRequestResponseHandler {
 
     /**
-     * Invoked to provide response headers received during execution of the meta request, both for
-     * success and error HTTP status codes.
+     * Invoked to provide response headers received during the execution of the meta request.
+     * Note: the statusCode in this callback is not the final statusCode. It is possible that the statusCode in `onResponseHeaders`
+     * is 200, and then the request fail leading to a different statusCode in the final `onFinished` callback.
      *
      * @param statusCode statusCode of the HTTP response
      * @param headers the headers received
@@ -31,7 +32,7 @@ default void onResponseHeaders(final int statusCode, final HttpHeader[] headers)
      * Whenever the flow-control window reaches zero, data will stop downloading.
      * To keep data flowing, you must increment the window by returning a number
      * from this method, or by calling {@link S3MetaRequest#incrementReadWindow}.
-     * <p>
+     * </p>
      * If backpressure is disabled, you do not need to maintain the flow-control window,
      * data will arrive as fast as possible.
      *

crt/aws-lc

@@ -344,7 +344,8 @@ JNIEXPORT jlong JNICALL Java_software_amazon_awssdk_crt_s3_S3Client_s3ClientNew(
     jlong jni_monitoring_throughput_threshold_in_bytes_per_second,
     jint jni_monitoring_failure_interval_in_seconds,
     jboolean enable_s3express,
-    jobject java_s3express_provider_factory) {
+    jobject java_s3express_provider_factory,
+    jlong jni_memory_limit_bytes_jlong) {
     (void)jni_class;
     aws_cache_jni_ids(env);
 
@@ -359,6 +360,7 @@ JNIEXPORT jlong JNICALL Java_software_amazon_awssdk_crt_s3_S3Client_s3ClientNew(
 
     uint64_t part_size = (uint64_t)part_size_jlong;
     uint64_t multipart_upload_threshold = (uint64_t)multipart_upload_threshold_jlong;
+    uint64_t memory_limit_in_bytes = (uint64_t)jni_memory_limit_bytes_jlong;
 
     size_t initial_read_window;
     if (aws_size_t_from_java(env, &initial_read_window, initial_read_window_jlong, "Initial read window")) {
@@ -456,6 +458,7 @@ JNIEXPORT jlong JNICALL Java_software_amazon_awssdk_crt_s3_S3Client_s3ClientNew(
         .s3express_provider_override_factory =
             java_s3express_provider_factory ? s_s3express_provider_jni_factory : NULL,
         .factory_user_data = callback_data,
+        .memory_limit_in_bytes = memory_limit_in_bytes,
     };
 
     struct aws_http_connection_monitoring_options monitoring_options;

crt/s2n

@@ -30,7 +30,8 @@ jlong JNICALL Java_software_amazon_awssdk_crt_io_SocketOptions_socketOptionsNew(
     jint type,
     jint connect_timeout_ms,
     jint keep_alive_interval_secs,
-    jint keep_alive_timeout_secs) {
+    jint keep_alive_timeout_secs,
+    jboolean keep_alive) {
     (void)jni_class;
     aws_cache_jni_ids(env);
 
@@ -44,6 +45,7 @@ jlong JNICALL Java_software_amazon_awssdk_crt_io_SocketOptions_socketOptionsNew(
     options->connect_timeout_ms = connect_timeout_ms;
     options->keep_alive_interval_sec = (short)keep_alive_interval_secs;
     options->keep_alive_timeout_sec = (short)keep_alive_timeout_secs;
+    options->keepalive = keep_alive;
 
     return (jlong)options;
 }

src/main/java/software/amazon/awssdk/crt/io/SocketOptions.java

@@ -317,7 +317,7 @@ public void testCreateDestroyProfile_MissingCreds() throws ExecutionException, I
     }
 
     @Ignore // Enable this test if/when https://github.com/awslabs/aws-c-auth/issues/142 has
-            // been resolved
+            // been resolved.
     @Test
     public void testCreateDestroyEcs_ValidCreds()
             throws IOException, ExecutionException, InterruptedException, TimeoutException {