rename metrics structure

Author: xiazhvera

include/aws/mqtt/private/v5/mqtt5_options_storage.h

@@ -182,7 +182,7 @@ struct aws_mqtt5_client_options_storage {
 
     struct aws_host_resolution_config host_resolution_override;
 
-    struct aws_mqtt_iot_sdk_metrics_storage *metrics_storage;
+    struct aws_mqtt_iot_metrics_storage *metrics_storage;
 };
 
 AWS_EXTERN_C_BEGIN

include/aws/mqtt/v5/mqtt5_client.h

@@ -661,7 +661,7 @@ struct aws_mqtt5_client_options {
     /**
      * IoT SDK metrics configuration
      */
-    const struct aws_mqtt_iot_sdk_metrics *metrics;
+    const struct aws_mqtt_iot_metrics *metrics;
 };
 
 AWS_EXTERN_C_BEGIN

source/v5/mqtt5_options_storage.c

@@ -11,7 +11,7 @@
 #include <aws/common/uuid.h>
 #include <aws/io/channel_bootstrap.h>
 #include <aws/io/event_loop.h>
-#include <aws/mqtt/private/mqtt_iot_sdk_metrics.h>
+#include <aws/mqtt/private/mqtt_iot_metrics.h>
 #include <aws/mqtt/private/v5/mqtt5_client_impl.h>
 #include <aws/mqtt/private/v5/mqtt5_utils.h>
 #include <aws/mqtt/v5/mqtt5_client.h>
@@ -3422,7 +3422,7 @@ int aws_mqtt5_client_options_validate(const struct aws_mqtt5_client_options *opt
     }
 
     if (options->metrics != NULL) {
-        if (aws_mqtt_validate_iot_sdk_metrics(options->metrics)) {
+        if (aws_mqtt_validate_iot_metrics(options->metrics)) {
             AWS_LOGF_ERROR(AWS_LS_MQTT5_GENERAL, "invalid metrics in mqtt5 client configuration");
             return aws_raise_error(AWS_ERROR_MQTT5_CONNECT_OPTIONS_VALIDATION);
         }
@@ -3786,7 +3786,7 @@ void aws_mqtt5_client_options_storage_destroy(struct aws_mqtt5_client_options_st
         aws_mem_release(options_storage->connect->allocator, options_storage->connect);
     }
 
-    aws_mqtt_iot_sdk_metrics_storage_destroy(options_storage->metrics_storage);
+    aws_mqtt_iot_metrics_storage_destroy(options_storage->metrics_storage);
     aws_mem_release(options_storage->allocator, options_storage);
 }
 
@@ -4000,7 +4000,7 @@ struct aws_mqtt5_client_options_storage *aws_mqtt5_client_options_storage_new(
             options_storage->max_reconnect_delay_ms, AWS_TIMESTAMP_MILLIS, AWS_TIMESTAMP_NANOS, NULL);
     }
 
-    options_storage->metrics_storage = aws_mqtt_iot_sdk_metrics_storage_new(allocator, options->metrics);
+    options_storage->metrics_storage = aws_mqtt_iot_metrics_storage_new(allocator, options->metrics);
 
     return options_storage;
 

tests/v5/mqtt5_client_tests.c

@@ -6658,7 +6658,7 @@ AWS_TEST_CASE(mqtt5_client_auto_assigned_client_id_iot_core, s_mqtt5_client_auto
  */
 static int s_mqtt5_client_metrics_in_username_fn(
     struct aws_allocator *allocator,
-    struct aws_mqtt_iot_sdk_metrics *metrics,
+    struct aws_mqtt_iot_metrics *metrics,
     void *ctx) {
     (void)ctx;
 
@@ -6769,7 +6769,7 @@ static int s_mqtt5_client_metrics_in_username_fn(
 }
 
 static int s_test_mqtt5_client_set_metrics_valid(struct aws_allocator *allocator, void *ctx) {
-    struct aws_mqtt_iot_sdk_metrics metrics = {
+    struct aws_mqtt_iot_metrics metrics = {
         .library_name = aws_byte_cursor_from_c_str("TestSDK/1.0")
         // TODO: enable when metadata is supported
         // .metadata_entries = NULL,

tests/v5/mqtt5_operation_validation_failure_tests.c

@@ -1182,7 +1182,7 @@ static void s_make_invalid_connect_client_options(struct aws_mqtt5_client_option
 
 AWS_CLIENT_CREATION_VALIDATION_FAILURE(invalid_connect, s_good_client_options, s_make_invalid_connect_client_options)
 
-static struct aws_mqtt_iot_sdk_metrics invalid_utf8_metrics = {
+static struct aws_mqtt_iot_metrics invalid_utf8_metrics = {
     .library_name = AWS_BYTE_CUR_INIT_FROM_STRING_LITERAL("TestSDK\xFF\xFE")};
 
 static void s_make_invalid_utf8_metrics(struct aws_mqtt5_client_options *options) {