Improve

getsentry · iambriccardo · Jul 22, 2024 · Jul 15, 2024 · Jul 16, 2024 · Jul 16, 2024
commit 719bea7fbc23e9e2e2a8a19b327b6b04efbff2a2
@@ -1,17 +1,16 @@
 use std::sync::Arc;
 
 use relay_config::Config;
-use relay_statsd::metric;
 use relay_system::{Addr, AsyncResponse, Controller, FromMessage, Interface, Sender, Service};
 use std::future::Future;
-use sysinfo::{MemoryRefreshKind, System};
+use sysinfo::System;
 use tokio::sync::watch;
 use tokio::time::{timeout, Instant};
 
 use crate::services::metrics::{AcceptsMetrics, Aggregator};
 use crate::services::project_cache::{ProjectCache, SpoolHealth};
 use crate::services::upstream::{IsAuthenticated, UpstreamRelay};
-use crate::statsd::{RelayGauges, RelayTimers};
+use crate::statsd::RelayTimers;
 use crate::utils::MemoryStat;
 
 /// Checks whether Relay is alive and healthy based on its variant.
@@ -268,34 +267,4 @@ mod tests {
         let s = [].into_iter().collect();
         assert!(matches!(s, Status::Healthy));
     }
-
-    #[test]
-    fn test_memory_used_percent_total_0() {
-        let memory = Memory {
-            used: 100,
-            total: 0,
-            rss: 0,
-        };
-        assert_eq!(memory.used_percent(), 1.0);
-    }
-
-    #[test]
-    fn test_memory_used_percent_zero() {
-        let memory = Memory {
-            used: 0,
-            total: 100,
-            rss: 0,
-        };
-        assert_eq!(memory.used_percent(), 0.0);
-    }
-
-    #[test]
-    fn test_memory_used_percent_half() {
-        let memory = Memory {
-            used: 50,
-            total: 100,
-            rss: 0,
-        };
-        assert_eq!(memory.used_percent(), 0.5);
-    }
 }
@@ -113,7 +113,7 @@ impl fmt::Debug for MemoryStat {
 
 #[cfg(test)]
 mod tests {
-    use crate::utils::MemoryStat;
+    use crate::utils::{Memory, MemoryStat};
 
     #[test]
     fn test_has_enough_memory() {
@@ -126,4 +126,31 @@ mod tests {
         let memory_stat = MemoryStat::new(0.0);
         assert!(!memory_stat.has_enough_memory());
     }
+
+    #[test]
+    fn test_memory_used_percent_total_0() {
+        let memory = Memory {
+            used: 100,
+            total: 0,
+        };
+        assert_eq!(memory.used_percent(), 1.0);
+    }
+
+    #[test]
+    fn test_memory_used_percent_zero() {
+        let memory = Memory {
+            used: 0,
+            total: 100,
+        };
+        assert_eq!(memory.used_percent(), 0.0);
+    }
+
+    #[test]
+    fn test_memory_used_percent_half() {
+        let memory = Memory {
+            used: 50,
+            total: 100,
+        };
+        assert_eq!(memory.used_percent(), 0.5);
+    }
 }