gsadmin/rustfs
1
0
Fork 0
mirror of https://github.com/rustfs/rustfs.git synced 2026-08-24 21:26:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: add hotpath observability for S3 data paths (#5860)

Browse Source
This commit is contained in:
houseme
2026-08-09 16:36:58 +08:00
committed by GitHub
parent f72ad77aa4
commit 2c7d0fb2ce
5 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/actions/setup/action.yml
+2 -2
View File
@@ -57,7 +57,7 @@ runs:
using: "composite" using: "composite"
steps: steps:
# protobuf-compiler is deliberately absent: the setup-protoc step below # protobuf-compiler is deliberately absent: the setup-protoc step below
# installs 34.1 into the tool cache and prepends it to PATH, so the apt # installs 35.1 into the tool cache and prepends it to PATH, so the apt
# build (older, and never version-matched) was shadowed on every run and # build (older, and never version-matched) was shadowed on every run and
# simply never used. # simply never used.
- name: Install system dependencies (Ubuntu) - name: Install system dependencies (Ubuntu)
@@ -81,7 +81,7 @@ runs:
- name: Install protoc - name: Install protoc
uses: rustfs/setup-protoc@a3705324d8f9bf5b6c3573fb6cf8ae421db55dd6 # v3.0.1 uses: rustfs/setup-protoc@a3705324d8f9bf5b6c3573fb6cf8ae421db55dd6 # v3.0.1
with: with:
version: "34.1" version: "35.1"
repo-token: ${{ github.token }} repo-token: ${{ github.token }}
- name: Install flatc - name: Install flatc
Cargo.lock
Generated
+11 -11
View File
@@ -4022,7 +4022,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
dependencies = [ dependencies = [
"libc", "libc",
"windows-sys 0.52.0", "windows-sys 0.61.2",
] ]
[[package]] [[package]]
@@ -5468,7 +5468,7 @@ checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46"
dependencies = [ dependencies = [
"hermit-abi", "hermit-abi",
"libc", "libc",
"windows-sys 0.52.0", "windows-sys 0.61.2",
] ]
[[package]] [[package]]
@@ -7963,7 +7963,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "be769465445e8c1474e9c5dac2018218498557af32d9ed057325ec9a41ae81bf" checksum = "be769465445e8c1474e9c5dac2018218498557af32d9ed057325ec9a41ae81bf"
dependencies = [ dependencies = [
"heck", "heck",
"itertools 0.10.5", "itertools 0.14.0",
"log", "log",
"multimap", "multimap",
"once_cell", "once_cell",
@@ -7983,7 +7983,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "03da047801ff44bb6a4d407d4860c05fd70bb81714e6b2f3812603d5b145b042" checksum = "03da047801ff44bb6a4d407d4860c05fd70bb81714e6b2f3812603d5b145b042"
dependencies = [ dependencies = [
"heck", "heck",
"itertools 0.10.5", "itertools 0.14.0",
"log", "log",
"multimap", "multimap",
"petgraph 0.8.3", "petgraph 0.8.3",
@@ -8004,7 +8004,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d" checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"itertools 0.10.5", "itertools 0.14.0",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.119", "syn 2.0.119",
@@ -8017,7 +8017,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b570b25f7617e43d59005d0990ccb79e950a423952cea19671b7a876da390adf" checksum = "b570b25f7617e43d59005d0990ccb79e950a423952cea19671b7a876da390adf"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"itertools 0.10.5", "itertools 0.14.0",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.119", "syn 2.0.119",
@@ -8234,7 +8234,7 @@ dependencies = [
"once_cell", "once_cell",
"socket2", "socket2",
"tracing", "tracing",
"windows-sys 0.52.0", "windows-sys 0.61.2",
] ]
[[package]] [[package]]
@@ -10459,7 +10459,7 @@ dependencies = [
"errno", "errno",
"libc", "libc",
"linux-raw-sys", "linux-raw-sys",
"windows-sys 0.52.0", "windows-sys 0.61.2",
] ]
[[package]] [[package]]
@@ -10532,7 +10532,7 @@ dependencies = [
"security-framework", "security-framework",
"security-framework-sys", "security-framework-sys",
"webpki-root-certs", "webpki-root-certs",
"windows-sys 0.52.0", "windows-sys 0.61.2",
] ]
[[package]] [[package]]
@@ -11741,7 +11741,7 @@ dependencies = [
"getrandom 0.4.3", "getrandom 0.4.3",
"once_cell", "once_cell",
"rustix", "rustix",
"windows-sys 0.52.0", "windows-sys 0.61.2",
] ]
[[package]] [[package]]
@@ -12843,7 +12843,7 @@ version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
dependencies = [ dependencies = [
"windows-sys 0.52.0", "windows-sys 0.61.2",
] ]
[[package]] [[package]]
crates/ecstore/src/object_api/readers.rs
+1
View File
@@ -894,6 +894,7 @@ impl GetObjectReader {
.await? .await?
.into_reader(reader, oi) .into_reader(reader, oi)
} }
#[hotpath::measure(impl_type = "GetObjectReader")]
pub async fn read_all(&mut self) -> Result<Vec<u8>> { pub async fn read_all(&mut self) -> Result<Vec<u8>> {
let mut data = Vec::new(); let mut data = Vec::new();
self.stream.read_to_end(&mut data).await?; self.stream.read_to_end(&mut data).await?;
rustfs/src/app/multipart_usecase.rs
+4
View File
@@ -382,6 +382,7 @@ impl DefaultMultipartUsecase {
} }
#[instrument(level = "debug", skip(self, req))] #[instrument(level = "debug", skip(self, req))]
#[hotpath::measure(impl_type = "MultipartUsecase")]
pub async fn execute_complete_multipart_upload( pub async fn execute_complete_multipart_upload(
&self, &self,
req: S3Request<CompleteMultipartUploadInput>, req: S3Request<CompleteMultipartUploadInput>,
@@ -664,6 +665,7 @@ impl DefaultMultipartUsecase {
} }
#[instrument(level = "debug", skip(self, req))] #[instrument(level = "debug", skip(self, req))]
#[hotpath::measure(impl_type = "MultipartUsecase")]
pub async fn execute_create_multipart_upload( pub async fn execute_create_multipart_upload(
&self, &self,
req: S3Request<CreateMultipartUploadInput>, req: S3Request<CreateMultipartUploadInput>,
@@ -845,6 +847,7 @@ impl DefaultMultipartUsecase {
} }
#[instrument(level = "debug", skip(self, req))] #[instrument(level = "debug", skip(self, req))]
#[hotpath::measure(impl_type = "MultipartUsecase")]
pub async fn execute_upload_part(&self, req: S3Request<UploadPartInput>) -> S3Result<S3Response<UploadPartOutput>> { pub async fn execute_upload_part(&self, req: S3Request<UploadPartInput>) -> S3Result<S3Response<UploadPartOutput>> {
let mut opts = ObjectOptions::default(); let mut opts = ObjectOptions::default();
apply_bucket_generation_guard(&req, &req.input.bucket, &mut opts)?; apply_bucket_generation_guard(&req, &req.input.bucket, &mut opts)?;
@@ -1180,6 +1183,7 @@ impl DefaultMultipartUsecase {
} }
#[instrument(level = "debug", skip(self, req))] #[instrument(level = "debug", skip(self, req))]
#[hotpath::measure(impl_type = "MultipartUsecase")]
pub async fn execute_upload_part_copy( pub async fn execute_upload_part_copy(
&self, &self,
req: S3Request<UploadPartCopyInput>, req: S3Request<UploadPartCopyInput>,
rustfs/src/app/object_usecase.rs
+3
View File
@@ -5319,6 +5319,7 @@ impl DefaultObjectUsecase {
} }
#[instrument(level = "info", skip(self, _fs, req))] #[instrument(level = "info", skip(self, _fs, req))]
#[hotpath::measure(impl_type = "DefaultObjectUsecase")]
pub async fn execute_put_object(&self, _fs: &FS, req: S3Request<PutObjectInput>) -> S3Result<S3Response<PutObjectOutput>> { pub async fn execute_put_object(&self, _fs: &FS, req: S3Request<PutObjectInput>) -> S3Result<S3Response<PutObjectOutput>> {
let start_time = std::time::Instant::now(); let start_time = std::time::Instant::now();
let mut req = req; let mut req = req;
@@ -6258,6 +6259,7 @@ impl DefaultObjectUsecase {
skip(self, req), skip(self, req),
fields(start_time=?time::OffsetDateTime::now_utc()) fields(start_time=?time::OffsetDateTime::now_utc())
)] )]
#[hotpath::measure(impl_type = "DefaultObjectUsecase")]
pub async fn execute_get_object(&self, req: S3Request<GetObjectInput>) -> S3Result<S3Response<GetObjectOutput>> { pub async fn execute_get_object(&self, req: S3Request<GetObjectInput>) -> S3Result<S3Response<GetObjectOutput>> {
if let Some(context) = &self.context { if let Some(context) = &self.context {
let _ = context.object_store(); let _ = context.object_store();
@@ -8790,6 +8792,7 @@ impl DefaultObjectUsecase {
} }
#[instrument(level = "debug", skip(self, req))] #[instrument(level = "debug", skip(self, req))]
#[hotpath::measure(impl_type = "DefaultObjectUsecase")]
pub async fn execute_put_object_extract(&self, req: S3Request<PutObjectInput>) -> S3Result<S3Response<PutObjectOutput>> { pub async fn execute_put_object_extract(&self, req: S3Request<PutObjectInput>) -> S3Result<S3Response<PutObjectOutput>> {
let helper = OperationHelper::new(&req, EventName::ObjectCreatedPut, S3Operation::PutObject).suppress_event(); let helper = OperationHelper::new(&req, EventName::ObjectCreatedPut, S3Operation::PutObject).suppress_event();
let request_context = helper.request_context_or_from_request(&req); let request_context = helper.request_context_or_from_request(&req);