rename in tests and add amz_id_2 getter.

Author: Krish

include/aws/s3/s3_client.h

@@ -262,7 +262,7 @@ typedef void(aws_s3_client_shutdown_complete_callback_fn)(void *user_data);
  *         https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutObject.html#API_PutObject_RequestSyntax
  *         If an error occurs, call aws_raise_error(E) with a proper error code and return NULL.
  */
-typedef struct aws_string *(aws_s3_meta_request_full_object_checksum_fn)(struct aws_s3_meta_request *meta_request,
+typedef struct aws_string *(aws_s3_meta_request_full_object_checksum_fn)(struct aws_s3_meta_request * meta_request,
                                                                          void *user_data);
 
 enum aws_s3_meta_request_tls_mode {
@@ -429,7 +429,7 @@ typedef int(aws_s3_meta_request_upload_review_fn)(
  * @return The aws_s3express_credentials_provider.
  */
 typedef struct aws_s3express_credentials_provider *(
-    aws_s3express_provider_factory_fn)(struct aws_allocator *allocator,
+    aws_s3express_provider_factory_fn)(struct aws_allocator * allocator,
                                        struct aws_s3_client *client,
                                        aws_simple_completion_callback on_provider_shutdown_callback,
                                        void *shutdown_user_data,
@@ -1390,6 +1390,17 @@ int aws_s3_request_metrics_get_request_attempt_id(
     const struct aws_s3_request_metrics *metrics,
     const struct aws_string **out_request_attempt_id);
 
+/**
+ * Get the extended request ID from aws_s3_request_metrics.
+ * If unavailable, AWS_ERROR_S3_METRIC_DATA_NOT_AVAILABLE will be raised.
+ * If available, out_amz_id_2 will be set to a string. Be warned this string's lifetime is tied to the metrics
+ * object.
+ **/
+AWS_S3_API
+int aws_s3_request_metrics_get_amz_id_2(
+    const struct aws_s3_request_metrics *metrics,
+    const struct aws_string **out_amz_id_2);
+
 /* Get the start time from aws_s3_request_metrics, which is when S3 client prepare the request to be sent. Always
  * available. Timestamp are from `aws_high_res_clock_get_ticks`  */
 AWS_S3_API

source/s3_request.c

@@ -308,6 +308,18 @@ int aws_s3_request_metrics_get_request_attempt_id(
     return AWS_OP_SUCCESS;
 }
 
+int aws_s3_request_metrics_get_amz_id_2(
+    const struct aws_s3_request_metrics *metrics,
+    const struct aws_string **out_amz_id_2) {
+    AWS_PRECONDITION(metrics);
+    AWS_PRECONDITION(out_amz_id_2);
+    if (metrics->req_resp_info_metrics.amz_id_2 == NULL) {
+        return aws_raise_error(AWS_ERROR_S3_METRIC_DATA_NOT_AVAILABLE);
+    }
+    *out_amz_id_2 = metrics->req_resp_info_metrics.amz_id_2;
+    return AWS_OP_SUCCESS;
+}
+
 void aws_s3_request_metrics_get_start_timestamp_ns(const struct aws_s3_request_metrics *metrics, uint64_t *start_time) {
     AWS_PRECONDITION(metrics);
     AWS_PRECONDITION(start_time);

tests/s3_mock_server_tests.c

@@ -118,9 +118,9 @@ static int s_validate_time_metrics(struct aws_s3_request_metrics *metrics, bool
 static int s_validate_create_multipart_upload_metrics(struct aws_s3_request_metrics *metrics) {
     struct aws_http_headers *response_headers = NULL;
     ASSERT_SUCCESS(aws_s3_request_metrics_get_response_headers(metrics, &response_headers));
-    const struct aws_string *request_id = NULL;
-    ASSERT_SUCCESS(aws_s3_request_metrics_get_request_attempt_id(metrics, &request_id));
-    ASSERT_TRUE(aws_string_eq_c_str(request_id, "12345"));
+    const struct aws_string *request_attempt_id = NULL;
+    ASSERT_SUCCESS(aws_s3_request_metrics_get_request_attempt_id(metrics, &request_attempt_id));
+    ASSERT_TRUE(aws_string_eq_c_str(request_attempt_id, "12345"));
     const struct aws_string *ip_address = NULL;
     ASSERT_SUCCESS(aws_s3_request_metrics_get_ip_address(metrics, &ip_address));
     /* Should be default local ip for ipv6/ipv4 */