rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-01-04 12:02:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(proxy): Use correct identifier for usage metrics upload (#10538)

Browse Source 
## Problem

The request data and usage metrics S3 requests use the same identifier
shown in logs, causing confusion about what type of upload failed.

## Summary of changes

Use the correct identifier for usage metrics uploads.

neondatabase/cloud#23084
This commit is contained in:
Folke Behrens
2025-01-28 18:08:17 +01:00
committed by GitHub
parent 15fecb8474
commit ae4b2af299
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
proxy/src/context/parquet.rs
View File

@@ -423,11 +423,11 @@ async fn upload_parquet(
.await
.ok_or_else(|| anyhow::Error::new(TimeoutOrCancel::Cancel))
.and_then(|x| x)
.context("request_data_upload")
.with_context(|| format!("request_data_upload: path={path}"))
.err();
if let Some(err) = maybe_err {
tracing::error!(%id, error = ?err, "failed to upload request data");
tracing::error!(%id, %path, error = ?err, "failed to upload request data");
}
Ok(buffer.writer())

4
proxy/src/usage_metrics.rs
View File

@@ -396,13 +396,13 @@ async fn upload_backup_events(
TimeoutOrCancel::caused_by_cancel,
FAILED_UPLOAD_WARN_THRESHOLD,
FAILED_UPLOAD_MAX_RETRIES,
"request_data_upload",
"usage_metrics_upload",
cancel,
)
.await
.ok_or_else(|| anyhow::Error::new(TimeoutOrCancel::Cancel))
.and_then(|x| x)
.context("request_data_upload")?;
.with_context(|| format!("usage_metrics_upload: path={remote_path}"))?;
Ok(())
}