ref(metrics): Move metrics related modules into proper metrics module (…

…#3634)

relay-server/src/lib.rs

@@ -258,7 +258,6 @@ mod endpoints;
 mod envelope;
 mod extractors;
 mod http;
-mod metric_stats;
 mod metrics;
 mod metrics_extraction;
 mod middlewares;

relay-server/src/metrics/minimal.rs

@@ -4,8 +4,7 @@ use relay_metrics::{
 use serde::de::IgnoredAny;
 use serde::{de, Deserialize, Deserializer};
 
-use crate::metrics::{BucketSummary, TrackableBucket};
-use crate::utils::ExtractionMode;
+use crate::metrics::{BucketSummary, ExtractionMode, TrackableBucket};
 
 /// Bucket which parses only the minimally required information to implement [`TrackableBucket`].
 ///

relay-server/src/metrics/mod.rs

@@ -0,0 +1,13 @@
+#[cfg(feature = "processing")]
+mod bucket_encoding;
+mod metric_stats;
+mod minimal;
+mod outcomes;
+mod rate_limits;
+
+#[cfg(feature = "processing")]
+pub use self::bucket_encoding::*;
+pub use self::metric_stats::*;
+pub use self::minimal::*;
+pub use self::outcomes::*;
+pub use self::rate_limits::*;

relay-server/src/metrics.rs → relay-server/src/metrics/outcomes.rs

@@ -7,16 +7,11 @@ use relay_quotas::{DataCategory, Scoping};
 use relay_system::Addr;
 
 use crate::envelope::SourceQuantities;
-use crate::metric_stats::MetricStats;
+use crate::metrics::{ExtractionMode, MetricStats};
 use crate::services::outcome::{Outcome, TrackOutcome};
-use crate::utils::ExtractionMode;
 #[cfg(feature = "processing")]
 use relay_cardinality::{CardinalityLimit, CardinalityReport};
 
-mod minimal;
-
-pub use self::minimal::*;
-
 pub const PROFILE_TAG: &str = "has_profile";
 
 /// Indicates where quantities should be taken from.

relay-server/src/utils/metrics_rate_limits.rs → relay-server/src/metrics/rate_limits.rs

@@ -7,7 +7,7 @@ use relay_metrics::Bucket;
 use relay_quotas::{DataCategory, Quota, RateLimits, Scoping};
 use relay_system::Addr;
 
-use crate::metrics::{BucketSummary, MetricOutcomes, TrackableBucket, PROFILE_TAG};
+use crate::metrics::outcomes::{BucketSummary, MetricOutcomes, TrackableBucket, PROFILE_TAG};
 use crate::services::outcome::{Outcome, TrackOutcome};
 use crate::utils;
 
@@ -287,7 +287,7 @@ mod tests {
     use relay_quotas::QuotaScope;
     use smallvec::smallvec;
 
-    use crate::metric_stats::MetricStats;
+    use crate::metrics::MetricStats;
 
     use super::*;
 

relay-server/src/service.rs

@@ -2,8 +2,7 @@ use std::convert::Infallible;
 use std::fmt;
 use std::sync::Arc;
 
-use crate::metric_stats::MetricStats;
-use crate::metrics::MetricOutcomes;
+use crate::metrics::{MetricOutcomes, MetricStats};
 use anyhow::{Context, Result};
 use axum::extract::FromRequestParts;
 use axum::http::request::Parts;

relay-server/src/services/processor.rs

@@ -46,8 +46,9 @@ use tokio::sync::Semaphore;
 
 #[cfg(feature = "processing")]
 use {
+    crate::metrics::MetricsLimiter,
     crate::services::store::{Store, StoreEnvelope},
-    crate::utils::{sample, EnvelopeLimiter, ItemAction, MetricsLimiter},
+    crate::utils::{sample, EnvelopeLimiter, ItemAction},
     itertools::Itertools,
     relay_cardinality::{
         CardinalityLimit, CardinalityLimiter, CardinalityLimitsSplit, RedisSetLimiter,
@@ -64,7 +65,7 @@ use {
 
 use crate::envelope::{self, ContentType, Envelope, EnvelopeError, Item, ItemType};
 use crate::extractors::{PartialDsn, RequestMeta};
-use crate::metrics::{MetricOutcomes, MinimalTrackableBucket};
+use crate::metrics::{ExtractionMode, MetricOutcomes, MinimalTrackableBucket};
 use crate::metrics_extraction::transactions::types::ExtractMetricsError;
 use crate::metrics_extraction::transactions::{ExtractedMetrics, TransactionExtractor};
 use crate::service::ServiceError;
@@ -83,8 +84,7 @@ use crate::statsd::{RelayCounters, RelayHistograms, RelayTimers};
 #[cfg(feature = "processing")]
 use crate::utils::BufferGuard;
 use crate::utils::{
-    self, ExtractionMode, InvalidProcessingGroupType, ManagedEnvelope, SamplingResult,
-    TypedEnvelope,
+    self, InvalidProcessingGroupType, ManagedEnvelope, SamplingResult, TypedEnvelope,
 };
 use crate::{http, metrics};
 

relay-server/src/services/project.rs

@@ -23,7 +23,7 @@ use tokio::time::Instant;
 use url::Url;
 
 use crate::envelope::Envelope;
-use crate::metrics::MetricOutcomes;
+use crate::metrics::{ExtractionMode, MetricOutcomes, MetricsLimiter};
 use crate::services::outcome::{DiscardReason, Outcome, TrackOutcome};
 #[cfg(feature = "processing")]
 use crate::services::processor::RateLimitBuckets;
@@ -33,9 +33,7 @@ use crate::services::project_cache::{BucketSource, CheckedEnvelope, ProjectCache
 use crate::extractors::RequestMeta;
 
 use crate::statsd::RelayCounters;
-use crate::utils::{
-    self, EnvelopeLimiter, ExtractionMode, ManagedEnvelope, MetricsLimiter, RetryBackoff,
-};
+use crate::utils::{self, EnvelopeLimiter, ManagedEnvelope, RetryBackoff};
 
 mod metrics;
 
@@ -1170,7 +1168,7 @@ impl Project {
 mod tests {
     use std::sync::Mutex;
 
-    use crate::metric_stats::MetricStats;
+    use crate::metrics::MetricStats;
     use relay_common::time::UnixTimestamp;
     use relay_metrics::BucketValue;
     use relay_test::mock_service;

relay-server/src/services/project/metrics.rs

@@ -161,7 +161,7 @@ mod tests {
     use relay_metrics::{Aggregator, BucketValue, UnixTimestamp};
     use relay_system::Addr;
 
-    use crate::metric_stats::MetricStats;
+    use crate::metrics::MetricStats;
 
     use super::*;
 

relay-server/src/services/project_cache.rs

@@ -1253,7 +1253,7 @@ impl FetchOptionalProjectState {
 
 #[cfg(test)]
 mod tests {
-    use crate::metric_stats::MetricStats;
+    use crate::metrics::MetricStats;
     use crate::services::global_config::GlobalConfigHandle;
     use relay_dynamic_config::GlobalConfig;
     use relay_test::mock_service;

relay-server/src/services/store.rs

@@ -30,15 +30,13 @@ use uuid::Uuid;
 
 use crate::envelope::{AttachmentType, Envelope, Item, ItemType};
 
-use crate::metrics::MetricOutcomes;
+use crate::metrics::{ArrayEncoding, BucketEncoder, ExtractionMode, MetricOutcomes};
 use crate::service::ServiceError;
 use crate::services::global_config::GlobalConfigHandle;
 use crate::services::outcome::{DiscardReason, Outcome, TrackOutcome};
 use crate::services::processor::Processed;
 use crate::statsd::RelayCounters;
-use crate::utils::{
-    is_rolled_out, ArrayEncoding, BucketEncoder, ExtractionMode, FormDataIter, TypedEnvelope,
-};
+use crate::utils::{is_rolled_out, FormDataIter, TypedEnvelope};
 
 /// Fallback name used for attachment items without a `filename` header.
 const UNNAMED_ATTACHMENT: &str = "Unnamed Attachment";

relay-server/src/testutils.rs

@@ -14,8 +14,7 @@ use relay_test::mock_service;
 
 use crate::envelope::{Envelope, Item, ItemType};
 use crate::extractors::RequestMeta;
-use crate::metric_stats::MetricStats;
-use crate::metrics::MetricOutcomes;
+use crate::metrics::{MetricOutcomes, MetricStats};
 use crate::services::global_config::GlobalConfigHandle;
 use crate::services::outcome::TrackOutcome;
 use crate::services::processor::{self, EnvelopeProcessorService};

relay-server/src/utils/mod.rs

@@ -1,11 +1,8 @@
 mod api;
-#[cfg(feature = "processing")]
-mod bucket_encoding;
 mod buffer;
 mod dynamic_sampling;
 mod garbage;
 mod managed_envelope;
-mod metrics_rate_limits;
 mod multipart;
 mod param_parser;
 mod pick;
@@ -23,13 +20,10 @@ mod native;
 mod unreal;
 
 pub use self::api::*;
-#[cfg(feature = "processing")]
-pub use self::bucket_encoding::*;
 pub use self::buffer::*;
 pub use self::dynamic_sampling::*;
 pub use self::garbage::*;
 pub use self::managed_envelope::*;
-pub use self::metrics_rate_limits::*;
 pub use self::multipart::*;
 #[cfg(feature = "processing")]
 pub use self::native::*;