Merge branch 'metrics_mqtt5' of github.com:awslabs/aws-c-mqtt into metrics_adapter

Author: xiazhvera

source/mqtt_iot_sdk_metrics.c

@@ -82,15 +82,16 @@ int aws_mqtt_append_sdk_metrics_to_username(
     }
 
     if (!metrics) {
+        if (out_full_username_size) {
+            *out_full_username_size = original_username->len;
+        }
+
         if (output_username &&
             aws_byte_buf_init(output_username, allocator, original_username->len) == AWS_OP_SUCCESS) {
             aws_byte_buf_write(output_username, original_username->ptr, original_username->len);
-            if (out_full_username_size) {
-                *out_full_username_size = original_username->len;
-            }
-            return AWS_OP_SUCCESS;
         }
-        return AWS_OP_ERR;
+
+        return AWS_OP_SUCCESS;
     }
 
     if (aws_mqtt_validate_iot_sdk_metrics_utf8(metrics)) {

source/v5/mqtt5_options_storage.c

@@ -3994,8 +3994,9 @@ struct aws_mqtt5_client_options_storage *aws_mqtt5_client_options_storage_new(
     }
 
     options_storage->connect = aws_mem_calloc(allocator, 1, sizeof(struct aws_mqtt5_packet_connect_storage));
+    // We pass in a NULL client option as we don't want to store extra metrics info in the connect storage here
     int connect_storage_result =
-        aws_mqtt5_packet_connect_storage_init(options_storage->connect, allocator, &connect_options, options);
+        aws_mqtt5_packet_connect_storage_init(options_storage->connect, allocator, &connect_options, NULL);
 
     aws_byte_buf_clean_up(&auto_assign_id_buf);
     if (connect_storage_result != AWS_OP_SUCCESS) {