changed amz_id_2 to extended_request_id

Author: Krish

include/aws/s3/private/s3_request.h

@@ -146,7 +146,7 @@ struct aws_s3_request_metrics {
         /* The the request ID header value. */
         struct aws_string *request_id;
         /* The the extended request ID header value. */
-        struct aws_string *amz_id_2;
+        struct aws_string *extended_request_id;
         /* S3 operation name for the request */
         struct aws_string *operation_name;
         /* The type of request made */
@@ -303,7 +303,7 @@ struct aws_s3_request {
 
         /* Returned request ID of this request. */
         struct aws_string *request_id;
-        /* Returned amz ID 2 of this request. */
+        /* Returned extended request id of this request. */
         struct aws_string *amz_id_2;
 
         /* The metrics for the request telemetry */

include/aws/s3/s3_client.h

@@ -1393,13 +1393,13 @@ int aws_s3_request_metrics_get_request_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.
+ * If available, out_extended_request_id 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(
+int aws_s3_request_metrics_get_extended_request_id(
     const struct aws_s3_request_metrics *metrics,
-    const struct aws_string **out_amz_id_2);
+    const struct aws_string **out_extended_request_id);
 
 /* 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`  */
@@ -1574,10 +1574,10 @@ int aws_s3_request_metrics_get_ip_address(
     const struct aws_s3_request_metrics *metrics,
     const struct aws_string **out_ip_address);
 
-/* Get the id of connection that request was made from. AWS_ERROR_S3_METRIC_DATA_NOT_AVAILABLE will be raised if data
- * not available */
+/* Get the ptr address of connection that request was made from. AWS_ERROR_S3_METRIC_DATA_NOT_AVAILABLE will be raised
+ * if data not available */
 AWS_S3_API
-int aws_s3_request_metrics_get_connection_ptr(const struct aws_s3_request_metrics *metrics, size_t *out_connection_ptr);
+int aws_s3_request_metrics_get_connection_id(const struct aws_s3_request_metrics *metrics, size_t *out_connection_ptr);
 
 /* Get the pointer to the request that attempt was made from. Always available. */
 AWS_S3_API

source/s3_meta_request.c

@@ -1381,7 +1381,7 @@ 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 =
+                request->send_data.metrics->req_resp_info_metrics.extended_request_id =
                     aws_string_new_from_cursor(connection->request->allocator, value);
             }
         }

source/s3_request.c

@@ -225,7 +225,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.extended_request_id);
     aws_string_destroy(metrics->req_resp_info_metrics.operation_name);
     aws_string_destroy(metrics->crt_info_metrics.ip_address);
 
@@ -309,15 +309,15 @@ int aws_s3_request_metrics_get_request_id(
     return AWS_OP_SUCCESS;
 }
 
-int aws_s3_request_metrics_get_amz_id_2(
+int aws_s3_request_metrics_get_extended_request_id(
     const struct aws_s3_request_metrics *metrics,
-    const struct aws_string **out_amz_id_2) {
+    const struct aws_string **out_extended_request_id) {
     AWS_PRECONDITION(metrics);
-    AWS_PRECONDITION(out_amz_id_2);
-    if (metrics->req_resp_info_metrics.amz_id_2 == NULL) {
+    AWS_PRECONDITION(out_extended_request_id);
+    if (metrics->req_resp_info_metrics.extended_request_id == NULL) {
         return aws_raise_error(AWS_ERROR_S3_METRIC_DATA_NOT_AVAILABLE);
     }
-    *out_amz_id_2 = metrics->req_resp_info_metrics.amz_id_2;
+    *out_extended_request_id = metrics->req_resp_info_metrics.extended_request_id;
     return AWS_OP_SUCCESS;
 }
 
@@ -573,7 +573,7 @@ int aws_s3_request_metrics_get_ip_address(
     return AWS_OP_SUCCESS;
 }
 
-int aws_s3_request_metrics_get_connection_ptr(const struct aws_s3_request_metrics *metrics, size_t *connection_ptr) {
+int aws_s3_request_metrics_get_connection_id(const struct aws_s3_request_metrics *metrics, size_t *connection_ptr) {
     AWS_PRECONDITION(metrics);
     AWS_PRECONDITION(connection_ptr);
     if (metrics->crt_info_metrics.connection_ptr == NULL) {

tests/s3_mock_server_tests.c

@@ -6,7 +6,6 @@
 #include "aws/s3/private/s3_util.h"
 #include "aws/s3/s3_client.h"
 #include "s3_tester.h"
-#include <aws/common/hash_table.h>
 #include <aws/io/stream.h>
 #include <aws/io/uri.h>
 #include <aws/testing/aws_test_harness.h>
@@ -140,7 +139,7 @@ static int s_validate_create_multipart_upload_metrics(struct aws_s3_request_metr
     aws_thread_id_t thread_id = 0;
     ASSERT_SUCCESS(aws_s3_request_metrics_get_thread_id(metrics, &thread_id));
     size_t connection_ptr = 0;
-    ASSERT_SUCCESS(aws_s3_request_metrics_get_connection_ptr(metrics, &connection_ptr));
+    ASSERT_SUCCESS(aws_s3_request_metrics_get_connection_id(metrics, &connection_ptr));
     ASSERT_UINT_EQUALS(AWS_ERROR_SUCCESS, aws_s3_request_metrics_get_error_code(metrics));
 
     /* Get all those time stamp */
@@ -262,6 +261,7 @@ static int s_validate_retry_metrics(struct aws_array_list *metrics_list, uint32_
                 metrics->time_metrics.s3_request_first_attempt_start_timestamp_ns,
                 metrics2->time_metrics.s3_request_first_attempt_start_timestamp_ns);
             ASSERT_INT_EQUALS(metrics->crt_info_metrics.retry_attempt + 1, metrics2->crt_info_metrics.retry_attempt);
+            ASSERT_TRUE(metrics->crt_info_metrics.request_ptr == metrics2->crt_info_metrics.request_ptr);
             metrics = metrics2;
         }
         ASSERT_SUCCESS(s_validate_upload_part_metrics(metrics, true));
@@ -473,7 +473,6 @@ TEST_CASE(multipart_upload_failure_with_mock_server) {
 
     struct aws_byte_cursor object_path = aws_byte_cursor_from_c_str("/default");
     {
-        /* 1. Trailer checksum */
         struct aws_s3_tester_meta_request_options put_options = {
             .allocator = allocator,
             .meta_request_type = AWS_S3_META_REQUEST_TYPE_PUT_OBJECT,