Use namespaced features

hit-box · Sep 2, 2022 · b06e7ad · b06e7ad
1 parent 126e7f6
commit b06e7ad
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 14 deletions.
diff --git a/examples/Cargo.toml b/examples/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2021"
 default = []
 
 [dev-dependencies]
-hitbox = { path = "../hitbox", features = ["derive", "cache-metrics"] }
+hitbox = { path = "../hitbox", features = ["derive", "metrics"] }
 hitbox-actix = { path = "../hitbox-actix", features = ["redis"]}
 actix = "0.13"
 log = "0.4"

diff --git a/hitbox/Cargo.toml b/hitbox/Cargo.toml
@@ -35,7 +35,7 @@ metrics-util = "0.14"
 default = []
 
 derive = ["hitbox-derive", "serde_qs", "actix/macros"]
-cache-metrics = ["metrics", "lazy_static"]
+metrics = ["dep:metrics", "lazy_static"]
 
 [package.metadata.docs.rs]
 all-features = true

diff --git a/hitbox/src/lib.rs b/hitbox/src/lib.rs
@@ -67,8 +67,8 @@
 pub mod cache;
 pub mod dev;
 pub mod error;
-#[cfg(feature = "cache-metrics")]
-#[cfg_attr(docsrs, doc(cfg(feature = "cache-metrics")))]
+#[cfg(feature = "metrics")]
+#[cfg_attr(docsrs, doc(cfg(feature = "metrics")))]
 pub mod metrics;
 pub mod response;
 pub mod runtime;

diff --git a/hitbox/src/states/cache_polled/actual.rs b/hitbox/src/states/cache_polled/actual.rs
@@ -7,7 +7,7 @@ use crate::CacheableResponse;
 use crate::runtime::RuntimeAdapter;
 use crate::states::finish::Finish;
 use crate::CachedValue;
-#[cfg(feature = "cache-metrics")]
+#[cfg(feature = "metrics")]
 use crate::metrics::CACHE_HIT_COUNTER;
 
 /// This state is a variant with actual data from [CachePolled](enum.CachePolled.html).
@@ -42,7 +42,7 @@ where
     /// We have to return actual data.
     pub fn finish(self) -> Finish<T> {
         trace!("Finish");
-        #[cfg(feature = "cache-metrics")]
+        #[cfg(feature = "metrics")]
         metrics::increment_counter!(
             CACHE_HIT_COUNTER.as_ref(),
             "upstream" => self.adapter.upstream_name(),

diff --git a/hitbox/src/states/cache_polled/missed.rs b/hitbox/src/states/cache_polled/missed.rs
@@ -5,7 +5,7 @@ use crate::runtime::RuntimeAdapter;
 use crate::states::upstream_polled::{
     UpstreamPolled, UpstreamPolledError, UpstreamPolledSuccessful,
 };
-#[cfg(feature = "cache-metrics")]
+#[cfg(feature = "metrics")]
 use crate::metrics::{CACHE_MISS_COUNTER, CACHE_UPSTREAM_HANDLING_HISTOGRAM};
 use std::fmt;
 
@@ -39,17 +39,17 @@ where
         A: RuntimeAdapter<UpstreamResult = T>,
         T: CacheableResponse,
     {
-        #[cfg(feature = "cache-metrics")]
+        #[cfg(feature = "metrics")]
         let timer = std::time::Instant::now();
         let upstream_response = self.adapter.poll_upstream().await;
-        #[cfg(feature = "cache-metrics")]
+        #[cfg(feature = "metrics")]
         metrics::histogram!(
             CACHE_UPSTREAM_HANDLING_HISTOGRAM.as_ref(),
             timer.elapsed().as_millis() as f64 / 1000.0,
             "upstream" => self.adapter.upstream_name(),
             "message" => self.adapter.message_name(),
         );
-        #[cfg(feature = "cache-metrics")]
+        #[cfg(feature = "metrics")]
         metrics::increment_counter!(
             CACHE_MISS_COUNTER.as_ref(),
             "upstream" => self.adapter.upstream_name(),

diff --git a/hitbox/src/states/cache_polled/stale.rs b/hitbox/src/states/cache_polled/stale.rs
@@ -1,6 +1,6 @@
 use tracing::{instrument, trace, warn};
 
-#[cfg(feature = "cache-metrics")]
+#[cfg(feature = "metrics")]
 use crate::metrics::{CACHE_HIT_COUNTER, CACHE_STALE_COUNTER};
 use crate::runtime::RuntimeAdapter;
 use crate::states::finish::Finish;
@@ -46,13 +46,13 @@ where
         A: RuntimeAdapter<UpstreamResult = T>,
     {
         let upstream_response = self.adapter.poll_upstream().await;
-        #[cfg(feature = "cache-metrics")]
+        #[cfg(feature = "metrics")]
         metrics::increment_counter!(
             CACHE_HIT_COUNTER.as_ref(),
             "upstream" => self.adapter.upstream_name(),
             "message" => self.adapter.message_name(),
         );
-        #[cfg(feature = "cache-metrics")]
+        #[cfg(feature = "metrics")]
         metrics::increment_counter!(
             CACHE_STALE_COUNTER.as_ref(),
             "upstream" => self.adapter.upstream_name(),

diff --git a/hitbox/tests/metrics.rs b/hitbox/tests/metrics.rs
@@ -1,4 +1,4 @@
-#[cfg(all(test, feature = "cache-metrics"))]
+#[cfg(all(test, feature = "metrics"))]
 mod tests {
     use hitbox::dev::MockAdapter;
     use hitbox::metrics::{CACHE_HIT_COUNTER, CACHE_MISS_COUNTER, CACHE_STALE_COUNTER};