Skip to content

Commit 1e0b295

Browse files
author
Krish
committed
lint changes
1 parent e1e402f commit 1e0b295

File tree

5 files changed

+21
-17
lines changed

5 files changed

+21
-17
lines changed

include/aws/s3/private/s3_request.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ struct aws_s3_request_metrics {
4444

4545
/* The total time duration for the complete request lifecycle from initial start to final completion,
4646
* including all retry attempts, backoff delays, and connection establishment time
47-
* (s3_request_last_attempt_end_timestamp_ns - s3_request_first_attempt_start_timestamp_ns). This represents the end-to-end user
48-
* experience time. This will be available with the last attempt. */
47+
* (s3_request_last_attempt_end_timestamp_ns - s3_request_first_attempt_start_timestamp_ns). This represents the
48+
* end-to-end user experience time. This will be available with the last attempt. */
4949
int64_t s3_request_total_duration_ns;
5050

5151
/* The time stamp when the request started by S3 client, which is prepared time by the client. Timestamps

source/s3_client.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2462,8 +2462,7 @@ void aws_s3_client_notify_connection_finished(
24622462
}
24632463

24642464
/* Ask the retry strategy to schedule a retry of the request. */
2465-
aws_high_res_clock_get_ticks(
2466-
(uint64_t *)&request->retry_start_timestamp_ns);
2465+
aws_high_res_clock_get_ticks((uint64_t *)&request->retry_start_timestamp_ns);
24672466
if (aws_retry_strategy_schedule_retry(
24682467
connection->retry_token, error_type, s_s3_client_retry_ready, connection)) {
24692468

@@ -2485,8 +2484,11 @@ void aws_s3_client_notify_connection_finished(
24852484

24862485
reset_connection:
24872486

2488-
aws_high_res_clock_get_ticks((uint64_t *)&request->send_data.metrics->time_metrics.s3_request_last_attempt_end_timestamp_ns);
2489-
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;
2487+
aws_high_res_clock_get_ticks(
2488+
(uint64_t *)&request->send_data.metrics->time_metrics.s3_request_last_attempt_end_timestamp_ns);
2489+
request->send_data.metrics->time_metrics.s3_request_total_duration_ns =
2490+
request->send_data.metrics->time_metrics.s3_request_last_attempt_end_timestamp_ns -
2491+
request->send_data.metrics->time_metrics.s3_request_first_attempt_start_timestamp_ns;
24902492

24912493
if (connection->retry_token != NULL) {
24922494
/* If we have a retry token and successfully finished, record that success. */

source/s3_meta_request.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1518,10 +1518,10 @@ static void s_s3_meta_request_stream_metrics(
15181518
s3_metrics->time_metrics.send_end_timestamp_ns = http_metrics->send_end_timestamp_ns;
15191519
s3_metrics->time_metrics.sending_duration_ns = http_metrics->sending_duration_ns;
15201520
s3_metrics->time_metrics.receive_start_timestamp_ns = http_metrics->receive_start_timestamp_ns;
1521-
1521+
15221522
if (s3_metrics->time_metrics.receive_start_timestamp_ns != -1) {
1523-
s3_metrics->time_metrics.service_call_duration_ns =
1524-
s3_metrics->time_metrics.receive_start_timestamp_ns - s3_metrics->time_metrics.conn_acquire_start_timestamp_ns;
1523+
s3_metrics->time_metrics.service_call_duration_ns = s3_metrics->time_metrics.receive_start_timestamp_ns -
1524+
s3_metrics->time_metrics.conn_acquire_start_timestamp_ns;
15251525
}
15261526

15271527
s3_metrics->time_metrics.receive_end_timestamp_ns = http_metrics->receive_end_timestamp_ns;

source/s3_request.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,8 @@ void aws_s3_request_setup_send_data(struct aws_s3_request *request, struct aws_h
121121

122122
// metrics persisted to the next request
123123
request->send_data.metrics->crt_info_metrics.retry_attempt = request->num_times_prepared;
124-
request->send_data.metrics->time_metrics.s3_request_first_attempt_start_timestamp_ns = first_attempt_start_timestamp_ns;
124+
request->send_data.metrics->time_metrics.s3_request_first_attempt_start_timestamp_ns =
125+
first_attempt_start_timestamp_ns;
125126
}
126127

127128
request->send_data.message = message;

tests/s3_mock_server_tests.c

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ static int s_validate_create_multipart_upload_metrics(struct aws_s3_request_metr
144144
ASSERT_UINT_EQUALS(AWS_ERROR_SUCCESS, aws_s3_request_metrics_get_error_code(metrics));
145145

146146
/* Get all those time stamp */
147-
ASSERT_SUCCESS(s_validate_time_metrics(metrics, true));
147+
ASSERT_SUCCESS(s_validate_time_metrics(metrics, true));
148148

149149
enum aws_s3_request_type request_type = 0;
150150
aws_s3_request_metrics_get_request_type(metrics, &request_type);
@@ -176,7 +176,7 @@ static int s_validate_upload_part_metrics(struct aws_s3_request_metrics *metrics
176176
ASSERT_SUCCESS(aws_s3_request_metrics_get_operation_name(metrics, &operation_name));
177177
ASSERT_STR_EQUALS("UploadPart", aws_string_c_str(operation_name));
178178

179-
ASSERT_SUCCESS(s_validate_time_metrics(metrics, is_last_attempt));
179+
ASSERT_SUCCESS(s_validate_time_metrics(metrics, is_last_attempt));
180180

181181
return AWS_OP_SUCCESS;
182182
}
@@ -231,18 +231,19 @@ static int s_validate_retry_metrics(
231231
aws_array_list_get_at(metrics_list, (void **)&metrics, 0);
232232
ASSERT_SUCCESS(s_validate_create_multipart_upload_metrics(metrics));
233233

234-
235234
/* All of the middle should be Upload Parts*/
236235
size_t failed_count = 0;
237-
for(size_t i = 1; i < aws_array_list_length(metrics_list) - 1; i = i + expected_failures + 1){
236+
for (size_t i = 1; i < aws_array_list_length(metrics_list) - 1; i = i + expected_failures + 1) {
238237
aws_array_list_get_at(metrics_list, &metrics, i);
239-
for(size_t j = i; j < i + expected_failures; j++){
240-
aws_array_list_get_at(metrics_list, &metrics2, j+1);
238+
for (size_t j = i; j < i + expected_failures; j++) {
239+
aws_array_list_get_at(metrics_list, &metrics2, j + 1);
241240
ASSERT_TRUE(metrics->crt_info_metrics.error_code != AWS_ERROR_SUCCESS);
242241
failed_count++;
243242
aws_array_list_get_at(metrics_list, (void **)&metrics, j);
244243
ASSERT_SUCCESS(s_validate_upload_part_metrics(metrics, false));
245-
ASSERT_INT_EQUALS(metrics->time_metrics.s3_request_first_attempt_start_timestamp_ns, metrics2->time_metrics.s3_request_first_attempt_start_timestamp_ns);
244+
ASSERT_INT_EQUALS(
245+
metrics->time_metrics.s3_request_first_attempt_start_timestamp_ns,
246+
metrics2->time_metrics.s3_request_first_attempt_start_timestamp_ns);
246247
ASSERT_INT_EQUALS(metrics->crt_info_metrics.retry_attempt + 1, metrics2->crt_info_metrics.retry_attempt);
247248
metrics = metrics2;
248249
}

0 commit comments

Comments
 (0)