diff --git a/compactor2/src/components/commit/metrics.rs b/compactor2/src/components/commit/metrics.rs index fb1bf4d235..4a63cec426 100644 --- a/compactor2/src/components/commit/metrics.rs +++ b/compactor2/src/components/commit/metrics.rs @@ -305,7 +305,7 @@ where mod tests { use std::sync::Arc; - use metric::{assert_histogram, Attributes, Metric}; + use metric::{assert_histogram, Attributes}; use crate::components::commit::mock::{CommitHistoryEntry, MockCommit}; use iox_tests::ParquetFileBuilder; diff --git a/compactor2/src/components/partition_done_sink/metrics.rs b/compactor2/src/components/partition_done_sink/metrics.rs index cb00ef19f1..1999e8e0f4 100644 --- a/compactor2/src/components/partition_done_sink/metrics.rs +++ b/compactor2/src/components/partition_done_sink/metrics.rs @@ -83,7 +83,7 @@ where mod tests { use std::{collections::HashMap, sync::Arc}; - use metric::{assert_counter, Attributes, Metric}; + use metric::{assert_counter, Attributes}; use object_store::Error as ObjectStoreError; use crate::components::partition_done_sink::mock::MockPartitionDoneSink; diff --git a/compactor2/src/components/partition_filter/metrics.rs b/compactor2/src/components/partition_filter/metrics.rs index ccb2fa1326..a0291a63e7 100644 --- a/compactor2/src/components/partition_filter/metrics.rs +++ b/compactor2/src/components/partition_filter/metrics.rs @@ -85,7 +85,7 @@ where mod tests { use std::sync::Arc; - use metric::{assert_counter, Attributes, Metric}; + use metric::{assert_counter, Attributes}; use crate::{ components::partition_filter::has_files::HasFilesPartitionFilter, diff --git a/compactor2/src/components/partition_source/metrics.rs b/compactor2/src/components/partition_source/metrics.rs index aef81a4e26..372aa81509 100644 --- a/compactor2/src/components/partition_source/metrics.rs +++ b/compactor2/src/components/partition_source/metrics.rs @@ -64,7 +64,7 @@ where #[cfg(test)] mod tests { - use metric::{assert_counter, Attributes, Metric}; + use metric::{assert_counter, Attributes}; use crate::components::partition_source::mock::MockPartitionSource; use iox_tests::PartitionBuilder; diff --git a/compactor2/src/components/partitions_source/metrics.rs b/compactor2/src/components/partitions_source/metrics.rs index 40566fc74a..797460c563 100644 --- a/compactor2/src/components/partitions_source/metrics.rs +++ b/compactor2/src/components/partitions_source/metrics.rs @@ -69,7 +69,7 @@ where #[cfg(test)] mod tests { - use metric::{assert_counter, Attributes, Metric}; + use metric::assert_counter; use crate::components::partitions_source::mock::MockPartitionsSource; diff --git a/compactor2/src/components/split_or_compact/metrics.rs b/compactor2/src/components/split_or_compact/metrics.rs index ee8a2ef5c3..22407656d0 100644 --- a/compactor2/src/components/split_or_compact/metrics.rs +++ b/compactor2/src/components/split_or_compact/metrics.rs @@ -106,7 +106,7 @@ mod tests { use compactor2_test_utils::{create_overlapped_l0_l1_files_2, create_overlapped_l1_l2_files_2}; use data_types::CompactionLevel; - use metric::{assert_counter, assert_histogram, Attributes, Metric}; + use metric::{assert_counter, assert_histogram}; use crate::{ components::split_or_compact::{split_compact::SplitCompact, SplitOrCompact}, diff --git a/metric/src/counter.rs b/metric/src/counter.rs index 872a7a15fa..6e31585f4e 100644 --- a/metric/src/counter.rs +++ b/metric/src/counter.rs @@ -48,10 +48,10 @@ macro_rules! assert_counter { #[allow(unused)] let mut attr = None; $(attr = Some($attr);)* - let attr = attr.unwrap_or_else(|| Attributes::from(&[])); + let attr = attr.unwrap_or_else(|| metric::Attributes::from(&[])); let counter = $metrics - .get_instrument::>($name) + .get_instrument::>($name) .expect("failed to find metric with provided name") .get_observer(&attr) .expect("failed to find metric with provided attributes") diff --git a/metric/src/histogram.rs b/metric/src/histogram.rs index 63fddb7912..4416c84978 100644 --- a/metric/src/histogram.rs +++ b/metric/src/histogram.rs @@ -106,10 +106,10 @@ macro_rules! assert_histogram { #[allow(unused)] let mut attr = None; $(attr = Some($attr);)* - let attr = attr.unwrap_or_else(|| Attributes::from(&[])); + let attr = attr.unwrap_or_else(|| metric::Attributes::from(&[])); let hist = $metrics - .get_instrument::>($name) + .get_instrument::>($name) .expect("failed to find metric with provided name") .get_observer(&attr) .expect("failed to find metric with provided attributes")