revert back to use aws_byte_cursor_find_exact

Author: xiazhvera

source/mqtt_iot_metrics.c

@@ -101,11 +101,15 @@ static int s_parse_delimited_entries(
         struct aws_uri_param entry_param;
         AWS_ZERO_STRUCT(entry_param);
 
+        /* Use a copy to avoid modifying entry_cursor which tracks iteration state */
+        struct aws_byte_cursor working_cursor = entry_cursor;
         struct aws_byte_cursor equals_pos;
-        if (aws_byte_cursor_find_exact(&entry_cursor, &equals_delim, &equals_pos) == AWS_OP_SUCCESS) {
-            entry_param.key.ptr = entry_cursor.ptr;
-            entry_param.key.len = equals_pos.ptr - entry_cursor.ptr;
-            entry_param.value = aws_byte_cursor_advance(&entry_cursor, entry_param.key.len + 1);
+        if (aws_byte_cursor_find_exact(&working_cursor, &equals_delim, &equals_pos) == AWS_OP_SUCCESS) {
+            size_t equals_offset = equals_pos.ptr - working_cursor.ptr;
+            entry_param.key = aws_byte_cursor_advance(&working_cursor, equals_offset);
+            /* Skip the "=" delimiter */
+            aws_byte_cursor_advance(&working_cursor, 1);
+            entry_param.value = working_cursor;
         } else {
             /* No equals sign, treat entire entry as key */
             entry_param.key = entry_cursor;

tests/shared_utils_tests.c

@@ -573,16 +573,18 @@ static int s_test_mqtt_append_sdk_metrics_existing_metadata(struct aws_allocator
 
     /* Username already contains SDK, Platform, and Metadata fields */
     struct aws_byte_cursor original_username = aws_byte_cursor_from_c_str(
-        "testuser?SDK=ExistingSDK&Platform=ExistingPlatform&Metadata=(ExistingKey=ExistingValue)");
+        "testuser?SDK=ExistingSDK&Platform=ExistingPlatform&Metadata=(ExistingKey1=ExistingValue1;ExistingKey2="
+        "ExistingValue2)");
 
     ASSERT_SUCCESS(
         aws_mqtt_append_sdk_metrics_to_username(allocator, &original_username, &metrics, &output_username, NULL));
 
     struct aws_byte_cursor output_cursor = aws_byte_cursor_from_buf(&output_username);
 
-    /* Verify the output contains merged metadata: (ExistingKey=ExistingValue;NewKey=NewValue) */
-    struct aws_byte_cursor merged_metadata =
-        aws_byte_cursor_from_c_str("Metadata=(ExistingKey=ExistingValue;NewKey=NewValue)");
+    /* Verify the output contains merged metadata:
+     * ((ExistingKey1=ExistingValue1;ExistingKey2=ExistingValue2;NewKey=NewValue) */
+    struct aws_byte_cursor merged_metadata = aws_byte_cursor_from_c_str(
+        "Metadata=(ExistingKey1=ExistingValue1;ExistingKey2=ExistingValue2;NewKey=NewValue)");
     struct aws_byte_cursor found;
 
     ASSERT_SUCCESS(aws_byte_cursor_find_exact(&output_cursor, &merged_metadata, &found));