diff --git a/crates/symbolicator-proguard/src/service.rs b/crates/symbolicator-proguard/src/service.rs index 3f864b6a9..f6d8ca050 100644 --- a/crates/symbolicator-proguard/src/service.rs +++ b/crates/symbolicator-proguard/src/service.rs @@ -185,6 +185,6 @@ impl CacheItemRequest for FetchProguard { } fn use_shared_cache(&self) -> bool { - false + true } } diff --git a/crates/symbolicator-service/src/caching/mod.rs b/crates/symbolicator-service/src/caching/mod.rs index e8861e3f7..33233c35e 100644 --- a/crates/symbolicator-service/src/caching/mod.rs +++ b/crates/symbolicator-service/src/caching/mod.rs @@ -295,7 +295,7 @@ impl Caches { config, config.caches.downloaded.into(), max_lazy_redownloads, - in_memory.proguard_capacity, + default_cap, )?, }) } diff --git a/crates/symbolicator-service/src/config.rs b/crates/symbolicator-service/src/config.rs index f9bc7fccb..4ad1d82eb 100644 --- a/crates/symbolicator-service/src/config.rs +++ b/crates/symbolicator-service/src/config.rs @@ -314,19 +314,11 @@ pub struct InMemoryCacheConfig { /// /// Defaults to `3 GiB (= 3_221_225_472)` pub fileinbundle_capacity: u64, - - /// Capacity (in bytes) for the in-memory proguard mapper cache. - /// - /// The in-memory size limit is a best-effort approximation, and not an exact limit. - /// - /// Defaults to `5 GiB`. - pub proguard_capacity: u64, } impl Default for InMemoryCacheConfig { fn default() -> Self { let meg = 1024 * 1024; - let gig = 1024 * 1024 * 1024; Self { sentry_index_capacity: 100_000.try_into().unwrap(), sentry_index_ttl: Duration::from_secs(3600), @@ -338,10 +330,6 @@ impl Default for InMemoryCacheConfig { // We noticed a significant reduction in CPU usage with a cache size of ~2G, which // resulted in a hit ratio of ~60-65%. Lets give it a bit more then and see what happens. fileinbundle_capacity: 3 * 1024 * meg, - // We use 5GiB as the in-memory cache size for Proguard files. - // Note that a Proguard mapper can take up hundreds of MB - // in memory. - proguard_capacity: 5 * gig, } } }