From 3e879247bf0b9cc49dbfee46df0373c43cf5bb66 Mon Sep 17 00:00:00 2001 From: Daniyar Itegulov Date: Tue, 9 Jan 2024 18:43:53 +1100 Subject: [PATCH] upgrade zerocopy --- Cargo.lock | 113 +++++++++++++++++++++++++++++++++------- mpc-recovery/Cargo.toml | 3 +- 2 files changed, 95 insertions(+), 21 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ab54f35d7..b11c64104 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2873,6 +2873,12 @@ version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + [[package]] name = "goblin" version = "0.5.4" @@ -3879,7 +3885,7 @@ dependencies = [ "near-jsonrpc-primitives", "near-primitives 0.17.0", "opentelemetry 0.20.0", - "opentelemetry-otlp 0.13.0", + "opentelemetry-otlp 0.14.0", "opentelemetry-semantic-conventions 0.12.0", "prometheus", "rand 0.8.5", @@ -3898,6 +3904,7 @@ dependencies = [ "tracing-opentelemetry 0.21.0", "tracing-subscriber", "yup-oauth2", + "zerocopy", ] [[package]] @@ -4938,7 +4945,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9591d937bc0e6d2feb6f71a559540ab300ea49955229c347a517a28d27784c54" dependencies = [ "opentelemetry_api", - "opentelemetry_sdk", + "opentelemetry_sdk 0.20.0", +] + +[[package]] +name = "opentelemetry" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e32339a5dc40459130b3bd269e9892439f55b33e772d2a9d402a789baaf4e8a" +dependencies = [ + "futures-core", + "futures-sink", + "indexmap 2.1.0", + "js-sys", + "once_cell", + "pin-project-lite", + "thiserror", + "urlencoding", ] [[package]] @@ -4951,6 +4974,18 @@ dependencies = [ "bytes", "http", "opentelemetry_api", +] + +[[package]] +name = "opentelemetry-http" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f51189ce8be654f9b5f7e70e49967ed894e84a06fc35c6c042e64ac1fc5399e" +dependencies = [ + "async-trait", + "bytes", + "http", + "opentelemetry 0.21.0", "reqwest", ] @@ -4974,18 +5009,18 @@ dependencies = [ [[package]] name = "opentelemetry-otlp" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e5e5a5c4135864099f3faafbe939eb4d7f9b80ebf68a8448da961b32a7c1275" +checksum = "f24cda83b20ed2433c68241f918d0f6fdec8b1d43b7a9590ab4420c5095ca930" dependencies = [ "async-trait", "futures-core", "http", - "opentelemetry-http", + "opentelemetry 0.21.0", + "opentelemetry-http 0.10.0", "opentelemetry-proto", - "opentelemetry-semantic-conventions 0.12.0", - "opentelemetry_api", - "opentelemetry_sdk", + "opentelemetry-semantic-conventions 0.13.0", + "opentelemetry_sdk 0.21.2", "prost 0.11.9", "reqwest", "thiserror", @@ -4995,12 +5030,12 @@ dependencies = [ [[package]] name = "opentelemetry-proto" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1e3f814aa9f8c905d0ee4bde026afd3b2577a97c10e1699912e3e44f0c4cbeb" +checksum = "a2e155ce5cc812ea3d1dffbd1539aed653de4bf4882d60e6e04dcf0901d674e1" dependencies = [ - "opentelemetry_api", - "opentelemetry_sdk", + "opentelemetry 0.21.0", + "opentelemetry_sdk 0.21.2", "prost 0.11.9", "tonic 0.9.2", ] @@ -5023,6 +5058,15 @@ dependencies = [ "opentelemetry 0.20.0", ] +[[package]] +name = "opentelemetry-semantic-conventions" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5774f1ef1f982ef2a447f6ee04ec383981a3ab99c8e77a1a7b30182e65bbc84" +dependencies = [ + "opentelemetry 0.21.0", +] + [[package]] name = "opentelemetry_api" version = "0.20.0" @@ -5052,16 +5096,35 @@ dependencies = [ "futures-util", "once_cell", "opentelemetry_api", - "ordered-float", + "ordered-float 3.9.2", "percent-encoding 2.3.1", "rand 0.8.5", "regex", - "serde_json", "thiserror", "tokio", "tokio-stream", ] +[[package]] +name = "opentelemetry_sdk" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f16aec8a98a457a52664d69e0091bac3a0abd18ead9b641cb00202ba4e0efe4" +dependencies = [ + "async-trait", + "crossbeam-channel", + "futures-channel", + "futures-executor", + "futures-util", + "glob", + "once_cell", + "opentelemetry 0.21.0", + "ordered-float 4.2.0", + "percent-encoding 2.3.1", + "rand 0.8.5", + "thiserror", +] + [[package]] name = "ordered-float" version = "3.9.2" @@ -5071,6 +5134,15 @@ dependencies = [ "num-traits", ] +[[package]] +name = "ordered-float" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a76df7075c7d4d01fdcb46c912dd17fba5b60c78ea480b475f2b6ab6f666584e" +dependencies = [ + "num-traits", +] + [[package]] name = "os_str_bytes" version = "6.6.1" @@ -7632,7 +7704,7 @@ checksum = "75327c6b667828ddc28f5e3f169036cb793c3f588d83bf0f262a7f062ffed3c8" dependencies = [ "once_cell", "opentelemetry 0.20.0", - "opentelemetry_sdk", + "opentelemetry_sdk 0.20.0", "smallvec", "tracing", "tracing-core", @@ -7647,7 +7719,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f523eba1b52bb854b804d43a039aafeaee5a623015065adbfef8016825319c15" dependencies = [ "http", - "opentelemetry-http", + "opentelemetry-http 0.9.0", "opentelemetry_api", "tracing", "tracing-opentelemetry 0.21.0", @@ -8286,18 +8358,19 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.26" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" dependencies = [ + "byteorder", "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.26" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", diff --git a/mpc-recovery/Cargo.toml b/mpc-recovery/Cargo.toml index 627327638..b3e5e09bf 100644 --- a/mpc-recovery/Cargo.toml +++ b/mpc-recovery/Cargo.toml @@ -29,7 +29,7 @@ hyper-rustls = { version = "=0.23", features = ["http2"] } jsonwebtoken = "8.3.0" lazy_static = "1.4.0" opentelemetry = { version = "0.20.0", features = ["rt-tokio", "trace"] } -opentelemetry-otlp = { version = "0.13.0", features = [ +opentelemetry-otlp = { version = "0.14.0", features = [ "http-proto", "reqwest-client", ] } @@ -59,6 +59,7 @@ curv = { package = "curv-kzen", version = "0.9", default-features = false } # TODO: Update to >=2 to resolve RUSTSEC-2022-0093 ed25519-dalek = { version = "1.0.1", features = ["serde"] } sha2 = "0.9.9" +zerocopy = "0.7.32" [dev-dependencies] rsa = "0.8.2"