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

Author: xiazhvera

include/aws/mqtt/private/client_impl_shared.h

@@ -147,14 +147,13 @@ struct aws_mqtt_iot_sdk_metrics_storage {
 };
 
 /* IoT SDK Metrics */
-AWS_MQTT_API int aws_mqtt_iot_sdk_metrics_storage_init(
-    struct aws_mqtt_iot_sdk_metrics_storage *metrics_storage,
+AWS_MQTT_API struct aws_mqtt_iot_sdk_metrics_storage *aws_mqtt_iot_sdk_metrics_storage_new(
     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_clean_up(struct aws_mqtt_iot_sdk_metrics_storage *metrics_storage);
+AWS_MQTT_API void aws_mqtt_iot_sdk_metrics_storage_destroy(struct aws_mqtt_iot_sdk_metrics_storage *metrics_storage);
 
 AWS_MQTT_API enum aws_mqtt311_impl_type aws_mqtt_client_connection_get_impl_type(
     const struct aws_mqtt_client_connection *connection);

source/client.c

@@ -5,6 +5,7 @@
 #include <aws/mqtt/client.h>
 
 #include <aws/mqtt/private/client_impl.h>
+#include <aws/mqtt/private/client_impl_shared.h>
 #include <aws/mqtt/private/mqtt_client_test_helper.h>
 #include <aws/mqtt/private/packets.h>
 #include <aws/mqtt/private/shared.h>
@@ -871,7 +872,7 @@ static void s_mqtt_client_connection_destroy_final(struct aws_mqtt_client_connec
 
     /* Clean up metrics */
     if (connection->metrics) {
-        aws_mqtt_iot_sdk_metrics_storage_clean_up(connection->metrics);
+        aws_mqtt_iot_sdk_metrics_storage_destroy(connection->metrics);
         connection->metrics = NULL;
     }
 
@@ -3395,20 +3396,13 @@ static int s_aws_mqtt_client_connection_311_set_metrics(void *impl, const struct
 
     /* Clean up existing metrics if any */
     if (connection->metrics) {
-        aws_mqtt_iot_sdk_metrics_storage_clean_up(connection->metrics);
+        aws_mqtt_iot_sdk_metrics_storage_destroy(connection->metrics);
         connection->metrics = NULL;
     }
 
     if (metrics) {
-        /* Allocate metrics storage */
-        connection->metrics = aws_mem_calloc(connection->allocator, 1, sizeof(struct aws_mqtt_iot_sdk_metrics_storage));
-
         /* Initialize metrics storage */
-        if (aws_mqtt_iot_sdk_metrics_storage_init(connection->metrics, connection->allocator, metrics)) {
-            aws_mem_release(connection->allocator, connection->metrics);
-            connection->metrics = NULL;
-            return AWS_OP_ERR;
-        }
+        connection->metrics = aws_mqtt_iot_sdk_metrics_storage_new(connection->allocator, metrics);
     }
 
     return AWS_OP_SUCCESS;

source/client_impl_shared.c

@@ -250,22 +250,21 @@ size_t aws_mqtt_iot_sdk_metrics_compute_storage_size(const struct aws_mqtt_iot_s
     return storage_size;
 }
 
-int aws_mqtt_iot_sdk_metrics_storage_init(
-    struct aws_mqtt_iot_sdk_metrics_storage *metrics_storage,
+struct aws_mqtt_iot_sdk_metrics_storage *aws_mqtt_iot_sdk_metrics_storage_new(
     struct aws_allocator *allocator,
     const struct aws_mqtt_iot_sdk_metrics *metrics_options) {
 
-    if (metrics_storage == NULL || allocator == NULL) {
-        return aws_raise_error(AWS_ERROR_INVALID_ARGUMENT);
+    if (allocator == NULL || metrics_options == NULL) {
+        aws_raise_error(AWS_ERROR_INVALID_ARGUMENT);
+        return NULL;
     }
 
-    if (metrics_options == NULL) {
-        return AWS_OP_SUCCESS;
-    }
+    struct aws_mqtt_iot_sdk_metrics_storage *metrics_storage =
+        aws_mem_calloc(allocator, 1, sizeof(struct aws_mqtt_iot_sdk_metrics_storage));
 
     size_t storage_capacity = aws_mqtt_iot_sdk_metrics_compute_storage_size(metrics_options);
     if (aws_byte_buf_init(&metrics_storage->storage, allocator, storage_capacity)) {
-        return AWS_OP_ERR;
+        goto cleanup_storage;
     }
 
     metrics_storage->allocator = allocator;
@@ -304,25 +303,30 @@ int aws_mqtt_iot_sdk_metrics_storage_init(
     if (metrics_options->library_name.len > 0) {
         metrics_storage->library_name = metrics_options->library_name;
         if (aws_byte_buf_append_and_update(&metrics_storage->storage, &metrics_storage->library_name)) {
-            goto metrics_storage_error;
+            goto cleanup_storage;
         }
         storage_view->library_name = metrics_storage->library_name;
     }
 
-    return AWS_OP_SUCCESS;
+    return metrics_storage;
 
-metrics_storage_error:
+cleanup_storage:
     // TODO Future Work: add metadata entries once we implemented the metadata feature
     // if (aws_array_list_is_valid(&metrics_storage->metadata_entries)) {
     //     aws_array_list_clean_up(&metrics_storage->metadata_entries);
     // }
-    
-    aws_byte_buf_clean_up(&metrics_storage->storage);
 
-    return AWS_OP_ERR;
+    if (aws_byte_buf_is_valid(&metrics_storage->storage)) {
+        aws_byte_buf_clean_up(&metrics_storage->storage);
+    }
+    if (metrics_options != NULL) {
+        aws_mem_release(allocator, metrics_storage);
+    }
+
+    return NULL;
 }
 
-void aws_mqtt_iot_sdk_metrics_storage_clean_up(struct aws_mqtt_iot_sdk_metrics_storage *metrics_storage) {
+void aws_mqtt_iot_sdk_metrics_storage_destroy(struct aws_mqtt_iot_sdk_metrics_storage *metrics_storage) {
     if (metrics_storage == NULL) {
         return;
     }

source/mqtt_iot_sdk_metrics.c

@@ -12,7 +12,7 @@
 #include <stdio.h>
 
 // MQTT payload size https://docs.aws.amazon.com/general/latest/gr/iot-core.html#thing-limits
-const int AWS_IOT_MAX_USERNAME_SIZE = 128 * 1024;
+const size_t AWS_IOT_MAX_USERNAME_SIZE = 128 * 1024;
 const size_t DEFAULT_QUERY_PARAM_COUNT = 10;
 
 // Build username query string from params_list, the caller is responsible to init and clean up output_username
@@ -160,8 +160,8 @@ int aws_mqtt_append_sdk_metrics_to_username(
     }
 
     // build final output username
-    if(s_build_username_query(
-        original_username, base_username_length, &params_list, output_username, out_full_username_size)){
+    if (s_build_username_query(
+            original_username, base_username_length, &params_list, output_username, out_full_username_size)) {
         goto cleanup;
     }
 

tests/shared_utils_tests.c

@@ -291,7 +291,7 @@ static int s_test_mqtt_append_sdk_metrics_long_strings(struct aws_allocator *all
     (void)ctx;
 
     char long_username[1024];
-    char long_sdk_name[2*1024*128];
+    char long_sdk_name[2 * 1024 * 128];
 
     memset(long_username, 'A', sizeof(long_username) - 1);
     long_username[sizeof(long_username) - 1] = '\0';