Refactor telemetry initialization for non-production environments (#789)

* add dep `scopeguard`

* improve for tracing

* fix

* fix

* improve code for import

* add logger trace id

* fix

* fix

* fix

* fix

* fix

crates/ecstore/src/bucket/lifecycle/bucket_lifecycle_ops.rs

@@ -18,7 +18,24 @@
 #![allow(unused_must_use)]
 #![allow(clippy::all)]
 
+use crate::bucket::lifecycle::bucket_lifecycle_audit::{LcAuditEvent, LcEventSrc};
+use crate::bucket::lifecycle::lifecycle::{self, ExpirationOptions, Lifecycle, TransitionOptions};
+use crate::bucket::lifecycle::tier_last_day_stats::{DailyAllTierStats, LastDayTierStats};
+use crate::bucket::lifecycle::tier_sweeper::{Jentry, delete_object_from_remote_tier};
+use crate::bucket::object_lock::objectlock_sys::enforce_retention_for_deletion;
+use crate::bucket::{metadata_sys::get_lifecycle_config, versioning_sys::BucketVersioningSys};
+use crate::client::object_api_utils::new_getobjectreader;
+use crate::error::Error;
 use crate::error::StorageError;
+use crate::error::{error_resp_to_object_err, is_err_object_not_found, is_err_version_not_found, is_network_or_host_down};
+use crate::event::name::EventName;
+use crate::event_notification::{EventArgs, send_event};
+use crate::global::GLOBAL_LocalNodeName;
+use crate::global::{GLOBAL_LifecycleSys, GLOBAL_TierConfigMgr, get_global_deployment_id};
+use crate::store::ECStore;
+use crate::store_api::StorageAPI;
+use crate::store_api::{GetObjectReader, HTTPRangeSpec, ObjectInfo, ObjectOptions, ObjectToDelete};
+use crate::tier::warm_backend::WarmBackendGetOpts;
 use async_channel::{Receiver as A_Receiver, Sender as A_Sender, bounded};
 use bytes::BytesMut;
 use futures::Future;
@@ -27,10 +44,15 @@ use lazy_static::lazy_static;
 use rustfs_common::data_usage::TierStats;
 use rustfs_common::heal_channel::rep_has_active_rules;
 use rustfs_common::metrics::{IlmAction, Metrics};
-use rustfs_filemeta::fileinfo::{NULL_VERSION_ID, RestoreStatusOps, is_restored_object_on_disk};
+use rustfs_filemeta::{NULL_VERSION_ID, RestoreStatusOps, is_restored_object_on_disk};
 use rustfs_utils::path::encode_dir_object;
 use rustfs_utils::string::strings_has_prefix_fold;
 use s3s::Body;
+use s3s::dto::{
+    BucketLifecycleConfiguration, DefaultRetention, ReplicationConfiguration, RestoreRequest, RestoreRequestType, RestoreStatus,
+    ServerSideEncryption, Timestamp,
+};
+use s3s::header::{X_AMZ_RESTORE, X_AMZ_SERVER_SIDE_ENCRYPTION, X_AMZ_STORAGE_CLASS};
 use sha2::{Digest, Sha256};
 use std::any::Any;
 use std::collections::HashMap;
@@ -47,31 +69,6 @@ use tracing::{debug, error, info};
 use uuid::Uuid;
 use xxhash_rust::xxh64;
 
-//use rustfs_notify::{BucketNotificationConfig, Event, EventName, LogLevel, NotificationError, init_logger};
-//use rustfs_notify::{initialize, notification_system};
-use super::bucket_lifecycle_audit::{LcAuditEvent, LcEventSrc};
-use super::lifecycle::{self, ExpirationOptions, Lifecycle, TransitionOptions};
-use super::tier_last_day_stats::{DailyAllTierStats, LastDayTierStats};
-use super::tier_sweeper::{Jentry, delete_object_from_remote_tier};
-use crate::bucket::object_lock::objectlock_sys::enforce_retention_for_deletion;
-use crate::bucket::{metadata_sys::get_lifecycle_config, versioning_sys::BucketVersioningSys};
-use crate::client::object_api_utils::new_getobjectreader;
-use crate::error::Error;
-use crate::error::{error_resp_to_object_err, is_err_object_not_found, is_err_version_not_found, is_network_or_host_down};
-use crate::event::name::EventName;
-use crate::event_notification::{EventArgs, send_event};
-use crate::global::GLOBAL_LocalNodeName;
-use crate::global::{GLOBAL_LifecycleSys, GLOBAL_TierConfigMgr, get_global_deployment_id};
-use crate::store::ECStore;
-use crate::store_api::StorageAPI;
-use crate::store_api::{GetObjectReader, HTTPRangeSpec, ObjectInfo, ObjectOptions, ObjectToDelete};
-use crate::tier::warm_backend::WarmBackendGetOpts;
-use s3s::dto::{
-    BucketLifecycleConfiguration, DefaultRetention, ReplicationConfiguration, RestoreRequest, RestoreRequestType, RestoreStatus,
-    ServerSideEncryption, Timestamp,
-};
-use s3s::header::{X_AMZ_RESTORE, X_AMZ_SERVER_SIDE_ENCRYPTION, X_AMZ_STORAGE_CLASS};
-
 pub type TimeFn = Arc<dyn Fn() -> Pin<Box<dyn Future<Output = ()> + Send>> + Send + Sync + 'static>;
 pub type TraceFn =
     Arc<dyn Fn(String, HashMap<String, String>) -> Pin<Box<dyn Future<Output = ()> + Send>> + Send + Sync + 'static>;

crates/ecstore/src/client/object_api_utils.rs

@@ -21,13 +21,12 @@
 
 use http::HeaderMap;
 use s3s::dto::ETag;
-use std::pin::Pin;
 use std::{collections::HashMap, io::Cursor, sync::Arc};
 use tokio::io::BufReader;
 
 use crate::error::ErrorResponse;
 use crate::store_api::{GetObjectReader, HTTPRangeSpec, ObjectInfo, ObjectOptions};
-use rustfs_filemeta::fileinfo::ObjectPartInfo;
+use rustfs_filemeta::ObjectPartInfo;
 use rustfs_rio::HashReader;
 use s3s::S3ErrorCode;
 

crates/ecstore/src/disk/os.rs

@@ -25,6 +25,7 @@ use tracing::warn;
 
 use super::error::DiskError;
 
+/// Check path length according to OS limits.
 pub fn check_path_length(path_name: &str) -> Result<()> {
     // Apple OS X path length is limited to 1016
     if cfg!(target_os = "macos") && path_name.len() > 1016 {
@@ -64,6 +65,10 @@ pub fn check_path_length(path_name: &str) -> Result<()> {
     Ok(())
 }
 
+/// Check if the given disk path is the root disk.
+/// On Windows, always return false.
+/// On Unix, compare the disk paths.
+#[tracing::instrument(level = "debug", skip_all)]
 pub fn is_root_disk(disk_path: &str, root_disk: &str) -> Result<bool> {
     if cfg!(target_os = "windows") {
         return Ok(false);
@@ -72,6 +77,8 @@ pub fn is_root_disk(disk_path: &str, root_disk: &str) -> Result<bool> {
     rustfs_utils::os::same_disk(disk_path, root_disk).map_err(|e| to_file_error(e).into())
 }
 
+/// Create a directory and all its parent components if they are missing.
+#[tracing::instrument(level = "debug", skip_all)]
 pub async fn make_dir_all(path: impl AsRef<Path>, base_dir: impl AsRef<Path>) -> Result<()> {
     check_path_length(path.as_ref().to_string_lossy().to_string().as_str())?;
 
@@ -82,11 +89,16 @@ pub async fn make_dir_all(path: impl AsRef<Path>, base_dir: impl AsRef<Path>) ->
     Ok(())
 }
 
+/// Check if a directory is empty.
+/// Only reads one entry to determine if the directory is empty.
+#[tracing::instrument(level = "debug", skip_all)]
 pub async fn is_empty_dir(path: impl AsRef<Path>) -> bool {
     read_dir(path.as_ref(), 1).await.is_ok_and(|v| v.is_empty())
 }
 
 // read_dir  count read limit. when count == 0 unlimit.
+/// Return file names in the directory.
+#[tracing::instrument(level = "debug", skip_all)]
 pub async fn read_dir(path: impl AsRef<Path>, count: i32) -> std::io::Result<Vec<String>> {
     let mut entries = fs::read_dir(path.as_ref()).await?;
 
@@ -197,6 +209,10 @@ pub async fn reliable_mkdir_all(path: impl AsRef<Path>, base_dir: impl AsRef<Pat
     Ok(())
 }
 
+/// Create a directory and all its parent components if they are missing.
+/// Without recursion support, fall back to create_dir_all
+/// This function will not create directories under base_dir.
+#[tracing::instrument(level = "debug", skip_all)]
 pub async fn os_mkdir_all(dir_path: impl AsRef<Path>, base_dir: impl AsRef<Path>) -> io::Result<()> {
     if !base_dir.as_ref().to_string_lossy().is_empty() && base_dir.as_ref().starts_with(dir_path.as_ref()) {
         return Ok(());
@@ -225,6 +241,9 @@ pub async fn os_mkdir_all(dir_path: impl AsRef<Path>, base_dir: impl AsRef<Path>
     Ok(())
 }
 
+/// Check if a file exists.
+/// Returns true if the file exists, false otherwise.
+#[tracing::instrument(level = "debug", skip_all)]
 pub fn file_exists(path: impl AsRef<Path>) -> bool {
     std::fs::metadata(path.as_ref()).map(|_| true).unwrap_or(false)
 }

crates/ecstore/src/metrics_realtime.rs

@@ -12,25 +12,23 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use std::collections::{HashMap, HashSet};
-
-use chrono::Utc;
-use rustfs_common::{
-    globals::{GLOBAL_Local_Node_Name, GLOBAL_Rustfs_Addr},
-    heal_channel::DriveState,
-    metrics::globalMetrics,
-};
-use rustfs_madmin::metrics::{DiskIOStats, DiskMetric, RealtimeMetrics};
-use rustfs_utils::os::get_drive_stats;
-use serde::{Deserialize, Serialize};
-use tracing::{debug, info};
-
 use crate::{
     admin_server_info::get_local_server_property,
     new_object_layer_fn,
     store_api::StorageAPI,
     // utils::os::get_drive_stats,
 };
+use chrono::Utc;
+use rustfs_common::{
+    globals::{GLOBAL_Local_Node_Name, GLOBAL_Rustfs_Addr},
+    heal_channel::DriveState,
+    metrics::global_metrics,
+};
+use rustfs_madmin::metrics::{DiskIOStats, DiskMetric, RealtimeMetrics};
+use rustfs_utils::os::get_drive_stats;
+use serde::{Deserialize, Serialize};
+use std::collections::{HashMap, HashSet};
+use tracing::{debug, info};
 
 #[derive(Debug, Default, Serialize, Deserialize)]
 pub struct CollectMetricsOpts {
@@ -118,7 +116,7 @@ pub async fn collect_local_metrics(types: MetricType, opts: &CollectMetricsOpts)
 
     if types.contains(&MetricType::SCANNER) {
         debug!("start get scanner metrics");
-        let metrics = globalMetrics.report().await;
+        let metrics = global_metrics().report().await;
         real_time_metrics.aggregated.scanner = Some(metrics);
     }
 

crates/ecstore/src/store.rs

@@ -72,8 +72,7 @@ use tokio::select;
 use tokio::sync::RwLock;
 use tokio::time::sleep;
 use tokio_util::sync::CancellationToken;
-use tracing::{debug, info};
-use tracing::{error, warn};
+use tracing::{debug, error, info, instrument, warn};
 use uuid::Uuid;
 
 const MAX_UPLOADS_LIST: usize = 10000;
@@ -110,7 +109,7 @@ pub struct ECStore {
 
 impl ECStore {
     #[allow(clippy::new_ret_no_self)]
-    #[tracing::instrument(level = "debug", skip(endpoint_pools))]
+    #[instrument(level = "debug", skip(endpoint_pools))]
     pub async fn new(address: SocketAddr, endpoint_pools: EndpointServerPools, ctx: CancellationToken) -> Result<Arc<Self>> {
         // let layouts = DisksLayout::from_volumes(endpoints.as_slice())?;
 
@@ -275,6 +274,7 @@ impl ECStore {
         Ok(ec)
     }
 
+    #[instrument(level = "debug", skip(self, rx))]
     pub async fn init(self: &Arc<Self>, rx: CancellationToken) -> Result<()> {
         GLOBAL_BOOT_TIME.get_or_init(|| async { SystemTime::now() }).await;
 
@@ -461,6 +461,7 @@ impl ECStore {
     //     Ok(ress)
     // }
 
+    #[instrument(level = "debug", skip(self))]
     async fn delete_all(&self, bucket: &str, prefix: &str) -> Result<()> {
         let mut futures = Vec::new();
         for sets in self.pools.iter() {
@@ -1077,7 +1078,7 @@ impl Clone for PoolObjInfo {
 
 #[async_trait::async_trait]
 impl ObjectIO for ECStore {
-    #[tracing::instrument(level = "debug", skip(self))]
+    #[instrument(level = "debug", skip(self))]
     async fn get_object_reader(
         &self,
         bucket: &str,
@@ -1107,7 +1108,7 @@ impl ObjectIO for ECStore {
             .get_object_reader(bucket, object.as_str(), range, h, &opts)
             .await
     }
-    #[tracing::instrument(level = "debug", skip(self, data))]
+    #[instrument(level = "debug", skip(self, data))]
     async fn put_object(&self, bucket: &str, object: &str, data: &mut PutObjReader, opts: &ObjectOptions) -> Result<ObjectInfo> {
         check_put_object_args(bucket, object)?;
 
@@ -1144,7 +1145,7 @@ lazy_static! {
 
 #[async_trait::async_trait]
 impl StorageAPI for ECStore {
-    #[tracing::instrument(skip(self))]
+    #[instrument(skip(self))]
     async fn backend_info(&self) -> rustfs_madmin::BackendInfo {
         let (standard_sc_parity, rr_sc_parity) = {
             if let Some(sc) = GLOBAL_STORAGE_CLASS.get() {
@@ -1189,7 +1190,7 @@ impl StorageAPI for ECStore {
             ..Default::default()
         }
     }
-    #[tracing::instrument(skip(self))]
+    #[instrument(skip(self))]
     async fn storage_info(&self) -> rustfs_madmin::StorageInfo {
         let Some(notification_sy) = get_global_notification_sys() else {
             return rustfs_madmin::StorageInfo::default();
@@ -1197,7 +1198,7 @@ impl StorageAPI for ECStore {
 
         notification_sy.storage_info(self).await
     }
-    #[tracing::instrument(skip(self))]
+    #[instrument(skip(self))]
     async fn local_storage_info(&self) -> rustfs_madmin::StorageInfo {
         let mut futures = Vec::with_capacity(self.pools.len());
 
@@ -1217,7 +1218,7 @@ impl StorageAPI for ECStore {
         rustfs_madmin::StorageInfo { backend, disks }
     }
 
-    #[tracing::instrument(skip(self))]
+    #[instrument(skip(self))]
     async fn make_bucket(&self, bucket: &str, opts: &MakeBucketOptions) -> Result<()> {
         if !is_meta_bucketname(bucket) {
             if let Err(err) = check_valid_bucket_name_strict(bucket) {
@@ -1265,7 +1266,7 @@ impl StorageAPI for ECStore {
         Ok(())
     }
 
-    #[tracing::instrument(skip(self))]
+    #[instrument(skip(self))]
     async fn get_bucket_info(&self, bucket: &str, opts: &BucketOptions) -> Result<BucketInfo> {
         let mut info = self.peer_sys.get_bucket_info(bucket, opts).await?;
 
@@ -1277,7 +1278,7 @@ impl StorageAPI for ECStore {
 
         Ok(info)
     }
-    #[tracing::instrument(skip(self))]
+    #[instrument(skip(self))]
     async fn list_bucket(&self, opts: &BucketOptions) -> Result<Vec<BucketInfo>> {
         // TODO: opts.cached
 
@@ -1292,7 +1293,7 @@ impl StorageAPI for ECStore {
         }
         Ok(buckets)
     }
-    #[tracing::instrument(skip(self))]
+    #[instrument(skip(self))]
     async fn delete_bucket(&self, bucket: &str, opts: &DeleteBucketOptions) -> Result<()> {
         if is_meta_bucketname(bucket) {
             return Err(StorageError::BucketNameInvalid(bucket.to_string()));
@@ -1327,7 +1328,7 @@ impl StorageAPI for ECStore {
     // @start_after as marker when continuation_token empty
     // @delimiter default="/", empty when recursive
     // @max_keys limit
-    #[tracing::instrument(skip(self))]
+    #[instrument(skip(self))]
     async fn list_objects_v2(
         self: Arc<Self>,
         bucket: &str,
@@ -1342,7 +1343,7 @@ impl StorageAPI for ECStore {
             .await
     }
 
-    #[tracing::instrument(skip(self))]
+    #[instrument(skip(self))]
     async fn list_object_versions(
         self: Arc<Self>,
         bucket: &str,
@@ -1367,7 +1368,7 @@ impl StorageAPI for ECStore {
         self.walk_internal(rx, bucket, prefix, result, opts).await
     }
 
-    #[tracing::instrument(skip(self))]
+    #[instrument(skip(self))]
     async fn get_object_info(&self, bucket: &str, object: &str, opts: &ObjectOptions) -> Result<ObjectInfo> {
         check_object_args(bucket, object)?;
 
@@ -1385,7 +1386,7 @@ impl StorageAPI for ECStore {
     }
 
     // TODO: review
-    #[tracing::instrument(skip(self))]
+    #[instrument(skip(self))]
     async fn copy_object(
         &self,
         src_bucket: &str,
@@ -1452,7 +1453,7 @@ impl StorageAPI for ECStore {
             "put_object_reader is none".to_owned(),
         ))
     }
-    #[tracing::instrument(skip(self))]
+    #[instrument(skip(self))]
     async fn delete_object(&self, bucket: &str, object: &str, opts: ObjectOptions) -> Result<ObjectInfo> {
         check_del_obj_args(bucket, object)?;
 
@@ -1526,7 +1527,7 @@ impl StorageAPI for ECStore {
         Err(StorageError::ObjectNotFound(bucket.to_owned(), object.to_owned()))
     }
     // TODO: review
-    #[tracing::instrument(skip(self))]
+    #[instrument(skip(self))]
     async fn delete_objects(
         &self,
         bucket: &str,
@@ -1709,7 +1710,7 @@ impl StorageAPI for ECStore {
         // Ok((del_objects, del_errs))
     }
 
-    #[tracing::instrument(skip(self))]
+    #[instrument(skip(self))]
     async fn list_object_parts(
         &self,
         bucket: &str,
@@ -1750,7 +1751,7 @@ impl StorageAPI for ECStore {
         Err(StorageError::InvalidUploadID(bucket.to_owned(), object.to_owned(), upload_id.to_owned()))
     }
 
-    #[tracing::instrument(skip(self))]
+    #[instrument(skip(self))]
     async fn list_multipart_uploads(
         &self,
         bucket: &str,
@@ -1802,7 +1803,7 @@ impl StorageAPI for ECStore {
         })
     }
 
-    #[tracing::instrument(skip(self))]
+    #[instrument(skip(self))]
     async fn new_multipart_upload(&self, bucket: &str, object: &str, opts: &ObjectOptions) -> Result<MultipartUploadResult> {
         check_new_multipart_args(bucket, object)?;
 
@@ -1834,7 +1835,7 @@ impl StorageAPI for ECStore {
         self.pools[idx].new_multipart_upload(bucket, object, opts).await
     }
 
-    #[tracing::instrument(skip(self))]
+    #[instrument(skip(self))]
     async fn add_partial(&self, bucket: &str, object: &str, version_id: &str) -> Result<()> {
         let object = encode_dir_object(object);
 
@@ -1849,7 +1850,7 @@ impl StorageAPI for ECStore {
         let _ = self.pools[idx].add_partial(bucket, object.as_str(), version_id).await;
         Ok(())
     }
-    #[tracing::instrument(skip(self))]
+    #[instrument(skip(self))]
     async fn transition_object(&self, bucket: &str, object: &str, opts: &ObjectOptions) -> Result<()> {
         let object = encode_dir_object(object);
         if self.single_pool() {
@@ -1863,7 +1864,7 @@ impl StorageAPI for ECStore {
         self.pools[idx].transition_object(bucket, &object, opts).await
     }
 
-    #[tracing::instrument(skip(self))]
+    #[instrument(skip(self))]
     async fn restore_transitioned_object(self: Arc<Self>, bucket: &str, object: &str, opts: &ObjectOptions) -> Result<()> {
         let object = encode_dir_object(object);
         if self.single_pool() {
@@ -1880,7 +1881,7 @@ impl StorageAPI for ECStore {
             .await
     }
 
-    #[tracing::instrument(skip(self))]
+    #[instrument(skip(self))]
     async fn copy_object_part(
         &self,
         src_bucket: &str,
@@ -1902,7 +1903,7 @@ impl StorageAPI for ECStore {
 
         unimplemented!()
     }
-    #[tracing::instrument(skip(self, data))]
+    #[instrument(skip(self, data))]
     async fn put_object_part(
         &self,
         bucket: &str,
@@ -1944,7 +1945,7 @@ impl StorageAPI for ECStore {
         Err(StorageError::InvalidUploadID(bucket.to_owned(), object.to_owned(), upload_id.to_owned()))
     }
 
-    #[tracing::instrument(skip(self))]
+    #[instrument(skip(self))]
     async fn get_multipart_info(
         &self,
         bucket: &str,
@@ -1976,7 +1977,7 @@ impl StorageAPI for ECStore {
 
         Err(StorageError::InvalidUploadID(bucket.to_owned(), object.to_owned(), upload_id.to_owned()))
     }
-    #[tracing::instrument(skip(self))]
+    #[instrument(skip(self))]
     async fn abort_multipart_upload(&self, bucket: &str, object: &str, upload_id: &str, opts: &ObjectOptions) -> Result<()> {
         check_abort_multipart_args(bucket, object, upload_id)?;
 
@@ -2007,7 +2008,7 @@ impl StorageAPI for ECStore {
         Err(StorageError::InvalidUploadID(bucket.to_owned(), object.to_owned(), upload_id.to_owned()))
     }
 
-    #[tracing::instrument(skip(self))]
+    #[instrument(skip(self))]
     async fn complete_multipart_upload(
         self: Arc<Self>,
         bucket: &str,
@@ -2050,7 +2051,7 @@ impl StorageAPI for ECStore {
         Err(StorageError::InvalidUploadID(bucket.to_owned(), object.to_owned(), upload_id.to_owned()))
     }
 
-    #[tracing::instrument(skip(self))]
+    #[instrument(skip(self))]
     async fn get_disks(&self, pool_idx: usize, set_idx: usize) -> Result<Vec<Option<DiskStore>>> {
         if pool_idx < self.pools.len() && set_idx < self.pools[pool_idx].disk_set.len() {
             self.pools[pool_idx].disk_set[set_idx].get_disks(0, 0).await
@@ -2059,7 +2060,7 @@ impl StorageAPI for ECStore {
         }
     }
 
-    #[tracing::instrument(skip(self))]
+    #[instrument(skip(self))]
     fn set_drive_counts(&self) -> Vec<usize> {
         let mut counts = vec![0; self.pools.len()];
 
@@ -2068,7 +2069,7 @@ impl StorageAPI for ECStore {
         }
         counts
     }
-    #[tracing::instrument(skip(self))]
+    #[instrument(skip(self))]
     async fn put_object_metadata(&self, bucket: &str, object: &str, opts: &ObjectOptions) -> Result<ObjectInfo> {
         let object = encode_dir_object(object);
         if self.single_pool() {
@@ -2082,7 +2083,7 @@ impl StorageAPI for ECStore {
 
         self.pools[idx].put_object_metadata(bucket, object.as_str(), &opts).await
     }
-    #[tracing::instrument(skip(self))]
+    #[instrument(skip(self))]
     async fn get_object_tags(&self, bucket: &str, object: &str, opts: &ObjectOptions) -> Result<String> {
         let object = encode_dir_object(object);
 
@@ -2095,7 +2096,7 @@ impl StorageAPI for ECStore {
         Ok(oi.user_tags)
     }
 
-    #[tracing::instrument(level = "debug", skip(self))]
+    #[instrument(level = "debug", skip(self))]
     async fn put_object_tags(&self, bucket: &str, object: &str, tags: &str, opts: &ObjectOptions) -> Result<ObjectInfo> {
         let object = encode_dir_object(object);
 
@@ -2108,7 +2109,7 @@ impl StorageAPI for ECStore {
         self.pools[idx].put_object_tags(bucket, object.as_str(), tags, opts).await
     }
 
-    #[tracing::instrument(skip(self))]
+    #[instrument(skip(self))]
     async fn delete_object_version(&self, bucket: &str, object: &str, fi: &FileInfo, force_del_marker: bool) -> Result<()> {
         check_del_obj_args(bucket, object)?;
 
@@ -2122,7 +2123,7 @@ impl StorageAPI for ECStore {
         Ok(())
     }
 
-    #[tracing::instrument(skip(self))]
+    #[instrument(skip(self))]
     async fn delete_object_tags(&self, bucket: &str, object: &str, opts: &ObjectOptions) -> Result<ObjectInfo> {
         let object = encode_dir_object(object);
 
@@ -2135,7 +2136,7 @@ impl StorageAPI for ECStore {
         self.pools[idx].delete_object_tags(bucket, object.as_str(), opts).await
     }
 
-    #[tracing::instrument(skip(self))]
+    #[instrument(skip(self))]
     async fn heal_format(&self, dry_run: bool) -> Result<(HealResultItem, Option<Error>)> {
         info!("heal_format");
         let mut r = HealResultItem {
@@ -2170,13 +2171,13 @@ impl StorageAPI for ECStore {
         Ok((r, None))
     }
 
-    #[tracing::instrument(skip(self))]
+    #[instrument(skip(self))]
     async fn heal_bucket(&self, bucket: &str, opts: &HealOpts) -> Result<HealResultItem> {
         let res = self.peer_sys.heal_bucket(bucket, opts).await?;
 
         Ok(res)
     }
-    #[tracing::instrument(skip(self))]
+    #[instrument(skip(self))]
     async fn heal_object(
         &self,
         bucket: &str,
@@ -2253,7 +2254,7 @@ impl StorageAPI for ECStore {
         Ok((HealResultItem::default(), Some(Error::FileNotFound)))
     }
 
-    #[tracing::instrument(skip(self))]
+    #[instrument(skip(self))]
     async fn get_pool_and_set(&self, id: &str) -> Result<(Option<usize>, Option<usize>, Option<usize>)> {
         for (pool_idx, pool) in self.pools.iter().enumerate() {
             for (set_idx, set) in pool.format.erasure.sets.iter().enumerate() {
@@ -2268,7 +2269,7 @@ impl StorageAPI for ECStore {
         Err(Error::DiskNotFound)
     }
 
-    #[tracing::instrument(skip(self))]
+    #[instrument(skip(self))]
     async fn check_abandoned_parts(&self, bucket: &str, object: &str, opts: &HealOpts) -> Result<()> {
         let object = encode_dir_object(object);
         if self.single_pool() {
@@ -2473,7 +2474,7 @@ fn check_abort_multipart_args(bucket: &str, object: &str, upload_id: &str) -> Re
     check_multipart_object_args(bucket, object, upload_id)
 }
 
-#[tracing::instrument(level = "debug")]
+#[instrument(level = "debug")]
 fn check_put_object_args(bucket: &str, object: &str) -> Result<()> {
     if !is_meta_bucketname(bucket) && check_valid_bucket_name_strict(bucket).is_err() {
         return Err(StorageError::BucketNameInvalid(bucket.to_string()));

crates/ecstore/src/store_api.rs

@@ -134,7 +134,7 @@ pub struct GetObjectReader {
 }
 
 impl GetObjectReader {
-    #[tracing::instrument(level = "debug", skip(reader))]
+    #[tracing::instrument(level = "debug", skip(reader, rs, opts, _h))]
     pub fn new(
         reader: Box<dyn AsyncRead + Unpin + Send + Sync>,
         rs: Option<HTTPRangeSpec>,

crates/ecstore/src/tier/tier.rs

@@ -481,7 +481,7 @@ async fn new_and_save_tiering_config<S: StorageAPI>(api: Arc<S>) -> Result<TierC
     Ok(cfg)
 }
 
-#[tracing::instrument(level = "debug")]
+#[tracing::instrument(level = "debug", name = "load_tier_config", skip(api))]
 async fn load_tier_config(api: Arc<ECStore>) -> std::result::Result<TierConfigMgr, std::io::Error> {
     let config_file = format!("{}{}{}", CONFIG_PREFIX, SLASH_SEPARATOR, TIER_CONFIG_FILE);
     let data = read_config(api.clone(), config_file.as_str()).await;