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

Author: xiazhvera

include/aws/mqtt/private/mqtt_iot_sdk_metrics.h

@@ -6,12 +6,10 @@
 #ifndef AWS_MQTT_IOT_SDK_METRICS_H
 #define AWS_MQTT_IOT_SDK_METRICS_H
 
-/* IoT SDK Metrics */
+/* Storage for `aws_mqtt_iot_sdk_metrics`. */
 struct aws_mqtt_iot_sdk_metrics_storage {
     struct aws_allocator *allocator;
 
-    struct aws_mqtt_iot_sdk_metrics storage_view;
-
     struct aws_array_list metadata_entries;
 
     struct aws_byte_cursor library_name;
@@ -23,15 +21,13 @@ AWS_MQTT_API struct aws_mqtt_iot_sdk_metrics_storage *aws_mqtt_iot_sdk_metrics_s
     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_destroy(struct aws_mqtt_iot_sdk_metrics_storage *metrics_storage);
 
 /**
  * Appends SDK metrics to the username
  *
  * @param original_username The original username
- * @param metrics The metrics configuration
+ * @param metrics_storage The metrics configuration
  * @param output_username Buffer to store the modified username. If the function succeed, caller is responsible to
  * release the memory for output_username.
  * @param out_full_username_size If not NULL, will be set to the full size of the username with metrics appended
@@ -42,17 +38,17 @@ AWS_MQTT_API
 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,
+    const struct aws_mqtt_iot_sdk_metrics_storage *metrics_storage,
     struct aws_byte_buf *output_username,
     size_t *out_full_username_size);
 
 /**
- * Validates that all string fields in aws_mqtt_iot_sdk_metrics are valid UTF-8
+ * Validates that all string fields in aws_mqtt_iot_sdk_metrics
  *
  * @param metrics The metrics structure to validate
- * @return AWS_OP_SUCCESS if all strings are valid UTF-8, AWS_OP_ERR otherwise
+ * @return AWS_OP_SUCCESS if all strings are valid, AWS_OP_ERR otherwise
  */
 AWS_MQTT_API
-int aws_mqtt_validate_iot_sdk_metrics_utf8(const struct aws_mqtt_iot_sdk_metrics *metrics);
+int aws_mqtt_validate_iot_sdk_metrics(const struct aws_mqtt_iot_sdk_metrics *metrics);
 
 #endif /* AWS_MQTT_IOT_SDK_METRICS_H */

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

@@ -138,7 +138,6 @@ struct aws_mqtt5_operation_pingreq {
 
 struct aws_mqtt5_client_options_storage {
     struct aws_allocator *allocator;
-    struct aws_mqtt5_client_options options;
 
     struct aws_string *host_name;
     uint32_t port;
@@ -220,7 +219,7 @@ AWS_MQTT_API uint32_t aws_mqtt5_operation_get_ack_timeout_override(const struct
 AWS_MQTT_API struct aws_mqtt5_operation_connect *aws_mqtt5_operation_connect_new(
     struct aws_allocator *allocator,
     const struct aws_mqtt5_packet_connect_view *connect_options,
-    const struct aws_mqtt5_client_options *client_config);
+    const struct aws_mqtt5_client_options_storage *option_storage);
 
 AWS_MQTT_API int aws_mqtt5_packet_connect_view_validate(const struct aws_mqtt5_packet_connect_view *connect_view);
 

include/aws/mqtt/v5/mqtt5_packet_storage.h

@@ -12,7 +12,7 @@
 
 AWS_PUSH_SANE_WARNING_LEVEL
 
-struct aws_mqtt5_client_options;
+struct aws_mqtt5_client_options_storage;
 
 struct aws_mqtt5_user_property_set {
     struct aws_array_list properties;
@@ -212,7 +212,7 @@ AWS_MQTT_API int aws_mqtt5_packet_connect_storage_init(
     struct aws_mqtt5_packet_connect_storage *connect_storage,
     struct aws_allocator *allocator,
     const struct aws_mqtt5_packet_connect_view *connect_options,
-    const struct aws_mqtt5_client_options *client_options);
+    const struct aws_mqtt5_client_options_storage *options_storage);
 
 AWS_MQTT_API int aws_mqtt5_packet_connect_storage_init_from_external_storage(
     struct aws_mqtt5_packet_connect_storage *connect_storage,

source/client.c

@@ -637,7 +637,7 @@ static void s_mqtt_client_init(
         if (aws_mqtt_append_sdk_metrics_to_username(
                 connection->allocator,
                 &username_cur,
-                connection->metrics_storage ? &connection->metrics_storage->storage_view : NULL,
+                connection->metrics_storage ? connection->metrics_storage : NULL,
                 &username_with_metrics_buf,
                 NULL) == AWS_OP_SUCCESS) {
             username_cur = aws_byte_cursor_from_buf(&username_with_metrics_buf);
@@ -646,22 +646,24 @@ static void s_mqtt_client_init(
                 AWS_LS_MQTT_CLIENT, "id=%p: Failed to apply metrics to username, using original", (void *)connection);
         }
 
-        AWS_LOGF_DEBUG(
-            AWS_LS_MQTT_CLIENT,
-            "id=%p: Adding username " PRInSTR " to connection",
-            (void *)connection,
-            AWS_BYTE_CURSOR_PRI(username_cur));
+        if (aws_byte_cursor_is_valid(&username_cur)) {
+            AWS_LOGF_DEBUG(
+                AWS_LS_MQTT_CLIENT,
+                "id=%p: Adding username " PRInSTR " to connection",
+                (void *)connection,
+                AWS_BYTE_CURSOR_PRI(username_cur));
 
-        struct aws_byte_cursor password_cur = {
-            .ptr = NULL,
-            .len = 0,
-        };
+            struct aws_byte_cursor password_cur = {
+                .ptr = NULL,
+                .len = 0,
+            };
 
-        if (connection->password) {
-            password_cur = aws_byte_cursor_from_string(connection->password);
-        }
+            if (connection->password) {
+                password_cur = aws_byte_cursor_from_string(connection->password);
+            }
 
-        aws_mqtt_packet_connect_add_credentials(&connect, username_cur, password_cur);
+            aws_mqtt_packet_connect_add_credentials(&connect, username_cur, password_cur);
+        }
     }
 
     message = mqtt_get_message_for_packet(connection, &connect.fixed_header);
@@ -3384,7 +3386,7 @@ static int s_aws_mqtt_client_connection_311_set_metrics(void *impl, const struct
         return aws_raise_error(AWS_ERROR_INVALID_STATE);
     }
 
-    if (metrics != NULL && aws_mqtt_validate_iot_sdk_metrics_utf8(metrics) == AWS_OP_ERR) {
+    if (metrics != NULL && aws_mqtt_validate_iot_sdk_metrics(metrics) == AWS_OP_ERR) {
         AWS_LOGF_ERROR(
             AWS_LS_MQTT_CLIENT, "id=%p: Invalid utf8 or forbidden codepoints in metrics.", (void *)connection);
         return aws_raise_error(AWS_ERROR_INVALID_UTF8);

source/mqtt_iot_sdk_metrics.c

@@ -78,7 +78,7 @@ int s_build_username_query(
 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,
+    const struct aws_mqtt_iot_sdk_metrics_storage *metrics_storage,
     struct aws_byte_buf *output_username,
     size_t *out_full_username_size) {
 
@@ -88,7 +88,7 @@ int aws_mqtt_append_sdk_metrics_to_username(
     const struct aws_byte_cursor local_original_username =
         original_username == NULL ? aws_byte_cursor_from_c_str("") : *original_username;
 
-    if (!metrics) {
+    if (!metrics_storage) {
         if (out_full_username_size) {
             *out_full_username_size = local_original_username.len;
         }
@@ -100,10 +100,6 @@ int aws_mqtt_append_sdk_metrics_to_username(
         return AWS_OP_SUCCESS;
     }
 
-    if (aws_mqtt_validate_iot_sdk_metrics_utf8(metrics)) {
-        return AWS_OP_ERR;
-    }
-
     int result = AWS_OP_ERR;
     // The length of the base username part not including query parameters
     size_t base_username_length = 0;
@@ -153,8 +149,8 @@ int aws_mqtt_append_sdk_metrics_to_username(
     if (!found_sdk) {
         struct aws_uri_param sdk_params = {
             .key = sdk_str,
-            .value =
-                metrics->library_name.len > 0 ? metrics->library_name : aws_byte_cursor_from_c_str("IoTDeviceSDK/C"),
+            .value = metrics_storage->library_name.len > 0 ? metrics_storage->library_name
+                                                           : aws_byte_cursor_from_c_str("IoTDeviceSDK/C"),
         };
         aws_array_list_push_back(&params_list, &sdk_params);
     }
@@ -240,14 +236,11 @@ struct aws_mqtt_iot_sdk_metrics_storage *aws_mqtt_iot_sdk_metrics_storage_new(
 
     metrics_storage->allocator = allocator;
 
-    struct aws_mqtt_iot_sdk_metrics *storage_view = &metrics_storage->storage_view;
-
     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 cleanup_storage;
         }
-        storage_view->library_name = metrics_storage->library_name;
     }
 
     return metrics_storage;
@@ -280,7 +273,7 @@ void aws_mqtt_iot_sdk_metrics_storage_destroy(struct aws_mqtt_iot_sdk_metrics_st
     aws_mem_release(metrics_storage->allocator, metrics_storage);
 }
 
-int aws_mqtt_validate_iot_sdk_metrics_utf8(const struct aws_mqtt_iot_sdk_metrics *metrics) {
+int aws_mqtt_validate_iot_sdk_metrics(const struct aws_mqtt_iot_sdk_metrics *metrics) {
     if (metrics == NULL) {
         return AWS_OP_SUCCESS;
     }

source/v5/mqtt5_client.c

@@ -1175,7 +1175,7 @@ static void s_change_current_state_to_mqtt_connect(struct aws_mqtt5_client *clie
     connect_view.client_id = aws_byte_cursor_from_buf(&client->negotiated_settings.client_id_storage);
 
     struct aws_mqtt5_operation_connect *connect_op =
-        aws_mqtt5_operation_connect_new(client->allocator, &connect_view, &client->config->options);
+        aws_mqtt5_operation_connect_new(client->allocator, &connect_view, client->config);
     if (connect_op == NULL) {
         int error_code = aws_last_error();
         AWS_LOGF_ERROR(