diff --git a/.github/workflows/ci-e2e.yml b/.github/workflows/ci-e2e.yml index ada720bb48862..1592281ac7e97 100644 --- a/.github/workflows/ci-e2e.yml +++ b/.github/workflows/ci-e2e.yml @@ -166,8 +166,7 @@ jobs: build-id: ${{ needs.container.outputs.build-id }} tags: ${{ needs.container.outputs.tag }} - - name: Write .env - if: needs.changes.outputs.shouldTriggerCypress == 'true' + - name: Write .env # This step intentionally has no if, so that GH always considers the action as having run run: | cat <> .env SECRET_KEY=6b01eee4f945ca25045b5aab440b953461faf08693a9abbf1166dc7c6b9772da diff --git a/rust/cymbal/src/metric_consts.rs b/rust/cymbal/src/metric_consts.rs index 797e47417f5d7..d0ec3cdab31b3 100644 --- a/rust/cymbal/src/metric_consts.rs +++ b/rust/cymbal/src/metric_consts.rs @@ -11,6 +11,7 @@ pub const STORE_CACHE_MISSES: &str = "cymbal_store_cache_misses"; pub const STORE_CACHED_BYTES: &str = "cymbal_store_cached_bytes"; pub const STORE_CACHE_SIZE: &str = "cymbal_store_cache_size"; pub const STORE_CACHE_EVICTIONS: &str = "cymbal_store_cache_evictions"; +pub const STORE_CACHE_EVICTION_RUNS: &str = "cymbal_store_cache_eviction_runs"; pub const MAIN_LOOP_TIME: &str = "cymbal_main_loop_time"; pub const PER_FRAME_TIME: &str = "cymbal_per_frame_time"; pub const PER_STACK_TIME: &str = "cymbal_per_stack_time"; diff --git a/rust/cymbal/src/symbol_store/caching.rs b/rust/cymbal/src/symbol_store/caching.rs index 5cab851fdaca7..1f1cb22ac9f0b 100644 --- a/rust/cymbal/src/symbol_store/caching.rs +++ b/rust/cymbal/src/symbol_store/caching.rs @@ -6,7 +6,8 @@ use tokio::sync::Mutex; use crate::{ error::Error, metric_consts::{ - STORE_CACHED_BYTES, STORE_CACHE_EVICTIONS, STORE_CACHE_HITS, STORE_CACHE_MISSES, + STORE_CACHED_BYTES, STORE_CACHE_EVICTIONS, STORE_CACHE_EVICTION_RUNS, STORE_CACHE_HITS, + STORE_CACHE_MISSES, }, }; @@ -117,7 +118,7 @@ impl SymbolSetCache { return; } - metrics::counter!(STORE_CACHE_EVICTIONS).increment(1); + metrics::counter!(STORE_CACHE_EVICTION_RUNS).increment(1); let mut vals: Vec<_> = self.cached.iter().collect(); @@ -137,6 +138,11 @@ impl SymbolSetCache { to_remove.push(to_remove_key.clone()); } + for key in to_remove { + metrics::counter!(STORE_CACHE_EVICTIONS).increment(1); + self.cached.remove(&key); + } + metrics::gauge!(STORE_CACHED_BYTES).set(self.held_bytes as f64); } }