Fix

relay-server/src/services/buffer/envelope_buffer/mod.rs

@@ -270,7 +270,7 @@ where
     }
 
     pub fn has_capacity(&self) -> bool {
-        matches!(self.stack_provider.capacity(), Capacity::FREE);
+        matches!(self.stack_provider.capacity(), Capacity::FREE)
     }
 
     fn pop_stack(&mut self, stack_key: StackKey) {
@@ -407,16 +407,16 @@ impl Readiness {
 #[cfg(test)]
 mod tests {
     use std::str::FromStr;
-
+    use std::sync::Arc;
     use uuid::Uuid;
 
     use relay_common::Dsn;
     use relay_sampling::DynamicSamplingContext;
 
+    use super::*;
     use crate::envelope::{Item, ItemType};
     use crate::extractors::RequestMeta;
-
-    use super::*;
+    use crate::utils::MemoryStat;
 
     fn new_envelope(project_key: ProjectKey, sampling_key: Option<ProjectKey>) -> Box<Envelope> {
         let mut envelope = Envelope::from_request(
@@ -441,9 +441,23 @@ mod tests {
         envelope
     }
 
+    fn mock_memory_checker() -> MemoryChecker {
+        let config: Arc<_> = Config::from_json_value(serde_json::json!({
+            "spool": {
+                "health": {
+                    "max_memory_percent": 1.0
+                }
+            }
+        }))
+        .unwrap()
+        .into();
+
+        MemoryChecker::new(MemoryStat::default(), config.clone())
+    }
+
     #[tokio::test]
     async fn insert_pop() {
-        let mut buffer = EnvelopeBuffer::<MemoryStacksManager>::new();
+        let mut buffer = EnvelopeBuffer::<MemoryStacksManager>::new(mock_memory_checker());
 
         let project_key1 = ProjectKey::parse("a94ae32be2584e0bbd7a4cbb95971fed").unwrap();
         let project_key2 = ProjectKey::parse("a94ae32be2584e0bbd7a4cbb95971fee").unwrap();
@@ -518,7 +532,7 @@ mod tests {
 
     #[tokio::test]
     async fn project_internal_order() {
-        let mut buffer = EnvelopeBuffer::<MemoryStacksManager>::new();
+        let mut buffer = EnvelopeBuffer::<MemoryStacksManager>::new(mock_memory_checker());
 
         let project_key = ProjectKey::parse("a94ae32be2584e0bbd7a4cbb95971fed").unwrap();
 
@@ -545,7 +559,7 @@ mod tests {
 
     #[tokio::test]
     async fn sampling_projects() {
-        let mut buffer = EnvelopeBuffer::<MemoryStacksManager>::new();
+        let mut buffer = EnvelopeBuffer::<MemoryStacksManager>::new(mock_memory_checker());
 
         let project_key1 = ProjectKey::parse("a94ae32be2584e0bbd7a4cbb95971fed").unwrap();
         let project_key2 = ProjectKey::parse("a94ae32be2584e0bbd7a4cbb95971fef").unwrap();
@@ -623,7 +637,7 @@ mod tests {
 
         assert_ne!(stack_key1, stack_key2);
 
-        let mut buffer = EnvelopeBuffer::<MemoryStacksManager>::new();
+        let mut buffer = EnvelopeBuffer::<MemoryStacksManager>::new(mock_memory_checker());
         buffer
             .push(new_envelope(project_key1, Some(project_key2)))
             .await

relay-server/src/services/buffer/envelope_store/sqlite.rs

@@ -344,7 +344,7 @@ impl EnvelopeStore for SqliteEnvelopeStore {
                 .is_err()
             {
                 relay_log::error!("failed to update the disk usage");
-            }
+            };
         });
 
         self.last_known_usage.load(Ordering::Relaxed)
@@ -558,4 +558,12 @@ mod tests {
             (own_key, sampling_key)
         );
     }
+
+    #[tokio::test]
+    async fn test_estimate_disk_usage() {
+        let db = setup_db(true).await;
+        let mut envelope_store = SqliteEnvelopeStore::new(db);
+
+        println!("{:?}", envelope_store.usage());
+    }
 }

relay-server/src/services/buffer/mod.rs

@@ -215,23 +215,28 @@ mod tests {
 
     use relay_common::Dsn;
 
-    use crate::extractors::RequestMeta;
-
     use super::*;
+    use crate::extractors::RequestMeta;
+    use crate::utils::MemoryStat;
 
     fn new_buffer() -> Arc<GuardedEnvelopeBuffer> {
-        GuardedEnvelopeBuffer::from_config(
-            &Config::from_json_value(serde_json::json!({
+        let config = Arc::new(
+            Config::from_json_value(serde_json::json!({
                 "spool": {
                     "envelopes": {
-                        "version": "experimental"
+                        "version": "experimental",
+                        "max_memory_percent": 1.0
                     }
                 }
             }))
             .unwrap(),
-        )
-        .unwrap()
-        .into()
+        );
+
+        let memory_checker = MemoryChecker::new(MemoryStat::default(), config.clone());
+
+        GuardedEnvelopeBuffer::from_config(&config, memory_checker)
+            .unwrap()
+            .into()
     }
 
     fn new_envelope() -> Box<Envelope> {

relay-server/src/services/buffer/stacks_manager/sqlite.rs

@@ -3,7 +3,6 @@ use relay_config::Config;
 use crate::services::buffer::envelope_store::sqlite::{
     SqliteEnvelopeStore, SqliteEnvelopeStoreError,
 };
-use crate::services::buffer::envelope_store::EnvelopeStore;
 use crate::services::buffer::stacks_manager::{Capacity, StacksManager};
 use crate::{Envelope, SqliteEnvelopeStack};
 
@@ -48,5 +47,6 @@ impl StacksManager for SqliteStacksManager {
     fn capacity(&self) -> Capacity {
         // TODO: how to we make the check async or sync.
         // self.envelope_store.usage()
+        Capacity::FREE
     }
 }

relay-server/src/services/project_cache.rs

@@ -1583,7 +1583,8 @@ mod tests {
         .unwrap()
         .into();
         let memory_checker = MemoryChecker::new(MemoryStat::default(), config.clone());
-        let envelope_buffer = GuardedEnvelopeBuffer::from_config(&config).map(Arc::new);
+        let envelope_buffer =
+            GuardedEnvelopeBuffer::from_config(&config, memory_checker.clone()).map(Arc::new);
         let buffer_services = spooler::Services {
             outcome_aggregator: services.outcome_aggregator.clone(),
             project_cache: services.project_cache.clone(),