Skip to content

Commit

Permalink
switch to papaya, but we expire too well... gotta go back to delayed …
Browse files Browse the repository at this point in the history
…background reclamation
  • Loading branch information
tobz committed Sep 9, 2024
1 parent a03d559 commit 9a479dc
Show file tree
Hide file tree
Showing 6 changed files with 186 additions and 185 deletions.
98 changes: 91 additions & 7 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ windows-sys = { version = "0.59", default-features = false }
cgroupfs = { version = "0.8", default-features = false }
rustls-native-certs = { version = "0.7", default-features = false }
hashbrown = { version = "0.14.5", default-features = false }
papaya = { version = "0.1", default-features = false }

[patch.crates-io]
# Git dependency for `containerd-client` to:
Expand Down
3 changes: 3 additions & 0 deletions LICENSE-3rdparty.csv
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ async-compression,https://github.com/Nullus157/async-compression,MIT OR Apache-2
async-stream,https://github.com/tokio-rs/async-stream,MIT,Carl Lerche <me@carllerche.com>
async-trait,https://github.com/dtolnay/async-trait,MIT OR Apache-2.0,David Tolnay <dtolnay@gmail.com>
atomic,https://github.com/Amanieu/atomic-rs,Apache-2.0 OR MIT,Amanieu d'Antras <amanieu@gmail.com>
atomic-wait,https://github.com/m-ou-se/atomic-wait,BSD-2-Clause,The atomic-wait Authors
atomic-waker,https://github.com/smol-rs/atomic-waker,Apache-2.0 OR MIT,"Stjepan Glavina <stjepang@gmail.com>, Contributors to futures-rs"
average,https://github.com/vks/average,MIT OR Apache-2.0,Vinzent Steinberg <Vinzent.Steinberg@gmail.com>
aws-lc-fips-sys,https://github.com/aws/aws-lc-rs,ISC AND (Apache-2.0 OR ISC) AND OpenSSL,AWS-LC
Expand Down Expand Up @@ -148,6 +149,7 @@ openat,https://github.com/tailhook/openat,MIT OR Apache-2.0,paul@colomiets.name
openssl-probe,https://github.com/alexcrichton/openssl-probe,MIT OR Apache-2.0,Alex Crichton <alex@alexcrichton.com>
ordered-float,https://github.com/reem/rust-ordered-float,MIT,"Jonathan Reem <jonathan.reem@gmail.com>, Matt Brubeck <mbrubeck@limpet.net>"
overload,https://github.com/danaugrs/overload,MIT,Daniel Salvadori <danaugrs@gmail.com>
papaya,https://github.com/ibraheemdev/papaya,MIT,Ibraheem Ahmed <ibraheem@ibraheem.ca>
parking_lot,https://github.com/Amanieu/parking_lot,MIT OR Apache-2.0,Amanieu d'Antras <amanieu@gmail.com>
paste,https://github.com/dtolnay/paste,MIT OR Apache-2.0,David Tolnay <dtolnay@gmail.com>
pear,https://github.com/SergioBenitez/Pear,MIT OR Apache-2.0,Sergio Benitez <sb@sergio.bz>
Expand Down Expand Up @@ -198,6 +200,7 @@ schannel,https://github.com/steffengy/schannel-rs,MIT,"Steven Fackler <sfackler@
scopeguard,https://github.com/bluss/scopeguard,MIT OR Apache-2.0,bluss
secrecy,https://github.com/iqlusioninc/crates/tree/main/secrecy,Apache-2.0 OR MIT,Tony Arcieri <tony@iqlusion.io>
security-framework,https://github.com/kornelski/rust-security-framework,MIT OR Apache-2.0,"Steven Fackler <sfackler@gmail.com>, Kornel <kornel@geekhood.net>"
seize,https://github.com/ibraheemdev/seize,MIT,Ibraheem Ahmed <ibraheem@ibraheem.ca>
serde,https://github.com/serde-rs/serde,MIT OR Apache-2.0,"Erick Tryzelaar <erick.tryzelaar@gmail.com>, David Tolnay <dtolnay@gmail.com>"
serde-value,https://github.com/arcnmx/serde-value,MIT,arcnmx
serde_json,https://github.com/serde-rs/json,MIT OR Apache-2.0,"Erick Tryzelaar <erick.tryzelaar@gmail.com>, David Tolnay <dtolnay@gmail.com>"
Expand Down
3 changes: 1 addition & 2 deletions lib/saluki-components/src/sources/dogstatsd/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -245,8 +245,7 @@ impl SourceBuilder for DogStatsDConfiguration {
.ok_or_else(|| generic_error!("context_string_interner_size must be greater than 0"))?;
let context_interner = FixedSizeInterner::new(context_string_interner_size);
let context_resolver = ContextResolver::from_interner("dogstatsd", context_interner)
.with_heap_allocations(self.allow_context_heap_allocations)
.with_background_expiration();
.with_heap_allocations(self.allow_context_heap_allocations);

let codec_config = DogstatsdCodecConfiguration::default().with_timestamps(self.no_aggregation_pipeline_support);
let codec = DogstatsdCodec::from_context_resolver(context_resolver)
Expand Down
1 change: 1 addition & 0 deletions lib/saluki-context/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ repository = { workspace = true }
ahash = { workspace = true }
indexmap = { workspace = true, features = ["std"] }
metrics = { workspace = true }
papaya = { workspace = true }
saluki-metrics = { workspace = true }
stringtheory = { workspace = true }
tracing = { workspace = true }
Expand Down
Loading

0 comments on commit 9a479dc

Please sign in to comment.