address review comments.

Author: Krish

include/aws/s3/private/s3_request.h

@@ -144,7 +144,7 @@ struct aws_s3_request_metrics {
         /* The host address of the request. */
         struct aws_string *host_address;
         /* The the request ID header value. */
-        struct aws_string *request_id;
+        struct aws_string *request_attempt_id;
         /* The the extended request ID header value. */
         struct aws_string *amz_id_2;
         /* S3 operation name for the request */
@@ -158,6 +158,8 @@ struct aws_s3_request_metrics {
         struct aws_string *ip_address;
         /* The pointer to the connection that request was made from */
         void *connection_id;
+        /* The pointer to the request that the request attempt was made from */
+        void *request_id;
         /* The aws_thread_id_t to the thread that request ran on */
         aws_thread_id_t thread_id;
         /* The stream-id, which is the idex when the stream was activated. */
@@ -183,10 +185,6 @@ struct aws_s3_request {
     /* Timestamp when retry attempt ended. Overwritten on each retry and copied to new attempt's setup data.
      * -1 means data not available. Timestamp from `aws_high_res_clock_get_ticks` */
     int64_t retry_end_timestamp_ns;
-    /* Time duration for retry attempt (retry_end_timestamp_ns - retry_start_timestamp_ns).
-     * Overwritten on each retry and copied to new attempt's setup data.
-     * When retry_end_timestamp_ns is -1, means data not available. */
-    int64_t retry_duration_ns;
 
     /* Linked list node used for tracking the request is active from HTTP level. */
     struct aws_linked_list_node cancellable_http_streams_list_node;

include/aws/s3/s3_client.h

@@ -1386,9 +1386,9 @@ struct aws_s3_request_metrics *aws_s3_request_metrics_release(struct aws_s3_requ
  * object.
  **/
 AWS_S3_API
-int aws_s3_request_metrics_get_request_id(
+int aws_s3_request_metrics_get_request_attempt_id(
     const struct aws_s3_request_metrics *metrics,
-    const struct aws_string **out_request_id);
+    const struct aws_string **out_request_attempt_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`  */
@@ -1568,6 +1568,10 @@ int aws_s3_request_metrics_get_ip_address(
 AWS_S3_API
 int aws_s3_request_metrics_get_connection_id(const struct aws_s3_request_metrics *metrics, size_t *out_connection_id);
 
+/* Get the pointer to the request that attempt was made from. Always available. */
+AWS_S3_API
+int aws_s3_request_metrics_get_request_id(const struct aws_s3_request_metrics *metrics, size_t *request_id);
+
 /* Get the thread ID of the thread that request was made from. AWS_ERROR_S3_METRIC_DATA_NOT_AVAILABLE will be raised if
  * data not available */
 AWS_S3_API

source/s3_request.c

@@ -37,7 +37,6 @@ struct aws_s3_request *aws_s3_request_new(
 
     request->retry_start_timestamp_ns = -1;
     request->retry_end_timestamp_ns = -1;
-    request->retry_duration_ns = -1;
 
     request->part_number = part_number;
     request->record_response_headers = (flags & AWS_S3_REQUEST_FLAG_RECORD_RESPONSE_HEADERS) != 0;
@@ -139,7 +138,12 @@ void aws_s3_request_setup_send_data(struct aws_s3_request *request, struct aws_h
     /* copy delay duration since previous attempt */
     request->send_data.metrics->time_metrics.retry_delay_start_timestamp_ns = request->retry_start_timestamp_ns;
     request->send_data.metrics->time_metrics.retry_delay_end_timestamp_ns = request->retry_end_timestamp_ns;
-    request->send_data.metrics->time_metrics.retry_delay_duration_ns = request->retry_duration_ns;
+    if (request->retry_end_timestamp_ns != -1) {
+        request->send_data.metrics->time_metrics.retry_delay_duration_ns = request->retry_end_timestamp_ns - request->retry_start_timestamp_ns;
+    }
+
+    /* set pointer to request */
+    request->send_data.metrics->crt_info_metrics.request_id = request;
 
     aws_http_message_acquire(message);
 }
@@ -218,7 +222,7 @@ static void s_s3_request_metrics_destroy(void *arg) {
     aws_http_headers_release(metrics->req_resp_info_metrics.response_headers);
     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.request_attempt_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);
@@ -291,15 +295,15 @@ struct aws_s3_request_metrics *aws_s3_request_metrics_release(struct aws_s3_requ
     return NULL;
 }
 
-int aws_s3_request_metrics_get_request_id(
+int aws_s3_request_metrics_get_request_attempt_id(
     const struct aws_s3_request_metrics *metrics,
-    const struct aws_string **out_request_id) {
+    const struct aws_string **out_request_attempt_id) {
     AWS_PRECONDITION(metrics);
-    AWS_PRECONDITION(out_request_id);
-    if (metrics->req_resp_info_metrics.request_id == NULL) {
+    AWS_PRECONDITION(out_request_attempt_id);
+    if (metrics->req_resp_info_metrics.request_attempt_id == NULL) {
         return aws_raise_error(AWS_ERROR_S3_METRIC_DATA_NOT_AVAILABLE);
     }
-    *out_request_id = metrics->req_resp_info_metrics.request_id;
+    *out_request_attempt_id = metrics->req_resp_info_metrics.request_attempt_id;
     return AWS_OP_SUCCESS;
 }
 
@@ -565,6 +569,18 @@ int aws_s3_request_metrics_get_connection_id(const struct aws_s3_request_metrics
     return AWS_OP_SUCCESS;
 }
 
+int aws_s3_request_metrics_get_request_id(
+    const struct aws_s3_request_metrics *metrics,
+    const struct aws_string **out_request_id) {
+    AWS_PRECONDITION(metrics);
+    AWS_PRECONDITION(out_request_id);
+    if (metrics->crt_info_metrics.request_id == NULL) {
+        return aws_raise_error(AWS_ERROR_S3_METRIC_DATA_NOT_AVAILABLE);
+    }
+    *out_request_id = metrics->crt_info_metrics.request_id;
+    return AWS_OP_SUCCESS;
+}
+
 int aws_s3_request_metrics_get_thread_id(const struct aws_s3_request_metrics *metrics, aws_thread_id_t *thread_id) {
     AWS_PRECONDITION(metrics);
     AWS_PRECONDITION(thread_id);