Update

Author: Bret Ambrose

lib/browser/mqtt.ts

@@ -130,9 +130,6 @@ export interface MqttConnectionConfig extends mqtt_shared.MqttConnectionConfigBa
 
     /** Options for the underlying credentials provider */
     credentials_provider?: auth.CredentialsProvider;
-
-    /** Optional metrics configuration to be applied to the username and sent with the CONNECT packet */
-    sdkMetrics?: mqtt_shared.AwsIoTDeviceSDKMetrics;
 }
 
 /**
@@ -247,7 +244,13 @@ export class MqttClientConnection extends BufferedEventEmitter {
             internalConnectOptions.clientId = this.config.client_id;
         }
 
-        internalConnectOptions.username = mqtt_shared_browser.buildFinalUsernameFromMetrics(this.config.sdkMetrics ?? new mqtt_shared.AwsIoTDeviceSDKMetrics(), this.config.username);
+        if (this.config.disable_metrics) {
+            if (this.config.username) {
+                internalConnectOptions.username = this.config.username;
+            }
+        } else {
+            internalConnectOptions.username = mqtt_shared_browser.buildFinalUsernameFromMetrics(new mqtt_shared.AwsIoTDeviceSDKMetrics(), this.config.username);
+        }
 
         if (this.config.password) {
             internalConnectOptions.password = mqtt_shared_browser.normalize_payload_to_buffer(this.config.password);

lib/browser/mqtt5.ts

@@ -144,9 +144,6 @@ export interface Mqtt5ClientConfig extends mqtt_shared.Mqtt5ClientConfigBase {
      * @group Browser-only
      */
     websocketOptions?: Mqtt5WebsocketConfig;
-
-    /** Optional metrics configuration to be applied to the username and sent with the CONNECT packet */
-    sdkMetrics?: mqtt_shared.AwsIoTDeviceSDKMetrics;
 }
 
 function convertSessionBehaviorToSessionPolicy(behavior?: mqtt5.ClientSessionBehavior) : internal_mqtt_client.ResumeSessionPolicyType {
@@ -167,7 +164,15 @@ function convertSessionBehaviorToSessionPolicy(behavior?: mqtt5.ClientSessionBeh
 }
 
 function buildInternalConnectOptions(internalConnectOptions : internal_mqtt_client.ConnectOptions, clientConfig: Mqtt5ClientConfig, connectProperties?: mqtt5_packet.ConnectPacket) {
-    internalConnectOptions.username = mqtt_shared_browser.buildFinalUsernameFromMetrics(clientConfig.sdkMetrics ?? new mqtt_shared.AwsIoTDeviceSDKMetrics(), connectProperties?.username);
+    if (clientConfig.disableMetrics) {
+        if (connectProperties?.username) {
+            internalConnectOptions.username = connectProperties.username;
+        }
+    } else {
+        internalConnectOptions.username = mqtt_shared_browser.buildFinalUsernameFromMetrics(new mqtt_shared.AwsIoTDeviceSDKMetrics(), connectProperties?.username);
+    }
+
+    internalConnectOptions.username = mqtt_shared_browser.buildFinalUsernameFromMetrics(new mqtt_shared.AwsIoTDeviceSDKMetrics(), connectProperties?.username);
 
     if (!connectProperties) {
         return;

lib/common/mqtt_shared.ts

@@ -343,5 +343,10 @@ export interface Mqtt5ClientConfigBase {
      * If this setting is left undefined, then topic aliasing behavior will be disabled.
      */
     topicAliasingOptions? : mqtt5.TopicAliasingOptions;
+
+    /**
+     * Options for disable Aws IoT Metrics. The metrics includes SDK name, version, and platform.
+     */
+    disableMetrics? : boolean;
 }
 

lib/native/mqtt5.ts

@@ -206,13 +206,6 @@ export interface Mqtt5ClientConfig extends mqtt_shared.Mqtt5ClientConfigBase {
      * @group Node-only
      */
     extendedValidationAndFlowControlOptions? : ClientExtendedValidationAndFlowControl;
-
-    /**
-     * Options for disable Aws IoT Metrics. The metrics includes SDK name, version, and platform.
-     *
-     * @group Node-only
-     */
-    disableMetrics? : boolean;
 }
 
 /**