maybe cleaner

Author: Krish

source/s3_request.c

@@ -90,7 +90,6 @@ void aws_s3_request_setup_send_data(struct aws_s3_request *request, struct aws_h
     /* If this is not the first time request is prepared, e.g. this is a retry,
      * send out previous metrics and reinitialize metrics structure.
      */
-    int64_t first_attempt_start_timestamp_ns = -1;
 
     if (request->num_times_prepared > 0 && request->send_data.metrics != NULL) {
         /* If there is a metrics from previous attempt, complete it now. */
@@ -110,6 +109,8 @@ void aws_s3_request_setup_send_data(struct aws_s3_request *request, struct aws_h
             aws_s3_meta_request_unlock_synced_data(meta_request);
         }
 
+        int64_t first_attempt_start_timestamp_ns = -1;
+
         /* retain the first attempt timestamp since we should not re-initialize it. */
         first_attempt_start_timestamp_ns = metric->time_metrics.s3_request_first_attempt_start_timestamp_ns;
 
@@ -130,7 +131,7 @@ void aws_s3_request_setup_send_data(struct aws_s3_request *request, struct aws_h
     aws_high_res_clock_get_ticks((uint64_t *)&request->send_data.metrics->time_metrics.start_timestamp_ns);
 
     /* Set s3 request start timestamp if first attempt*/
-    if (first_attempt_start_timestamp_ns == -1) {
+    if (request->send_data.metrics->time_metrics.s3_request_first_attempt_start_timestamp_ns == -1) {
         request->send_data.metrics->time_metrics.s3_request_first_attempt_start_timestamp_ns =
             request->send_data.metrics->time_metrics.start_timestamp_ns;
     }

tests/s3_mock_server_tests.c

@@ -292,7 +292,7 @@ static int s_validate_fail_metrics(struct aws_array_list *metrics_list, uint32_t
     aws_array_list_get_at(metrics_list, &metrics, 1);
     ASSERT_TRUE(metrics->crt_info_metrics.error_code != AWS_ERROR_SUCCESS);
     size_t request_ptr = (size_t)metrics->crt_info_metrics.request_ptr;
-    size_t request_start_time = metrics->time_metrics.s3_request_first_attempt_start_timestamp_ns;
+    int64_t request_start_time = metrics->time_metrics.s3_request_first_attempt_start_timestamp_ns;
     for (size_t i = 1; i < 6; i++) {
         aws_array_list_get_at(metrics_list, &metrics2, i + 1);
         ASSERT_INT_EQUALS(