From c727589161b2bd9a68ab6c1c318df836a6ba5102 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E6=AD=A3=E8=B6=85?= Date: Wed, 20 May 2026 11:59:16 +0800 Subject: [PATCH] fix(obs): remove stale replication metric TODOs (#3024) --- .../src/metrics/collectors/bucket_replication.rs | 16 +++++++++++++++- .../obs/src/metrics/schema/bucket_replication.rs | 3 --- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/crates/obs/src/metrics/collectors/bucket_replication.rs b/crates/obs/src/metrics/collectors/bucket_replication.rs index d91f8dced..b349c71cb 100644 --- a/crates/obs/src/metrics/collectors/bucket_replication.rs +++ b/crates/obs/src/metrics/collectors/bucket_replication.rs @@ -243,7 +243,7 @@ mod tests { proxied_get_tagging_requests_total: 2, proxied_get_tagging_requests_failures: 0, proxied_delete_tagging_requests_total: 1, - proxied_delete_tagging_requests_failures: 0, + proxied_delete_tagging_requests_failures: 1, targets: vec![BucketReplicationTargetStats { target_arn: "arn:rustfs:replication:us-east-1:1:target".to_string(), bandwidth_limit_bytes_per_sec: 2048, @@ -271,6 +271,20 @@ mod tests { .iter() .any(|(key, value)| *key == TARGET_ARN_L && value == "arn:rustfs:replication:us-east-1:1:target") })); + + let delete_tagging_total_name = BUCKET_REPL_PROXIED_DELETE_TAGGING_REQUESTS_TOTAL_MD.get_full_metric_name(); + assert!(metrics.iter().any(|metric| { + metric.name == delete_tagging_total_name + && metric.value == 1.0 + && metric.labels.iter().any(|(key, value)| *key == BUCKET_L && value == "b1") + })); + + let delete_tagging_failures_name = BUCKET_REPL_PROXIED_DELETE_TAGGING_REQUESTS_FAILURES_MD.get_full_metric_name(); + assert!(metrics.iter().any(|metric| { + metric.name == delete_tagging_failures_name + && metric.value == 1.0 + && metric.labels.iter().any(|(key, value)| *key == BUCKET_L && value == "b1") + })); } #[test] diff --git a/crates/obs/src/metrics/schema/bucket_replication.rs b/crates/obs/src/metrics/schema/bucket_replication.rs index bcbd0d074..f5dea0287 100644 --- a/crates/obs/src/metrics/schema/bucket_replication.rs +++ b/crates/obs/src/metrics/schema/bucket_replication.rs @@ -98,7 +98,6 @@ pub static BUCKET_REPL_PROXIED_GET_REQUESTS_TOTAL_MD: LazyLock ) }); -// TODO - add a metric for the number of PUT requests proxied to replication target pub static BUCKET_REPL_PROXIED_GET_TAGGING_REQUESTS_FAILURES_MD: LazyLock = LazyLock::new(|| { new_counter_md( MetricName::ProxiedGetTaggingRequestFailures, @@ -135,7 +134,6 @@ pub static BUCKET_REPL_PROXIED_HEAD_REQUESTS_TOTAL_MD: LazyLock = LazyLock::new(|| { new_counter_md( MetricName::ProxiedPutTaggingRequestFailures, @@ -208,7 +206,6 @@ pub static BUCKET_REPL_BANDWIDTH_CURRENT_MD: LazyLock = LazyLo ) }); -// TODO - add a metric for the number of DELETE requests proxied to replication target pub static BUCKET_REPL_PROXIED_DELETE_TAGGING_REQUESTS_FAILURES_MD: LazyLock = LazyLock::new(|| { new_counter_md( MetricName::ProxiedDeleteTaggingRequestFailures,