Revert "ref(project-cache): Split project cache into shared and priva…

…te parts (#4147)"

This reverts commit 857c2b1.

.github/workflows/ci.yml

@@ -553,7 +553,7 @@ jobs:
       - run: make test-integration
         env:
           PYTEST_N: 6
-          RELAY_VERSION_CHAIN: "23.12.0,latest"
+          RELAY_VERSION_CHAIN: "20.6.0,latest"
 
   sentry-relay-integration-tests:
     name: Sentry-Relay Integration Tests

CHANGELOG.md

@@ -5,7 +5,6 @@
 **Breaking Changes**:
 
 - Removes support for metric meta envelope items. ([#4152](https://github.com/getsentry/relay/pull/4152))
-- Removes support for the project cache endpoint version 2 and before. ([#4147](https://github.com/getsentry/relay/pull/4147))
 
 **Bug Fixes**
 

Cargo.toml

@@ -60,7 +60,6 @@ relay-test = { path = "relay-test" }
 relay-protocol-derive = { path = "relay-protocol-derive" }
 relay-event-derive = { path = "relay-event-derive" }
 
-ahash = "0.8.11"
 android_trace_log = { version = "0.3.0", features = ["serde"] }
 anyhow = "1.0.66"
 axum = "0.7.5"
@@ -120,7 +119,6 @@ num-traits = "0.2.18"
 num_cpus = "1.13.0"
 once_cell = "1.13.1"
 opentelemetry-proto = { version = "0.7.0", default-features = false }
-papaya = "0.1.4"
 parking_lot = "0.12.1"
 path-slash = "0.2.1"
 pest = "2.1.3"

relay-config/src/config.rs

@@ -1017,9 +1017,7 @@ struct Cache {
     /// The cache timeout for project configurations in seconds.
     project_expiry: u32,
     /// Continue using project state this many seconds after cache expiry while a new state is
-    /// being fetched. This is added on top of `project_expiry`.
-    ///
-    /// Default is 2 minutes.
+    /// being fetched. This is added on top of `project_expiry` and `miss_expiry`. Default is 0.
     project_grace_period: u32,
     /// The cache timeout for downstream relay info (public keys) in seconds.
     relay_expiry: u32,
@@ -1055,17 +1053,17 @@ impl Default for Cache {
     fn default() -> Self {
         Cache {
             project_request_full_config: false,
-            project_expiry: 300,       // 5 minutes
-            project_grace_period: 120, // 2 minutes
-            relay_expiry: 3600,        // 1 hour
-            envelope_expiry: 600,      // 10 minutes
+            project_expiry: 300, // 5 minutes
+            project_grace_period: 0,
+            relay_expiry: 3600,   // 1 hour
+            envelope_expiry: 600, // 10 minutes
             envelope_buffer_size: 1000,
             miss_expiry: 60,                       // 1 minute
             batch_interval: 100,                   // 100ms
             downstream_relays_batch_interval: 100, // 100ms
             batch_size: 500,
             file_interval: 10,                // 10 seconds
-            eviction_interval: 15,            // 15 seconds
+            eviction_interval: 60,            // 60 seconds
             global_config_fetch_interval: 10, // 10 seconds
         }
     }

relay-dynamic-config/src/error_boundary.rs

@@ -42,14 +42,6 @@ impl<T> ErrorBoundary<T> {
         }
     }
 
-    /// Converts from `ErrorBoundary<T>` to `ErrorBoundary<&T>`.
-    pub fn as_ref(&self) -> ErrorBoundary<&T> {
-        match self {
-            Self::Ok(t) => ErrorBoundary::Ok(t),
-            Self::Err(e) => ErrorBoundary::Err(Arc::clone(e)),
-        }
-    }
-
     /// Returns the contained [`Ok`] value or computes it from a closure.
     #[inline]
     pub fn unwrap_or_else<F>(self, op: F) -> T

relay-quotas/src/rate_limit.rs

@@ -1,6 +1,5 @@
 use std::fmt;
 use std::str::FromStr;
-use std::sync::{Arc, Mutex, PoisonError};
 use std::time::{Duration, Instant};
 
 use relay_base_schema::metrics::MetricNamespace;
@@ -280,14 +279,15 @@ impl RateLimits {
     }
 
     /// Removes expired rate limits from this instance.
-    pub fn clean_expired(&mut self, now: Instant) {
+    pub fn clean_expired(&mut self) {
+        let now = Instant::now();
         self.limits
             .retain(|limit| !limit.retry_after.expired_at(now));
     }
 
     /// Checks whether any rate limits apply to the given scoping.
     ///
-    /// If no limits match, then the returned `RateLimits` instance evaluates `is_ok`. Otherwise, it
+    /// If no limits match, then the returned `RateLimits` instance evalutes `is_ok`. Otherwise, it
     /// contains rate limits that match the given scoping.
     pub fn check(&self, scoping: ItemScoping<'_>) -> Self {
         self.check_with_quotas(&[], scoping)
@@ -298,7 +298,7 @@ impl RateLimits {
     /// This is similar to `check`. Additionally, it checks for quotas with a static limit `0`, and
     /// rejects items even if there is no active rate limit in this instance.
     ///
-    /// If no limits or quotas match, then the returned `RateLimits` instance evaluates `is_ok`.
+    /// If no limits or quotas match, then the returned `RateLimits` instance evalutes `is_ok`.
     /// Otherwise, it contains rate limits that match the given scoping.
     pub fn check_with_quotas<'a>(
         &self,
@@ -339,7 +339,7 @@ impl RateLimits {
 
     /// Returns `true` if there are any limits contained.
     ///
-    /// This is equivalent to checking whether [`Self::longest`] returns `Some`
+    /// This is equavalent to checking whether [`Self::longest`] returns `Some`
     /// or [`Self::iter`] returns an iterator with at least one item.
     pub fn is_empty(&self) -> bool {
         self.limits.is_empty()
@@ -402,7 +402,7 @@ impl<'a> IntoIterator for &'a RateLimits {
 ///
 /// The data structure makes sure no expired rate limits are enforced.
 #[derive(Debug, Default)]
-pub struct CachedRateLimits(Mutex<Arc<RateLimits>>);
+pub struct CachedRateLimits(RateLimits);
 
 impl CachedRateLimits {
     /// Creates a new, empty instance without any rate limits enforced.
@@ -413,31 +413,25 @@ impl CachedRateLimits {
     /// Adds a limit to this collection.
     ///
     /// See also: [`RateLimits::add`].
-    pub fn add(&self, limit: RateLimit) {
-        let mut inner = self.0.lock().unwrap_or_else(PoisonError::into_inner);
-        let current = Arc::make_mut(&mut inner);
-        current.add(limit);
+    pub fn add(&mut self, limit: RateLimit) {
+        self.0.add(limit);
     }
 
     /// Merges more rate limits into this instance.
     ///
     /// See also: [`RateLimits::merge`].
-    pub fn merge(&self, limits: RateLimits) {
-        let mut inner = self.0.lock().unwrap_or_else(PoisonError::into_inner);
-        let current = Arc::make_mut(&mut inner);
-        for limit in limits {
-            current.add(limit)
+    pub fn merge(&mut self, rate_limits: RateLimits) {
+        for limit in rate_limits {
+            self.add(limit)
         }
     }
 
     /// Returns a reference to the contained rate limits.
     ///
-    /// This call guarantees that at the time of call no returned rate limit is expired.
-    pub fn current_limits(&self) -> Arc<RateLimits> {
-        let now = Instant::now();
-        let mut inner = self.0.lock().unwrap_or_else(PoisonError::into_inner);
-        Arc::make_mut(&mut inner).clean_expired(now);
-        Arc::clone(&inner)
+    /// This call gurantuess that at the time of call no returned rate limit is expired.
+    pub fn current_limits(&mut self) -> &RateLimits {
+        self.0.clean_expired();
+        &self.0
     }
 }
 
@@ -933,7 +927,7 @@ mod tests {
         // Sanity check before running `clean_expired`
         assert_eq!(rate_limits.iter().count(), 2);
 
-        rate_limits.clean_expired(Instant::now());
+        rate_limits.clean_expired();
 
         // Check that the expired limit has been removed
         insta::assert_ron_snapshot!(rate_limits, @r###"
@@ -1126,7 +1120,7 @@ mod tests {
 
     #[test]
     fn test_cached_rate_limits_expired() {
-        let cached = CachedRateLimits::new();
+        let mut cached = CachedRateLimits::new();
 
         // Active error limit
         cached.add(RateLimit {