From 91360e7ddbb91d443b0e498cd5b9f2bbf2b92272 Mon Sep 17 00:00:00 2001 From: Xuewei Niu Date: Tue, 2 Jan 2024 10:58:19 +0800 Subject: [PATCH] agent: Bump ttrpc version - `ttrpc` from `0.7.1` to `0.8`. Fixes: #8756 Signed-off-by: Xuewei Niu --- src/agent/Cargo.lock | 102 ++++++++++++++++++++++++++++++++----------- src/agent/Cargo.toml | 2 +- 2 files changed, 77 insertions(+), 27 deletions(-) diff --git a/src/agent/Cargo.lock b/src/agent/Cargo.lock index e4b9899cb2..8b60b429cd 100644 --- a/src/agent/Cargo.lock +++ b/src/agent/Cargo.lock @@ -401,9 +401,9 @@ dependencies = [ [[package]] name = "bytes" -version = "1.1.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "cache-padded" @@ -580,10 +580,24 @@ dependencies = [ ] [[package]] -name = "crossbeam-channel" -version = "0.5.5" +name = "crossbeam" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c02a4d71819009c192cf4872265391563fd6a84c81ff2c0f2a7026ca4c1d85c" +checksum = "6eb9105919ca8e40d437fc9cbb8f1975d916f1bd28afe795a48aae32a2cc8920" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-epoch", + "crossbeam-queue", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82a9b73a36529d9c47029b9fb3a6f0ea3cc916a261195352ba19e770fc1748b2" dependencies = [ "cfg-if 1.0.0", "crossbeam-utils", @@ -611,6 +625,16 @@ dependencies = [ "crossbeam-utils", ] +[[package]] +name = "crossbeam-queue" +version = "0.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adc6598521bb5a83d491e8c1fe51db7296019d2ca3cb93cc6c2a20369a4d78a2" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-utils", +] + [[package]] name = "crossbeam-utils" version = "0.8.18" @@ -1001,7 +1025,7 @@ version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" dependencies = [ - "bytes 1.1.0", + "bytes 1.5.0", "fnv", "futures-core", "futures-sink", @@ -1065,7 +1089,7 @@ version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" dependencies = [ - "bytes 1.1.0", + "bytes 1.5.0", "fnv", "itoa", ] @@ -1076,7 +1100,7 @@ version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ - "bytes 1.1.0", + "bytes 1.5.0", "http", "pin-project-lite", ] @@ -1099,7 +1123,7 @@ version = "0.14.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" dependencies = [ - "bytes 1.1.0", + "bytes 1.5.0", "futures-channel", "futures-core", "futures-util", @@ -1123,7 +1147,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ - "bytes 1.1.0", + "bytes 1.5.0", "hyper", "native-tls", "tokio", @@ -1307,7 +1331,7 @@ dependencies = [ "test-utils", "thiserror", "tokio", - "tokio-vsock", + "tokio-vsock 0.3.1", "toml", "tracing", "tracing-opentelemetry", @@ -1569,7 +1593,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ddd06e90449ae973fe3888c1ff85949604ef5189b4ac9a2ae39518da1e00762d" dependencies = [ - "bytes 1.1.0", + "bytes 1.5.0", "futures", "log", "netlink-packet-core", @@ -1650,6 +1674,7 @@ dependencies = [ "cfg-if 1.0.0", "libc", "memoffset 0.7.1", + "pin-utils", ] [[package]] @@ -2049,7 +2074,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de5e2533f59d08fcf364fd374ebda0692a70bd6d7e66ef97f306f45c6c5d8020" dependencies = [ - "bytes 1.1.0", + "bytes 1.5.0", "prost-derive", ] @@ -2059,7 +2084,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "355f634b43cdd80724ee7848f95770e7e70eefa6dcf14fea676216573b8fd603" dependencies = [ - "bytes 1.1.0", + "bytes 1.5.0", "heck 0.3.3", "itertools", "log", @@ -2090,7 +2115,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "603bbd6394701d13f3f25aada59c7de9d35a6a5887cfc156181234a44002771b" dependencies = [ - "bytes 1.1.0", + "bytes 1.5.0", "prost", ] @@ -2347,7 +2372,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" dependencies = [ "base64 0.21.2", - "bytes 1.1.0", + "bytes 1.5.0", "encoding_rs", "futures-core", "futures-util", @@ -2437,7 +2462,7 @@ checksum = "a4c4216490d5a413bc6d10fa4742bd7d4955941d062c0ef873141d6b0e7b30fd" dependencies = [ "arrayvec", "borsh", - "bytes 1.1.0", + "bytes 1.5.0", "num-traits", "rand", "rkyv", @@ -3012,7 +3037,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0aa32867d44e6f2ce3385e89dceb990188b8bb0fb25b0cf576647a6f98ac5105" dependencies = [ "autocfg", - "bytes 1.1.0", + "bytes 1.5.0", "libc", "mio", "num_cpus", @@ -3062,7 +3087,7 @@ version = "0.6.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507" dependencies = [ - "bytes 1.1.0", + "bytes 1.5.0", "futures-core", "futures-sink", "log", @@ -3076,7 +3101,7 @@ version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" dependencies = [ - "bytes 1.1.0", + "bytes 1.5.0", "futures-core", "futures-sink", "pin-project-lite", @@ -3094,7 +3119,20 @@ dependencies = [ "futures", "libc", "tokio", - "vsock", + "vsock 0.2.6", +] + +[[package]] +name = "tokio-vsock" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52a15c15b1bc91f90902347eff163b5b682643aff0c8e972912cca79bd9208dd" +dependencies = [ + "bytes 1.5.0", + "futures", + "libc", + "tokio", + "vsock 0.3.0", ] [[package]] @@ -3209,21 +3247,23 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "ttrpc" -version = "0.7.1" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a35f22a2964bea14afee161665bb260b83cb48e665e0260ca06ec0e775c8b06c" +checksum = "55ea338db445bee75c596cf8a478fbfcefad5a943c9e92a7e1c805c65ed39551" dependencies = [ "async-trait", "byteorder", + "crossbeam", "futures", "libc", "log", - "nix 0.23.1", + "nix 0.26.4", "protobuf 3.2.0", "protobuf-codegen 3.2.0", "thiserror", "tokio", - "tokio-vsock", + "tokio-vsock 0.4.0", + "windows-sys 0.48.0", ] [[package]] @@ -3347,6 +3387,16 @@ dependencies = [ "nix 0.23.1", ] +[[package]] +name = "vsock" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c8e1df0bf1e1b28095c24564d1b90acae64ca69b097ed73896e342fa6649c57" +dependencies = [ + "libc", + "nix 0.24.2", +] + [[package]] name = "vsock-exporter" version = "0.1.0" @@ -3361,7 +3411,7 @@ dependencies = [ "slog", "thiserror", "tokio", - "tokio-vsock", + "tokio-vsock 0.3.1", ] [[package]] diff --git a/src/agent/Cargo.toml b/src/agent/Cargo.toml index e7cb0f7c2d..eb51ee1bd7 100644 --- a/src/agent/Cargo.toml +++ b/src/agent/Cargo.toml @@ -10,7 +10,7 @@ oci = { path = "../libs/oci" } rustjail = { path = "rustjail" } protocols = { path = "../libs/protocols", features = ["async", "with-serde"] } lazy_static = "1.3.0" -ttrpc = { version = "0.7.1", features = ["async"], default-features = false } +ttrpc = { version = "0.8", features = ["async"], default-features = false } protobuf = "3.2.0" libc = "0.2.58" nix = "0.24.2"