wip: fix mqtt3 compile error

Author: xiazhvera

include/aws/mqtt/private/client_impl_shared.h

@@ -134,10 +134,7 @@ struct aws_mqtt_client_connection {
     void *impl;
 };
 
-struct aws_mqtt_metadata_entry_storage {
-    struct aws_string *key;
-    struct aws_string *value;
-} struct aws_mqtt_iot_sdk_metrics_storage {
+struct aws_mqtt_iot_sdk_metrics_storage {
     struct aws_allocator *allocator;
 
     struct aws_mqtt_iot_sdk_metrics storage_view;
@@ -187,6 +184,6 @@ int aws_mqtt_append_sdk_metrics_to_username(
     struct aws_allocator *allocator,
     const struct aws_byte_cursor *original_username,
     const struct aws_mqtt_iot_sdk_metrics *metrics,
-    struct aws_byte_buf *output_username)
+    struct aws_byte_buf *output_username);
 
 #endif /* AWS_MQTT_PRIVATE_CLIENT_IMPL_SHARED_H */

source/client.c

@@ -636,7 +636,8 @@ static void s_mqtt_client_init(
 
         /* Apply metrics to username if configured */
         if (connection->metrics) {
-            if (aws_mqtt_append_sdk_metrics_to_username(&username_cur, connection->metrics, &metrics_username_buf) ==
+            if (aws_mqtt_append_sdk_metrics_to_username(
+                    connection->allocator, &username_cur, &connection->metrics->storage_view, &metrics_username_buf) ==
                 AWS_OP_SUCCESS) {
                 username_cur = aws_byte_cursor_from_buf(&metrics_username_buf);
             } else {
@@ -872,10 +873,7 @@ static void s_mqtt_client_connection_destroy_final(struct aws_mqtt_client_connec
 
     /* Clean up metrics */
     if (connection->metrics) {
-        if (connection->metrics->metadata_entries) {
-            aws_mem_release(connection->allocator, connection->metrics->metadata_entries);
-        }
-        aws_mem_release(connection->allocator, connection->metrics);
+        aws_mqtt_iot_sdk_metrics_storage_clean_up(connection->metrics);
     }
 
     aws_mqtt_client_release(connection->client);

source/client_impl_shared.c

@@ -318,7 +318,8 @@ int aws_mqtt_iot_sdk_metrics_storage_init(
     }
 
     return AWS_OP_SUCCESS;
-storage_error:
+
+metrics_storage_error:
     aws_mqtt_iot_sdk_metrics_storage_clean_up(metrics_storage);
     return AWS_OP_ERR;
 }

source/mqtt_iot_sdk_metrics.c

@@ -116,7 +116,7 @@ int aws_mqtt_append_sdk_metrics_to_username(
 
     return AWS_OP_SUCCESS;
 
-error:
-    aws_byte_buf_clean_up(output_username);
-    return AWS_OP_ERR;
+    // error:
+    //     aws_byte_buf_clean_up(output_username);
+    //     return AWS_OP_ERR;
 }