naming issues

Author: Dav1dde

relay-cardinality/benches/redis_impl.rs

@@ -43,7 +43,7 @@ struct NoopReporter;
 impl<'a> Reporter<'a> for NoopReporter {
     fn reject(&mut self, _limit_id: &'a CardinalityLimit, _entry_id: EntryId) {}
 
-    fn cardinality(&mut self, _limit: &'a CardinalityLimit, _report: CardinalityReport) {}
+    fn report_cardinality(&mut self, _limit: &'a CardinalityLimit, _report: CardinalityReport) {}
 }
 
 #[derive(Debug)]

relay-cardinality/src/limiter.rs

@@ -59,7 +59,7 @@ pub trait Reporter<'a> {
     ///
     /// For example, with a name scoped limit can be called once for every
     /// metric name matching the limit.
-    fn cardinality(&mut self, limit: &'a CardinalityLimit, report: CardinalityReport);
+    fn report_cardinality(&mut self, limit: &'a CardinalityLimit, report: CardinalityReport);
 }
 
 /// Limiter responsible to enforce limits.
@@ -204,7 +204,7 @@ impl<'a> Reporter<'a> for DefaultReporter<'a> {
     }
 
     #[inline(always)]
-    fn cardinality(&mut self, limit: &'a CardinalityLimit, report: CardinalityReport) {
+    fn report_cardinality(&mut self, limit: &'a CardinalityLimit, report: CardinalityReport) {
         if !limit.report {
             return;
         }
@@ -624,7 +624,7 @@ mod tests {
                 I: IntoIterator<Item = Entry<'b>>,
                 T: Reporter<'a>,
             {
-                reporter.cardinality(
+                reporter.report_cardinality(
                     &limits[0],
                     CardinalityReport {
                         organization_id: Some(scoping.organization_id),
@@ -634,7 +634,7 @@ mod tests {
                     },
                 );
 
-                reporter.cardinality(
+                reporter.report_cardinality(
                     &limits[0],
                     CardinalityReport {
                         organization_id: Some(scoping.organization_id),
@@ -644,7 +644,7 @@ mod tests {
                     },
                 );
 
-                reporter.cardinality(
+                reporter.report_cardinality(
                     &limits[2],
                     CardinalityReport {
                         organization_id: Some(scoping.organization_id),

relay-cardinality/src/redis/limiter.rs

@@ -163,7 +163,7 @@ impl Limiter for RedisSetLimiter {
             })?;
 
             for result in results {
-                reporter.cardinality(state.cardinality_limit(), result.to_report());
+                reporter.report_cardinality(state.cardinality_limit(), result.to_report());
 
                 // This always acquires a write lock, but we only hit this
                 // if we previously didn't satisfy the request from the cache,
@@ -306,7 +306,7 @@ mod tests {
             self.entries.insert(entry_id);
         }
 
-        fn cardinality(&mut self, limit: &'a CardinalityLimit, report: CardinalityReport) {
+        fn report_cardinality(&mut self, limit: &'a CardinalityLimit, report: CardinalityReport) {
             let reports = self.reports.entry(limit.clone()).or_default();
             reports.push(report);
             reports.sort();

relay-server/src/metric_stats.rs

@@ -58,7 +58,7 @@ impl MetricStats {
     }
 
     /// Tracks the metric volume and outcome for the bucket.
-    pub fn track(&self, scoping: Scoping, bucket: Bucket, outcome: Outcome) {
+    pub fn track_metric(&self, scoping: Scoping, bucket: Bucket, outcome: Outcome) {
         if !self.is_enabled(scoping) {
             return;
         }
@@ -78,7 +78,7 @@ impl MetricStats {
     }
 
     /// Tracks the cardinality of a metric.
-    pub fn cardinality(
+    pub fn track_cardinality(
         &self,
         scoping: Scoping,
         limit: &CardinalityLimit,
@@ -239,10 +239,10 @@ mod tests {
         let scoping = scoping();
         let mut bucket = Bucket::parse(b"rt@millisecond:57|d", UnixTimestamp::now()).unwrap();
 
-        ms.track(scoping, bucket.clone(), Outcome::Accepted);
+        ms.track_metric(scoping, bucket.clone(), Outcome::Accepted);
 
         bucket.metadata.merges = bucket.metadata.merges.saturating_add(41);
-        ms.track(
+        ms.track_metric(
             scoping,
             bucket,
             Outcome::RateLimited(Some(ReasonCode::new("foobar"))),
@@ -300,7 +300,7 @@ mod tests {
 
         let scoping = scoping();
         let bucket = Bucket::parse(b"rt@millisecond:57|d", UnixTimestamp::now()).unwrap();
-        ms.track(scoping, bucket, Outcome::Accepted);
+        ms.track_metric(scoping, bucket, Outcome::Accepted);
 
         drop(ms);
 
@@ -314,7 +314,7 @@ mod tests {
         let scoping = scoping();
         let bucket =
             Bucket::parse(b"transactions/rt@millisecond:57|d", UnixTimestamp::now()).unwrap();
-        ms.track(scoping, bucket, Outcome::Accepted);
+        ms.track_metric(scoping, bucket, Outcome::Accepted);
 
         drop(ms);
 

relay-server/src/services/processor.rs

@@ -2186,7 +2186,9 @@ impl EnvelopeProcessorService {
 
         for (limit, reports) in limits.cardinality_reports() {
             for report in reports {
-                self.inner.metric_stats.cardinality(scoping, limit, report);
+                self.inner
+                    .metric_stats
+                    .track_cardinality(scoping, limit, report);
             }
         }
 

relay-server/src/services/store.rs

@@ -402,7 +402,8 @@ impl StoreService {
             // This logic will be improved iterated on and change once we move serialization logic
             // back into the processor service.
             if has_success {
-                self.metric_stats.track(scoping, bucket, Outcome::Accepted);
+                self.metric_stats
+                    .track_metric(scoping, bucket, Outcome::Accepted);
             }
         }