Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add CRT error to CRT request logs, move CRT per-request logs to DEBUG #669

Merged
merged 3 commits into from
Dec 8, 2023
Merged

Add CRT error to CRT request logs, move CRT per-request logs to DEBUG #669

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d862417
Add CRT error to underlying request log entries
dannycjones Dec 6, 2023
7111118
Merge branch 'main' into add-crt-err-underlying-req
dannycjones Dec 7, 2023
0f8118c
Move all CRT request logging to debug even on error
dannycjones Dec 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions mountpoint-s3-client/src/s3_crt_client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,23 +447,22 @@ impl S3CrtClientInner {
.on_telemetry(move |metrics| {
let _guard = span_telemetry.enter();

let http_status = metrics.status_code().unwrap_or(-1);
let request_failure = !(200..299).contains(&http_status);
let http_status = metrics.status_code();
let request_failure = http_status.map(|status| !(200..299).contains(&status)).unwrap_or(true);
let crt_error = Some(metrics.error()).filter(|e| e.is_err());
let request_type = request_type_to_metrics_string(metrics.request_type());
let request_id = metrics.request_id().unwrap_or_else(|| "<unknown>".into());
let duration = metrics.total_duration();
let ttfb = metrics.time_to_first_byte();
let range = metrics.response_headers().and_then(|headers| extract_range_header(&headers));

let log_level = status_code_to_log_level(http_status);

let message = if request_failure {
"request failed"
"CRT request failed"
} else {
"request finished"
"CRT request finished"
};
event!(log_level, %request_type, http_status, ?range, ?duration, ?ttfb, %request_id, "{}", message);
trace!(detailed_metrics=?metrics, "request completed");
debug!(%request_type, ?crt_error, http_status, ?range, ?duration, ?ttfb, %request_id, "{}", message);
trace!(detailed_metrics=?metrics, "CRT request completed");
Comment on lines +460 to +465
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's just bikeshedding but i don't think "CRT request" is the right way to describe these. it's an S3 request that failed. if we're going to push these down to debug level, i don't see the need to also write "CRT" here.


let op = span_telemetry.metadata().map(|m| m.name()).unwrap_or("unknown");
if let Some(ttfb) = ttfb {
Expand All @@ -472,7 +471,7 @@ impl S3CrtClientInner {
metrics::histogram!("s3.requests.total_latency_us", duration.as_micros() as f64, "op" => op, "type" => request_type);
metrics::counter!("s3.requests", 1, "op" => op, "type" => request_type);
if request_failure {
metrics::counter!("s3.requests.failures", 1, "op" => op, "type" => request_type, "status" => format!("{http_status}"));
metrics::counter!("s3.requests.failures", 1, "op" => op, "type" => request_type, "status" => http_status.unwrap_or(-1).to_string());
}
})
.on_headers(move |headers, response_status| {
Expand Down
Loading