add extended request id and bug fixes for CI

Author: Krish

include/aws/s3/private/s3_request.h

@@ -145,6 +145,8 @@ struct aws_s3_request_metrics {
         struct aws_string *host_address;
         /* The the request ID header value. */
         struct aws_string *request_id;
+        /* The the extended request ID header value. */
+        struct aws_string *amz_id_2;
         /* S3 operation name for the request */
         struct aws_string *operation_name;
         /* The type of request made */

source/s3_meta_request.c

@@ -1380,6 +1380,10 @@ static int s_s3_meta_request_incoming_headers(
         }
         if (request->send_data.amz_id_2 == NULL && aws_byte_cursor_eq(name, &g_amz_id_2_header_name)) {
             request->send_data.amz_id_2 = aws_string_new_from_cursor(connection->request->allocator, value);
+            if (collect_metrics) {
+                request->send_data.metrics->req_resp_info_metrics.amz_id_2 =
+                    aws_string_new_from_cursor(connection->request->allocator, value);
+            }
         }
         if (collect_metrics) {
             aws_http_headers_add(request->send_data.metrics->req_resp_info_metrics.response_headers, *name, *value);

source/s3_request.c

@@ -219,6 +219,7 @@ static void s_s3_request_metrics_destroy(void *arg) {
     aws_string_destroy(metrics->req_resp_info_metrics.request_path_query);
     aws_string_destroy(metrics->req_resp_info_metrics.host_address);
     aws_string_destroy(metrics->req_resp_info_metrics.request_id);
+    aws_string_destroy(metrics->req_resp_info_metrics.amz_id_2);
     aws_string_destroy(metrics->req_resp_info_metrics.operation_name);
     aws_string_destroy(metrics->crt_info_metrics.ip_address);
 

tests/s3_mock_server_tests.c

@@ -223,8 +223,7 @@ static int s_validate_mpu_mock_server_metrics(struct aws_array_list *metrics_lis
 static int s_validate_retry_metrics(
     struct aws_array_list *metrics_list,
     uint32_t expected_failures,
-    uint32_t parts,
-    struct aws_allocator *allocator) {
+    uint32_t parts) {
     struct aws_s3_request_metrics *metrics = NULL, *metrics2 = NULL;
 
     /* First metrics should be the CreateMPU */
@@ -365,7 +364,7 @@ TEST_CASE(multipart_upload_with_n_retries_mock_server) {
         ASSERT_SUCCESS(aws_s3_tester_send_meta_request_with_options(&tester, &put_options, &meta_request_test_results));
         uint32_t expected_failures = (uint32_t)(uintptr_t)tester.user_data - 1;
         ASSERT_SUCCESS(s_validate_retry_metrics(
-            &meta_request_test_results.synced_data.metrics, expected_failures, parts, allocator));
+            &meta_request_test_results.synced_data.metrics, expected_failures, parts));
 
         aws_s3_meta_request_test_results_clean_up(&meta_request_test_results);
     }

tests/s3_tester.h

@@ -141,7 +141,7 @@ struct aws_s3_tester_client_options {
     uint32_t setup_region : 1;
     uint32_t use_proxy : 1;
     aws_s3express_provider_factory_fn *s3express_provider_override_factory;
-    size_t max_active_connections_override;
+    uint32_t max_active_connections_override;
     void *factory_user_data;
 };