rename metadata

Author: xiazhvera

include/aws/mqtt/mqtt.h

@@ -132,7 +132,7 @@ struct aws_mqtt_iot_metrics {
      * Metadata entries, key value pair to set in metrics
      */
     size_t metadata_count;
-    const struct aws_mqtt_metadata_entry *metadatas;
+    const struct aws_mqtt_metadata_entry *metadata_entries;
 };
 
 AWS_EXTERN_C_BEGIN

include/aws/mqtt/private/mqtt_iot_metrics.h

@@ -16,7 +16,7 @@ struct aws_mqtt_iot_metrics_storage {
 
     struct aws_byte_cursor library_name;
 
-    /* Array of aws_mqtt_metadata_entry for storage_view.metadatas to point to */
+    /* Array of aws_mqtt_metadata_entry for storage_view.metadata_entries to point to */
     struct aws_array_list metadata_entries;
 
     struct aws_byte_buf storage;

source/mqtt_iot_metrics.c

@@ -198,7 +198,7 @@ int aws_mqtt_append_sdk_metrics_to_username(
     }
 
     /* Build metadata value string and add to params_list if metadata entries exist */
-    if (metrics->metadatas != NULL && metrics->metadata_count > 0) {
+    if (metrics->metadata_entries != NULL && metrics->metadata_count > 0) {
         struct aws_byte_cursor key_value_delim = aws_byte_cursor_from_c_str("=");
         struct aws_byte_cursor entry_delim = aws_byte_cursor_from_c_str(";");
         struct aws_byte_cursor open_paren = aws_byte_cursor_from_c_str("(");
@@ -207,7 +207,7 @@ int aws_mqtt_append_sdk_metrics_to_username(
         /* Calculate size needed for metadata value: (key1=value1;key2=value2;...) */
         size_t metadata_value_size = open_paren.len + close_paren.len;
         for (size_t i = 0; i < metrics->metadata_count; ++i) {
-            const struct aws_mqtt_metadata_entry *entry = &metrics->metadatas[i];
+            const struct aws_mqtt_metadata_entry *entry = &metrics->metadata_entries[i];
             metadata_value_size += entry->key.len + key_value_delim.len + entry->value.len;
             if (i < metrics->metadata_count - 1) {
                 metadata_value_size += entry_delim.len; /* semicolon separator between entries */
@@ -225,7 +225,7 @@ int aws_mqtt_append_sdk_metrics_to_username(
         }
 
         for (size_t i = 0; i < metrics->metadata_count; ++i) {
-            const struct aws_mqtt_metadata_entry *entry = &metrics->metadatas[i];
+            const struct aws_mqtt_metadata_entry *entry = &metrics->metadata_entries[i];
 
             if (aws_byte_buf_append(&metadata_value_buf, &entry->key)) {
                 goto cleanup;
@@ -304,9 +304,9 @@ size_t aws_mqtt_iot_metrics_compute_storage_size(const struct aws_mqtt_iot_metri
     storage_size += metrics->library_name.len;
 
     /* Add storage for metadata entries */
-    if (metrics->metadatas != NULL && metrics->metadata_count > 0) {
+    if (metrics->metadata_entries != NULL && metrics->metadata_count > 0) {
         for (size_t i = 0; i < metrics->metadata_count; ++i) {
-            const struct aws_mqtt_metadata_entry *entry = &metrics->metadatas[i];
+            const struct aws_mqtt_metadata_entry *entry = &metrics->metadata_entries[i];
             storage_size += entry->key.len;
             storage_size += entry->value.len;
         }
@@ -345,7 +345,7 @@ struct aws_mqtt_iot_metrics_storage *aws_mqtt_iot_metrics_storage_new(
     }
 
     /* Copy metadata entries */
-    if (metrics_options->metadatas != NULL && metrics_options->metadata_count > 0) {
+    if (metrics_options->metadata_entries != NULL && metrics_options->metadata_count > 0) {
         if (aws_array_list_init_dynamic(
                 &metrics_storage->metadata_entries,
                 allocator,
@@ -356,8 +356,8 @@ struct aws_mqtt_iot_metrics_storage *aws_mqtt_iot_metrics_storage_new(
 
         for (size_t i = 0; i < metrics_options->metadata_count; ++i) {
             struct aws_mqtt_metadata_entry entry;
-            entry.key = metrics_options->metadatas[i].key;
-            entry.value = metrics_options->metadatas[i].value;
+            entry.key = metrics_options->metadata_entries[i].key;
+            entry.value = metrics_options->metadata_entries[i].value;
 
             /* Copy key into storage buffer and update cursor */
             if (entry.key.len > 0) {
@@ -378,7 +378,7 @@ struct aws_mqtt_iot_metrics_storage *aws_mqtt_iot_metrics_storage_new(
 
         /* Set storage_view to point to the metadata entries array */
         storage_view->metadata_count = aws_array_list_length(&metrics_storage->metadata_entries);
-        storage_view->metadatas = metrics_storage->metadata_entries.data;
+        storage_view->metadata_entries = metrics_storage->metadata_entries.data;
     }
 
     return metrics_storage;
@@ -417,12 +417,12 @@ int aws_mqtt_validate_iot_metrics(const struct aws_mqtt_iot_metrics *metrics) {
     }
 
     /* Validate metadata entries */
-    if (metrics->metadatas != NULL && metrics->metadata_count > 0) {
+    if (metrics->metadata_entries != NULL && metrics->metadata_count > 0) {
         for (size_t i = 0; i < metrics->metadata_count; ++i) {
-            if (aws_mqtt_validate_utf8_text(metrics->metadatas[i].key)) {
+            if (aws_mqtt_validate_utf8_text(metrics->metadata_entries[i].key)) {
                 return AWS_OP_ERR;
             }
-            if (aws_mqtt_validate_utf8_text(metrics->metadatas[i].value)) {
+            if (aws_mqtt_validate_utf8_text(metrics->metadata_entries[i].value)) {
                 return AWS_OP_ERR;
             }
         }

tests/shared_utils_tests.c

@@ -388,7 +388,7 @@ static int s_test_mqtt_append_sdk_metrics_with_metadata(struct aws_allocator *al
     struct aws_mqtt_iot_metrics metrics = {
         .library_name = aws_byte_cursor_from_c_str("TestSDK/1.0"),
         .metadata_count = AWS_ARRAY_SIZE(metadata_entries),
-        .metadatas = metadata_entries,
+        .metadata_entries = metadata_entries,
     };
 
     struct aws_byte_buf output_username;
@@ -429,7 +429,7 @@ static int s_test_mqtt_append_sdk_metrics_with_metadata_invalid_utf8(struct aws_
     struct aws_mqtt_iot_metrics metrics = {
         .library_name = aws_byte_cursor_from_c_str("TestSDK/1.0"),
         .metadata_count = AWS_ARRAY_SIZE(metadata_entries),
-        .metadatas = metadata_entries,
+        .metadata_entries = metadata_entries,
     };
 
     struct aws_byte_buf output_username;
@@ -465,7 +465,7 @@ static int s_test_mqtt_append_sdk_metrics_with_metadata_invalid_utf8_value(struc
     struct aws_mqtt_iot_metrics metrics = {
         .library_name = aws_byte_cursor_from_c_str("TestSDK/1.0"),
         .metadata_count = AWS_ARRAY_SIZE(metadata_entries),
-        .metadatas = metadata_entries,
+        .metadata_entries = metadata_entries,
     };
 
     struct aws_byte_buf output_username;
@@ -504,7 +504,7 @@ static int s_test_mqtt_iot_metrics_storage_with_metadata(struct aws_allocator *a
     struct aws_mqtt_iot_metrics metrics = {
         .library_name = aws_byte_cursor_from_c_str("TestSDK/1.0"),
         .metadata_count = AWS_ARRAY_SIZE(metadata_entries),
-        .metadatas = metadata_entries,
+        .metadata_entries = metadata_entries,
     };
 
     struct aws_mqtt_iot_metrics_storage *storage = aws_mqtt_iot_metrics_storage_new(allocator, &metrics);
@@ -513,13 +513,13 @@ static int s_test_mqtt_iot_metrics_storage_with_metadata(struct aws_allocator *a
     /* Verify the storage view has the correct values */
     ASSERT_TRUE(aws_byte_cursor_eq_c_str(&storage->storage_view.library_name, "TestSDK/1.0"));
     ASSERT_INT_EQUALS(2, storage->storage_view.metadata_count);
-    ASSERT_NOT_NULL(storage->storage_view.metadatas);
+    ASSERT_NOT_NULL(storage->storage_view.metadata_entries);
 
     /* Verify metadata entries are correctly stored */
-    ASSERT_TRUE(aws_byte_cursor_eq_c_str(&storage->storage_view.metadatas[0].key, "Key1"));
-    ASSERT_TRUE(aws_byte_cursor_eq_c_str(&storage->storage_view.metadatas[0].value, "Value1"));
-    ASSERT_TRUE(aws_byte_cursor_eq_c_str(&storage->storage_view.metadatas[1].key, "Key2"));
-    ASSERT_TRUE(aws_byte_cursor_eq_c_str(&storage->storage_view.metadatas[1].value, "Value2"));
+    ASSERT_TRUE(aws_byte_cursor_eq_c_str(&storage->storage_view.metadata_entries[0].key, "Key1"));
+    ASSERT_TRUE(aws_byte_cursor_eq_c_str(&storage->storage_view.metadata_entries[0].value, "Value1"));
+    ASSERT_TRUE(aws_byte_cursor_eq_c_str(&storage->storage_view.metadata_entries[1].key, "Key2"));
+    ASSERT_TRUE(aws_byte_cursor_eq_c_str(&storage->storage_view.metadata_entries[1].value, "Value2"));
 
     aws_mqtt_iot_metrics_storage_destroy(storage);
 
@@ -534,7 +534,7 @@ static int s_test_mqtt_iot_metrics_storage_empty_metadata(struct aws_allocator *
     struct aws_mqtt_iot_metrics metrics = {
         .library_name = aws_byte_cursor_from_c_str("TestSDK/1.0"),
         .metadata_count = 0,
-        .metadatas = NULL,
+        .metadata_entries = NULL,
     };
 
     struct aws_mqtt_iot_metrics_storage *storage = aws_mqtt_iot_metrics_storage_new(allocator, &metrics);

tests/v3/connection_state_test.c

@@ -4165,7 +4165,7 @@ static int s_create_mqtt_connection_and_set_metrics(
             username,
             metrics->library_name,
             NULL,
-            metrics->metadatas,
+            metrics->metadata_entries,
             metrics->metadata_count,
             &expected_buf);
     } else if (username != NULL) {
@@ -4200,7 +4200,7 @@ static int s_test_mqtt_connection_set_metrics_valid_fn(struct aws_allocator *all
     struct aws_mqtt_iot_metrics metrics = {
         .library_name = aws_byte_cursor_from_c_str("TestSDK/1.0"),
         .metadata_count = AWS_ARRAY_SIZE(metadata_entries),
-        .metadatas = metadata_entries,
+        .metadata_entries = metadata_entries,
     };
 
     struct aws_byte_cursor username = aws_byte_cursor_from_c_str("testuser");
@@ -4251,7 +4251,7 @@ static int s_test_mqtt_connection_set_metrics_with_null_username_fn(struct aws_a
     struct aws_mqtt_iot_metrics metrics = {
         .library_name = aws_byte_cursor_from_c_str("TestSDK/1.0"),
         .metadata_count = AWS_ARRAY_SIZE(metadata_entries),
-        .metadatas = metadata_entries,
+        .metadata_entries = metadata_entries,
     };
 
     ASSERT_SUCCESS(s_create_mqtt_connection_and_set_metrics(allocator, &metrics, NULL, ctx));

tests/v3/mqtt311_testing_utils.c

@@ -593,7 +593,7 @@ void aws_test_mqtt_build_expected_metrics(
     const struct aws_byte_cursor *original_username,
     const struct aws_byte_cursor sdk,
     const struct aws_byte_cursor *platform,
-    const struct aws_mqtt_metadata_entry *metadatas,
+    const struct aws_mqtt_metadata_entry *metadata_entries,
     size_t metadata_count,
     struct aws_byte_buf *expected_buf) {
 
@@ -609,11 +609,11 @@ void aws_test_mqtt_build_expected_metrics(
     aws_byte_buf_append_dynamic(expected_buf, &platform_to_use);
 
     /* Append metadata if present */
-    if (metadatas != NULL && metadata_count > 0) {
+    if (metadata_entries != NULL && metadata_count > 0) {
         aws_byte_buf_append_dynamic(expected_buf, &METADATA_ATT_STR);
 
         for (size_t i = 0; i < metadata_count; ++i) {
-            const struct aws_mqtt_metadata_entry *entry = &metadatas[i];
+            const struct aws_mqtt_metadata_entry *entry = &metadata_entries[i];
             aws_byte_buf_append_dynamic(expected_buf, &entry->key);
             aws_byte_buf_append_dynamic(expected_buf, &METADATA_KEY_VALUE_DELIM);
             aws_byte_buf_append_dynamic(expected_buf, &entry->value);

tests/v3/mqtt311_testing_utils.h

@@ -159,7 +159,7 @@ void aws_test311_on_connection_termination_fn(void *userdata);
  * @param original_username The original username (can be NULL)
  * @param sdk The SDK string
  * @param platform The platform string (can be NULL to use default)
- * @param metadatas Array of metadata entries (can be NULL if metadata_count is 0)
+ * @param metadata_entries Array of metadata entries (can be NULL if metadata_count is 0)
  * @param metadata_count Number of metadata entries (0 for no metadata)
  * @param expected_buf Output buffer for the expected metrics string
  */
@@ -168,7 +168,7 @@ void aws_test_mqtt_build_expected_metrics(
     const struct aws_byte_cursor *original_username,
     const struct aws_byte_cursor sdk,
     const struct aws_byte_cursor *platform,
-    const struct aws_mqtt_metadata_entry *metadatas,
+    const struct aws_mqtt_metadata_entry *metadata_entries,
     size_t metadata_count,
     struct aws_byte_buf *expected_buf);
 

tests/v5/mqtt5_client_tests.c

@@ -6782,7 +6782,7 @@ static int s_test_mqtt5_client_set_metrics_valid(struct aws_allocator *allocator
     struct aws_mqtt_iot_metrics metrics = {
         .library_name = aws_byte_cursor_from_c_str("TestSDK/1.0"),
         .metadata_count = AWS_ARRAY_SIZE(metadata_entries),
-        .metadatas = metadata_entries,
+        .metadata_entries = metadata_entries,
     };
 
     struct aws_byte_cursor username = aws_byte_cursor_from_c_str("test_user");
@@ -6808,7 +6808,7 @@ static int s_test_mqtt5_client_set_metrics_with_null_username(struct aws_allocat
     struct aws_mqtt_iot_metrics metrics = {
         .library_name = aws_byte_cursor_from_c_str("TestSDK/1.0"),
         .metadata_count = AWS_ARRAY_SIZE(metadata_entries),
-        .metadatas = metadata_entries,
+        .metadata_entries = metadata_entries,
     };
 
     return s_mqtt5_client_metrics_in_username_fn(allocator, &metrics, NULL, ctx);

tests/v5/mqtt5_to_mqtt3_adapter_tests.c

@@ -4442,7 +4442,7 @@ static int s_mqtt5to3_adapter_connection_set_metrics_valid_fn(struct aws_allocat
     struct aws_mqtt_iot_metrics metrics = {
         .library_name = aws_byte_cursor_from_c_str("TestSDK/1.0"),
         .metadata_count = AWS_ARRAY_SIZE(metadata_entries),
-        .metadatas = metadata_entries,
+        .metadata_entries = metadata_entries,
     };
 
     ASSERT_SUCCESS(aws_mqtt_client_connection_set_metrics(connection, &metrics));
@@ -4518,7 +4518,7 @@ static int s_mqtt5to3_adapter_connection_set_metrics_invalid_utf8_library_fn(
     struct aws_mqtt_iot_metrics metrics = {
         .library_name = invalid_utf8_library,
         .metadata_count = AWS_ARRAY_SIZE(metadata_entries),
-        .metadatas = metadata_entries,
+        .metadata_entries = metadata_entries,
     };
 
     ASSERT_FAILS(aws_mqtt_client_connection_set_metrics(connection, &metrics));