bugfix + lint

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,
@@ -1570,7 +1570,7 @@ int aws_s3_request_metrics_get_connection_id(const struct aws_s3_request_metrics
 
 /* 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);
+int aws_s3_request_metrics_get_request_id(const struct aws_s3_request_metrics *metrics, size_t *out_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 */

source/s3_client.c

@@ -2168,9 +2168,10 @@ void aws_s3_client_update_connections_threaded(struct aws_s3_client *client) {
              * request now and release it. */
             /* Update the error code for the metrics of the request here since we never acquire/release a connection */
             request->send_data.metrics->crt_info_metrics.error_code = AWS_ERROR_S3_CANCELED;
-            
+
             /* Record end times as well */
-            aws_high_res_clock_get_ticks((uint64_t *)&request->send_data.metrics->time_metrics.s3_request_last_attempt_end_timestamp_ns);
+            aws_high_res_clock_get_ticks(
+                (uint64_t *)&request->send_data.metrics->time_metrics.s3_request_last_attempt_end_timestamp_ns);
             request->send_data.metrics->time_metrics.s3_request_total_duration_ns =
                 request->send_data.metrics->time_metrics.s3_request_last_attempt_end_timestamp_ns -
                 request->send_data.metrics->time_metrics.s3_request_first_attempt_start_timestamp_ns;

source/s3_meta_request.c

@@ -1374,7 +1374,7 @@ static int s_s3_meta_request_incoming_headers(
         if (request->send_data.request_id == NULL && aws_byte_cursor_eq(name, &g_request_id_header_name)) {
             request->send_data.request_id = aws_string_new_from_cursor(connection->request->allocator, value);
             if (collect_metrics) {
-                request->send_data.metrics->req_resp_info_metrics.request_id =
+                request->send_data.metrics->req_resp_info_metrics.request_attempt_id =
                     aws_string_new_from_cursor(connection->request->allocator, value);
             }
         }

source/s3_request.c

@@ -139,7 +139,8 @@ void aws_s3_request_setup_send_data(struct aws_s3_request *request, struct aws_h
     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;
     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;
+        request->send_data.metrics->time_metrics.retry_delay_duration_ns =
+            request->retry_end_timestamp_ns - request->retry_start_timestamp_ns;
     }
 
     /* set pointer to request */
@@ -569,15 +570,10 @@ 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) {
+int aws_s3_request_metrics_get_request_id(const struct aws_s3_request_metrics *metrics, size_t *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;
+    *out_request_id = (size_t)metrics->crt_info_metrics.request_id;
     return AWS_OP_SUCCESS;
 }
 

tests/s3_mock_server_tests.c

@@ -245,9 +245,10 @@ static int s_validate_retry_metrics(struct aws_array_list *metrics_list, uint32_
     ASSERT_SUCCESS(s_validate_create_multipart_upload_metrics(metrics));
 
     /* All of the middle should be Upload Parts*/
-    /* This check assumes each request fails 'expected_failures' number of times and then succeeds. 
-     * So for each part, we would have expected_failures + 1 attempts. 
-     * We make sure all of the attempts have the same request_first_attempt_start_time and the last attempt has an end time. */
+    /* This check assumes each request fails 'expected_failures' number of times and then succeeds.
+     * So for each part, we would have expected_failures + 1 attempts.
+     * We make sure all of the attempts have the same request_first_attempt_start_time and the last attempt has an end
+     * time. */
     size_t failed_count = 0;
     for (size_t i = 1; i < aws_array_list_length(metrics_list) - 1; i = i + expected_failures + 1) {
         aws_array_list_get_at(metrics_list, &metrics, i);
@@ -283,18 +284,18 @@ static int s_validate_fail_metrics(struct aws_array_list *metrics_list, uint32_t
     aws_array_list_get_at(metrics_list, (void **)&metrics, 0);
     ASSERT_SUCCESS(s_validate_create_multipart_upload_metrics(metrics));
 
-    /* It is difficult to simulate forced failure and be precise about how a request fails if there are multiple connections. 
-     * Assuming, the first request itself is failing, all of the other parts are force cancelled. 
-     * If there are n parts, we would record n + 5 metrics. 5 retries for the first part alone. */
+    /* It is difficult to simulate forced failure and be precise about how a request fails if there are multiple
+     * connections. Assuming, the first request itself is failing, all of the other parts are force cancelled. If there
+     * are n parts, we would record n + 5 metrics. 5 retries for the first part alone. */
 
     /* First part fails 5 times */
     aws_array_list_get_at(metrics_list, &metrics, 1);
     ASSERT_TRUE(metrics->crt_info_metrics.error_code != AWS_ERROR_SUCCESS);
-    for(size_t i = 1; i < 6; i++) {
+    for (size_t i = 1; i < 6; i++) {
         aws_array_list_get_at(metrics_list, &metrics2, i + 1);
         ASSERT_INT_EQUALS(
-                metrics->time_metrics.s3_request_first_attempt_start_timestamp_ns,
-                metrics2->time_metrics.s3_request_first_attempt_start_timestamp_ns);
+            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(metrics2->crt_info_metrics.error_code != AWS_ERROR_SUCCESS);
         ASSERT_SUCCESS(s_validate_upload_part_metrics(metrics, false));
@@ -303,12 +304,12 @@ static int s_validate_fail_metrics(struct aws_array_list *metrics_list, uint32_t
     ASSERT_SUCCESS(s_validate_upload_part_metrics(metrics, true));
 
     /* Rest of the request should have been cancelled */
-    for(size_t i = 7; i < parts + 6; i++){
+    for (size_t i = 7; i < parts + 6; i++) {
         aws_array_list_get_at(metrics_list, &metrics, i);
         ASSERT_TRUE(metrics->crt_info_metrics.error_code == AWS_ERROR_S3_CANCELED);
         ASSERT_SUCCESS(s_validate_upload_part_metrics(metrics, true));
     }
-    
+
     /* Last metrics should be AbortMPU*/
     metrics = NULL;
     aws_array_list_get_at(metrics_list, (void **)&metrics, aws_array_list_length(metrics_list) - 1);
@@ -488,8 +489,7 @@ TEST_CASE(multipart_upload_failure_with_mock_server) {
         // check if number of metrics received for each part is n
         aws_s3_meta_request_test_results_init(&meta_request_test_results, allocator);
         ASSERT_SUCCESS(aws_s3_tester_send_meta_request_with_options(&tester, &put_options, &meta_request_test_results));
-        ASSERT_SUCCESS(
-            s_validate_fail_metrics(&meta_request_test_results.synced_data.metrics, parts));
+        ASSERT_SUCCESS(s_validate_fail_metrics(&meta_request_test_results.synced_data.metrics, parts));
 
         aws_s3_meta_request_test_results_clean_up(&meta_request_test_results);
     }