Merge branch 'main' into manual-puback

Author: sbSteveK

crt/aws-c-auth

@@ -5,11 +5,7 @@
 
 package software.amazon.awssdk.crt.http;
 
-import software.amazon.awssdk.crt.CRT;
 import software.amazon.awssdk.crt.CrtResource;
-import software.amazon.awssdk.crt.CrtRuntimeException;
-
-import java.util.concurrent.CompletableFuture;
 
 /**
  * An base class represents a single Http Request/Response for both HTTP/1.1 and
@@ -100,6 +96,22 @@ public int getResponseStatusCode() {
         throw new IllegalStateException("Can't get Status Code on Closed Stream");
     }
 
+    /**
+     * Cancels the stream with the default error code (AWS_ERROR_HTTP_STREAM_CANCELLED).
+     * <p>
+     * For HTTP/1.1 streams, this is equivalent to closing the connection.
+     * For HTTP/2 streams, this sends a RST_STREAM frame with AWS_HTTP2_ERR_CANCEL.
+     * <p>
+     * The stream will complete with AWS_ERROR_HTTP_STREAM_CANCELLED, unless the stream is
+     * already completing for other reasons, or the stream is not activated,
+     * in which case this call will have no effect.
+     */
+    public void cancel() {
+        if (!isNull()) {
+            httpStreamBaseCancelDefaultError(getNativeHandle());
+        }
+    }
+
     /*******************************************************************************
      * Native methods
      ******************************************************************************/
@@ -111,4 +123,6 @@ public int getResponseStatusCode() {
     private static native void httpStreamBaseActivate(long http_stream, HttpStreamBase streamObj);
 
     private static native int httpStreamBaseGetResponseStatusCode(long http_stream);
+
+    private static native void httpStreamBaseCancelDefaultError(long http_stream);
 }

crt/aws-c-http

@@ -0,0 +1,21 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+package software.amazon.awssdk.crt.internal;
+
+/**
+ * @internal
+ * IoT Device SDK Metrics Structure. Not for external usage. 
+ */
+public class IoTDeviceSDKMetrics {
+    private String libraryName;
+
+    public IoTDeviceSDKMetrics() {
+        this.libraryName = "IoTDeviceSDK/Java";
+    }
+
+    public String getLibraryName() {
+        return libraryName;
+    }
+}

crt/aws-c-s3

@@ -17,6 +17,7 @@
 import software.amazon.awssdk.crt.mqtt5.Mqtt5Client;
 import software.amazon.awssdk.crt.mqtt5.Mqtt5ClientOptions;
 import software.amazon.awssdk.crt.mqtt5.packets.ConnectPacket;
+import software.amazon.awssdk.crt.internal.IoTDeviceSDKMetrics;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Consumer;
@@ -77,6 +78,7 @@ private static MqttConnectionConfig s_toMqtt3ConnectionConfig(Mqtt5ClientOptions
         options.setProtocolOperationTimeoutMs(mqtt5options.getAckTimeoutSeconds() != null
                 ? Math.toIntExact(mqtt5options.getAckTimeoutSeconds()) * 1000
                 : 0);
+        options.setMetricsEnabled(mqtt5options.getMetricsEnabled());
         return options;
     }
 
@@ -162,6 +164,10 @@ private void SetupConfig(MqttConnectionConfig config) throws MqttException {
                 mqttClientConnectionSetLogin(getNativeHandle(), config.getUsername(), config.getPassword());
             }
 
+            if (config.getMetricsEnabled()) {
+                mqttClientConnectionSetMetrics(getNativeHandle(), new IoTDeviceSDKMetrics());
+            }
+
             if (config.getMinReconnectTimeoutSecs() != 0L && config.getMaxReconnectTimeoutSecs() != 0L) {
                 mqttClientConnectionSetReconnectTimeout(getNativeHandle(), config.getMinReconnectTimeoutSecs(),
                         config.getMaxReconnectTimeoutSecs());
@@ -502,6 +508,9 @@ private static native boolean mqttClientConnectionSetWill(long connection, Strin
     private static native void mqttClientConnectionSetLogin(long connection, String username, String password)
             throws CrtRuntimeException;
 
+    private static native void mqttClientConnectionSetMetrics(long connection, IoTDeviceSDKMetrics metrics)
+            throws CrtRuntimeException;
+
     private static native void mqttClientConnectionSetReconnectTimeout(long connection, long minTimeout,
             long maxTimeout)
             throws CrtRuntimeException;

crt/aws-lc

@@ -46,6 +46,9 @@ public final class MqttConnectionConfig extends CrtResource {
     private HttpProxyOptions proxyOptions;
     private Consumer<WebsocketHandshakeTransformArgs> websocketHandshakeTransform;
 
+    /* metrics */
+    private boolean metricsEnabled = true;
+
     public MqttConnectionConfig() {}
 
 
@@ -538,6 +541,24 @@ public Consumer<WebsocketHandshakeTransformArgs> getWebsocketHandshakeTransform(
         return websocketHandshakeTransform;
     }
 
+    /**
+     * Enables or disables IoT Device SDK metrics collection. The metrics includes SDK name, version, and platform.
+     *
+     * @param enabled true to enable metrics, false to disable
+     */
+    public void setMetricsEnabled(boolean enabled) {
+        this.metricsEnabled = enabled;
+    }
+
+    /**
+     * Queries whether IoT Device SDK metrics collection is enabled
+     *
+     * @return true if metrics are enabled, false if disabled
+     */
+    public boolean getMetricsEnabled() {
+        return metricsEnabled;
+    }
+
     /**
      * Creates a (shallow) clone of this config object
      *
@@ -567,6 +588,7 @@ public MqttConnectionConfig clone() {
             clone.setWebsocketHandshakeTransform(getWebsocketHandshakeTransform());
 
             clone.setReconnectTimeoutSecs(getMinReconnectTimeoutSecs(), getMaxReconnectTimeoutSecs());
+            clone.setMetricsEnabled(getMetricsEnabled());
 
             // success, bump up the ref count so we can escape the try-with-resources block
             clone.addRef();

src/main/java/software/amazon/awssdk/crt/http/HttpStreamBase.java

@@ -12,6 +12,7 @@
 
 import software.amazon.awssdk.crt.mqtt5.packets.ConnectPacket;
 import software.amazon.awssdk.crt.mqtt.MqttConnectionConfig;
+import software.amazon.awssdk.crt.internal.IoTDeviceSDKMetrics;
 
 import java.util.Map;
 import java.util.function.Function;
@@ -45,6 +46,12 @@ public class Mqtt5ClientOptions {
     private Consumer<Mqtt5WebsocketHandshakeTransformArgs> websocketHandshakeTransform;
     private PublishEvents publishEvents;
     private TopicAliasingOptions topicAliasingOptions;
+    // Indicates whether AWS IoT Metrics are enabled for this client, default to true.
+    // We don't expose iotDeviceSDKMetrics in the builder, and only allow setting
+    // metricsEnabled for now.
+    private boolean metricsEnabled = true;
+    private IoTDeviceSDKMetrics iotDeviceSDKMetrics;
+    
 
     /**
      * Returns the host name of the MQTT server to connect to.
@@ -263,6 +270,24 @@ public TopicAliasingOptions getTopicAliasingOptions() {
         return this.topicAliasingOptions;
     }
 
+    /**
+     * Returns whether AWS IoT Device SDK metrics collection is enabled
+     *
+     * @return true if metrics are enabled, false otherwise
+     */
+    public boolean getMetricsEnabled() {
+        return this.metricsEnabled;
+    }
+
+    /**
+     * Enables or disables IoT Device SDK metrics collection. The metrics includes SDK name, version, and platform.
+     *
+     * @param enabled true to enable metrics, false to disable
+     */
+    public void setMetricsEnabled(boolean enabled) {
+        this.metricsEnabled = enabled;
+    }
+
     /**
      * Creates a Mqtt5ClientOptionsBuilder instance
      * @param builder The builder to get the Mqtt5ClientOptions values from
@@ -289,6 +314,8 @@ public Mqtt5ClientOptions(Mqtt5ClientOptionsBuilder builder) {
         this.websocketHandshakeTransform = builder.websocketHandshakeTransform;
         this.publishEvents = builder.publishEvents;
         this.topicAliasingOptions = builder.topicAliasingOptions;
+        this.metricsEnabled = builder.metricsEnabled;
+        this.iotDeviceSDKMetrics = new IoTDeviceSDKMetrics();
     }
 
     /*******************************************************************************
@@ -591,6 +618,7 @@ static final public class Mqtt5ClientOptionsBuilder {
         private Consumer<Mqtt5WebsocketHandshakeTransformArgs> websocketHandshakeTransform;
         private PublishEvents publishEvents;
         private TopicAliasingOptions topicAliasingOptions;
+        private boolean metricsEnabled = true;
 
         /**
          * Sets the host name of the MQTT server to connect to.
@@ -858,6 +886,17 @@ public Mqtt5ClientOptionsBuilder withTopicAliasingOptions(TopicAliasingOptions o
             return this;
         }
 
+        /**
+         * Enables or disables IoT Device SDK metrics collection. The metrics includes SDK name, version, and platform.
+         *
+         * @param enabled true to enable metrics, false to disable.
+         * @return The Mqtt5ClientOptionsBuilder after setting the metrics option
+         */
+        public Mqtt5ClientOptionsBuilder withMetricsEnabled(boolean enabled) {
+            this.metricsEnabled = enabled;
+            return this;
+        }
+
         /**
          * Creates a new Mqtt5ClientOptionsBuilder instance
          *

src/main/java/software/amazon/awssdk/crt/internal/IoTDeviceSDKMetrics.java

@@ -1256,6 +1256,14 @@
       }
     ]
   },
+  {
+    "name": "software.amazon.awssdk.crt.internal.IoTDeviceSDKMetrics",
+    "fields": [
+      {
+        "name": "libraryName"
+      }
+    ]
+  },
   {
     "name": "software.amazon.awssdk.crt.mqtt5.Mqtt5ClientOptions",
     "fields": [
@@ -1306,6 +1314,12 @@
       },
       {
         "name": "topicAliasingOptions"
+      },
+      {
+        "name": "iotDeviceSDKMetrics"
+      },
+      {
+        "name": "metricsEnabled"
       }
     ],
     "methods": [