cr update

Author: xiazhvera

include/aws/mqtt/private/mqtt_iot_sdk_metrics.h

@@ -6,7 +6,7 @@
 #ifndef AWS_MQTT_IOT_SDK_METRICS_H
 #define AWS_MQTT_IOT_SDK_METRICS_H
 
-/* IoT SDK Metrics */
+/* Storage for `aws_mqtt_iot_sdk_metrics`. */
 struct aws_mqtt_iot_sdk_metrics_storage {
     struct aws_allocator *allocator;
 
@@ -23,8 +23,6 @@ AWS_MQTT_API struct aws_mqtt_iot_sdk_metrics_storage *aws_mqtt_iot_sdk_metrics_s
     struct aws_allocator *allocator,
     const struct aws_mqtt_iot_sdk_metrics *metrics_options);
 
-AWS_MQTT_API size_t aws_mqtt_iot_sdk_metrics_compute_storage_size(const struct aws_mqtt_iot_sdk_metrics *metrics);
-
 AWS_MQTT_API void aws_mqtt_iot_sdk_metrics_storage_destroy(struct aws_mqtt_iot_sdk_metrics_storage *metrics_storage);
 
 /**

source/client.c

@@ -629,9 +629,6 @@ static void s_mqtt_client_init(
     if (connection->username || connection->metrics_storage) {
         struct aws_byte_cursor username_cur;
         AWS_ZERO_STRUCT(username_cur);
-        if (connection->username) {
-            username_cur = aws_byte_cursor_from_string(connection->username);
-        }
 
         /* Apply metrics to username if configured */
         if (aws_mqtt_append_sdk_metrics_to_username(
@@ -646,22 +643,24 @@ static void s_mqtt_client_init(
                 AWS_LS_MQTT_CLIENT, "id=%p: Failed to apply metrics to username, using original", (void *)connection);
         }
 
-        AWS_LOGF_DEBUG(
-            AWS_LS_MQTT_CLIENT,
-            "id=%p: Adding username " PRInSTR " to connection",
-            (void *)connection,
-            AWS_BYTE_CURSOR_PRI(username_cur));
+        if (aws_byte_cursor_is_valid(&username_cur)) {
+            AWS_LOGF_DEBUG(
+                AWS_LS_MQTT_CLIENT,
+                "id=%p: Adding username " PRInSTR " to connection",
+                (void *)connection,
+                AWS_BYTE_CURSOR_PRI(username_cur));
 
-        struct aws_byte_cursor password_cur = {
-            .ptr = NULL,
-            .len = 0,
-        };
+            struct aws_byte_cursor password_cur = {
+                .ptr = NULL,
+                .len = 0,
+            };
 
-        if (connection->password) {
-            password_cur = aws_byte_cursor_from_string(connection->password);
-        }
+            if (connection->password) {
+                password_cur = aws_byte_cursor_from_string(connection->password);
+            }
 
-        aws_mqtt_packet_connect_add_credentials(&connect, username_cur, password_cur);
+            aws_mqtt_packet_connect_add_credentials(&connect, username_cur, password_cur);
+        }
     }
 
     message = mqtt_get_message_for_packet(connection, &connect.fixed_header);