Simplify cache metrics and switch proto to master branch

Remove manual AtomicUsize cache size tracking in favor of
gauge increment/set. Drop cache_cleaned_total metric, unused
parking_lot dep, and tokio full feature. Switch helium-proto
to master and CI to cargo test.

Author: macpie

.github/workflows/ci.yml

@@ -112,10 +112,8 @@ jobs:
           key: tests-base-${{ needs.compute-base-build-tag.outputs.image_tag }}-${{ hashFiles('**/Cargo.lock') }}
           restore-keys: |
             tests-base-${{ needs.compute-base-build-tag.outputs.image_tag }}-
-      - name: Install nextest
-        run: curl -LsSf https://get.nexte.st/latest/linux | tar zxf - -C ${CARGO_HOME:-~/.cargo}/bin
       - name: Run tests
-        run: cargo nextest run
+        run: cargo test
 
   build-package:
     if: startsWith(github.ref, 'refs/tags/')

Cargo.lock

@@ -13,14 +13,14 @@ humantime-serde = "1.1"
 metrics = "0.24"
 metrics-exporter-prometheus = "0.18"
 serde = { version = "1.0", features = ["derive"] }
-tokio = { version = "1.50", features = ["full"] }
+tokio = { version = "1.50" }
 tonic = "0.14"
 tracing = "0.1"
 triggered = "0.1"
 
 # Oracles
 custom-tracing = { git = "https://github.com/helium/oracles.git", branch = "main" }
-helium-proto = { git = "https://github.com/helium/proto.git", branch = "macpie/multibuy2.0", features = [
+helium-proto = { git = "https://github.com/helium/proto.git", branch = "master", features = [
     "services",
 ] }
 task-manager = { git = "https://github.com/helium/oracles", branch = "main" }

Cargo.toml

@@ -1,6 +1,5 @@
 use dashmap::mapref::entry::Entry;
 use dashmap::DashMap;
-use std::sync::atomic::{AtomicUsize, Ordering};
 use std::time::Instant;
 
 #[derive(Debug, Clone)]
@@ -9,33 +8,18 @@ pub(crate) struct CacheValue {
     pub(crate) created_at: Instant,
 }
 
+#[derive(Default)]
 pub struct Cache {
     map: DashMap<String, CacheValue>,
-    pub size: AtomicUsize,
-}
-
-impl Default for Cache {
-    fn default() -> Self {
-        Self::new()
-    }
 }
 
 impl Cache {
     pub fn new() -> Self {
         Self {
             map: DashMap::new(),
-            size: AtomicUsize::new(0),
         }
     }
 
-    pub fn len(&self) -> usize {
-        self.size.load(Ordering::Relaxed)
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.len() == 0
-    }
-
     pub fn inc(&self, key: String) -> u32 {
         match self.map.entry(key) {
             Entry::Occupied(mut entry) => {
@@ -48,8 +32,7 @@ impl Cache {
                     count: 1,
                     created_at: Instant::now(),
                 });
-                self.size.fetch_add(1, Ordering::Relaxed);
-                crate::metrics::set_cache_size(self.len() as f64);
+                crate::metrics::inc_cache_size();
                 1
             }
         }
@@ -60,7 +43,7 @@ impl Cache {
         self.map.retain(|_, v| v.created_at.elapsed() < max_age);
         let after = self.map.len();
         let removed = before - after;
-        self.size.store(after, Ordering::Relaxed);
+        crate::metrics::set_cache_size(after as f64);
         removed
     }
 }

src/cache.rs

@@ -6,7 +6,6 @@ pub mod settings;
 
 const HIT_TOTAL: &str = "multi_buy_hit_total";
 const CACHE_SIZE: &str = "multi_buy_cache_size";
-const CACHE_CLEANED_TOTAL: &str = "multi_buy_cache_cleaned_total";
 const REQUEST_DURATION: &str = "multi_buy_request_duration_ms";
 
 pub fn start_metrics(settings: &Settings) -> anyhow::Result<()> {
@@ -32,8 +31,8 @@ pub fn set_cache_size(size: f64) {
     metrics::gauge!(CACHE_SIZE).set(size);
 }
 
-pub fn increment_cache_cleaned(count: u64) {
-    metrics::counter!(CACHE_CLEANED_TOTAL).increment(count);
+pub fn inc_cache_size() {
+    metrics::gauge!(CACHE_SIZE).increment(1);
 }
 
 pub fn record_request_duration(duration: std::time::Duration) {

src/metrics/mod.rs

@@ -40,8 +40,6 @@ impl CacheCleanup {
                 },
                 _ = &mut batch_timer => {
                     let removed = self.cache.remove_expired(self.cleanup_timeout);
-                    crate::metrics::set_cache_size(self.cache.len() as f64);
-                    crate::metrics::increment_cache_cleaned(removed as u64);
                     tracing::info!("cleaned {} entries", removed);
 
                     batch_timer.as_mut().reset(tokio::time::Instant::now() + self.cleanup_timeout);

src/tasks/cleanup.rs

@@ -49,9 +49,6 @@ pub async fn start_server(settings: &Settings, addr: SocketAddr) -> triggered::T
             .unwrap();
     });
 
-    // Give the server a moment to start
-    tokio::time::sleep(std::time::Duration::from_millis(50)).await;
-
     trigger
 }
 
@@ -86,8 +83,6 @@ pub async fn start_server_with_cleanup(
         cleanup.run_until(shutdown_clone).await.unwrap();
     });
 
-    tokio::time::sleep(std::time::Duration::from_millis(50)).await;
-
     trigger
 }