fix the mem metrics logic

Author: TingDaoK

include/aws/s3/private/s3_request.h

@@ -122,6 +122,8 @@ struct aws_s3_request_metrics {
         int error_code;
         /* Retry attempt. */
         uint32_t retry_attempt;
+        /* Is the memory for the request allocated from the buffer pool or not. */
+        bool memory_allocated_from_pool;
     } crt_info_metrics;
 
     struct {

include/aws/s3/s3_client.h

@@ -1615,6 +1615,10 @@ int aws_s3_request_metrics_get_error_code(const struct aws_s3_request_metrics *m
 AWS_S3_API
 uint32_t aws_s3_request_metrics_get_retry_attempt(const struct aws_s3_request_metrics *metrics);
 
+/* Get the memory for the request allocated from the pool or not. Cannot fail */
+AWS_S3_API
+bool aws_s3_request_metrics_get_memory_allocated_from_pool(const struct aws_s3_request_metrics *metrics);
+
 /* Get the beginning range of this part from request metrics. */
 AWS_S3_API
 void aws_s3_request_metrics_get_part_range_start(

source/s3_client.c

@@ -1984,6 +1984,7 @@ void s_acquire_mem_and_prepare_request(
 
         if (request->send_data.metrics) {
             struct aws_s3_request_metrics *metric = request->send_data.metrics;
+            metric->crt_info_metrics.memory_allocated_from_pool = true;
             aws_high_res_clock_get_ticks((uint64_t *)&metric->time_metrics.mem_acquire_start_timestamp_ns);
         }
 

source/s3_request.c

@@ -596,3 +596,8 @@ void aws_s3_request_metrics_get_part_number(const struct aws_s3_request_metrics
     AWS_PRECONDITION(out_part_number);
     *out_part_number = metrics->part_info_metrics.part_number;
 }
+
+bool aws_s3_request_metrics_get_memory_allocated_from_pool(const struct aws_s3_request_metrics *metrics) {
+    AWS_PRECONDITION(metrics);
+    return metrics->crt_info_metrics.memory_allocated_from_pool;
+}

tests/s3_tester.c

@@ -247,12 +247,7 @@ static void s_s3_test_meta_request_telemetry(
         AWS_FATAL_ASSERT(during_time == (end_time - start_time));
     }
 
-    enum aws_s3_request_type request_type;
-    aws_s3_request_metrics_get_request_type(metrics, &request_type);
-    uint32_t retry_attempt = aws_s3_request_metrics_get_retry_attempt(metrics);
-
-    if (aws_s3_request_metrics_get_error_code(metrics) == AWS_ERROR_SUCCESS && retry_attempt == 0 &&
-        (request_type == AWS_S3_REQUEST_TYPE_GET_OBJECT || request_type == AWS_S3_REQUEST_TYPE_UPLOAD_PART)) {
+    if (aws_s3_request_metrics_get_memory_allocated_from_pool(metrics)) {
         uint64_t start_time = 0;
         uint64_t end_time = 0;
         uint64_t duration_time = 0;
@@ -582,12 +577,7 @@ void aws_s3_meta_request_test_results_clean_up(struct aws_s3_meta_request_test_r
         aws_s3_request_metrics_release(metrics);
     }
     aws_array_list_clean_up(&test_meta_request->synced_data.metrics);
-    while (aws_array_list_length(&test_meta_request->synced_data.succeed_metrics) > 0) {
-        struct aws_s3_request_metrics *metrics = NULL;
-        aws_array_list_back(&test_meta_request->synced_data.succeed_metrics, (void **)&metrics);
-        aws_array_list_pop_back(&test_meta_request->synced_data.succeed_metrics);
-        aws_s3_request_metrics_release(metrics);
-    }
+    /* We don't need to release the metrics from the succeed list, since it's already released from the main list. */
     aws_array_list_clean_up(&test_meta_request->synced_data.succeed_metrics);
 
     for (size_t i = 0; i < test_meta_request->upload_review.part_count; ++i) {