diff --git a/Cargo.lock b/Cargo.lock index cb37684..5cf89b0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -103,7 +103,7 @@ name = "api-server" version = "0.3.0" dependencies = [ "anyhow", - "aya", + "aya 0.12.0", "common", "libc", "log", @@ -214,24 +214,42 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90eea657cc8028447cbda5068f4e10c4fadba0131624f4f7dd1a9c46ffc8d81f" dependencies = [ "assert_matches", - "aya-obj", + "aya-obj 0.1.0", "bitflags 2.5.0", "bytes", "lazy_static", "libc", "log", - "object", + "object 0.32.2", + "thiserror", + "tokio", +] + +[[package]] +name = "aya" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7127cbe933572dfabb7a87d2c740f5b720c3e19b4d2b8c99a262ffa35c8761ff" +dependencies = [ + "assert_matches", + "aya-obj 0.2.0", + "bitflags 2.5.0", + "bytes", + "libc", + "log", + "object 0.36.5", + "once_cell", "thiserror", "tokio", ] [[package]] name = "aya-log" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f11a92f305b983e9f53433457dede617a4ad0aa22e4702220092f39e844c1a2" +checksum = "b600d806c1d07d3b81ab5f4a2a95fd80f479a0d3f1d68f29064d660865f85f02" dependencies = [ - "aya", + "aya 0.13.0", "aya-log-common", "bytes", "log", @@ -241,9 +259,9 @@ dependencies = [ [[package]] name = "aya-log-common" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6d38a351ee2d5dc24e04cac6184b1b39408642d9a8b585892c99146f8dd4edb" +checksum = "befef9fe882e63164a2ba0161874e954648a72b0e1c4b361f532d590638c4eec" dependencies = [ "num_enum", ] @@ -258,7 +276,21 @@ dependencies = [ "core-error", "hashbrown 0.14.3", "log", - "object", + "object 0.32.2", + "thiserror", +] + +[[package]] +name = "aya-obj" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56e133d505de14d5948a312060b8b12752c22a965632cc57da12f5db653de4c0" +dependencies = [ + "bytes", + "core-error", + "hashbrown 0.15.0", + "log", + "object 0.36.5", "thiserror", ] @@ -273,7 +305,7 @@ dependencies = [ "cfg-if", "libc", "miniz_oxide", - "object", + "object 0.32.2", "rustc-demangle", ] @@ -375,7 +407,7 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" name = "common" version = "0.3.0" dependencies = [ - "aya", + "aya 0.12.0", ] [[package]] @@ -387,6 +419,15 @@ dependencies = [ "version_check", ] +[[package]] +name = "crc32fast" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +dependencies = [ + "cfg-if", +] + [[package]] name = "either" version = "1.11.0" @@ -446,6 +487,12 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foldhash" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2" + [[package]] name = "futures-channel" version = "0.3.30" @@ -537,6 +584,17 @@ dependencies = [ "allocator-api2", ] +[[package]] +name = "hashbrown" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" +dependencies = [ + "allocator-api2", + "equivalent", + "foldhash", +] + [[package]] name = "heck" version = "0.5.0" @@ -678,7 +736,7 @@ version = "0.3.0" dependencies = [ "anyhow", "api-server", - "aya", + "aya 0.12.0", "aya-log", "clap", "common", @@ -826,11 +884,23 @@ dependencies = [ "memchr", ] +[[package]] +name = "object" +version = "0.36.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" +dependencies = [ + "crc32fast", + "hashbrown 0.15.0", + "indexmap 2.2.6", + "memchr", +] + [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "parking_lot" diff --git a/Cargo.toml b/Cargo.toml index 5ca399a..41cbfe2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,7 +20,7 @@ anyhow = { version = "1", default-features = true } api-server = { version = "0.3.0", path = "./dataplane/api-server" } aya = { version = "0.12.0", default-features = false } aya-ebpf = { git = "https://github.com/aya-rs/aya", default-features = false } -aya-log = { version = "0.2.0", default-features = false } +aya-log = { version = "0.2.1", default-features = false } aya-log-ebpf = { git = "https://github.com/aya-rs/aya", default-features = false } clap = { version = "4.5", default-features = true } common = { version = "0.3.0", path = "./dataplane/common" }