From 5d9e3bf5a38704ad1ace998e04824cdb5b207f69 Mon Sep 17 00:00:00 2001 From: Oleksandr Tkachenko Date: Mon, 5 Feb 2024 14:38:38 +0000 Subject: [PATCH] chore(crypto): CRP-2380 bump `tarpc` version to `0.34` --- Cargo.Bazel.Fuzzing.json.lock | 279 +++++++++++++----- Cargo.Bazel.Fuzzing.toml.lock | 72 +++-- Cargo.Bazel.json.lock | 279 +++++++++++++----- Cargo.Bazel.toml.lock | 72 +++-- Cargo.lock | 77 +++-- bazel/external_crates.bzl | 2 +- gitlab-ci/src/rust_lint/lint.sh | 2 +- .../crypto_service_provider/BUILD.bazel | 1 + .../crypto_service_provider/Cargo.toml | 3 +- .../tarpc_csp_vault_server.rs | 12 +- 10 files changed, 556 insertions(+), 243 deletions(-) diff --git a/Cargo.Bazel.Fuzzing.json.lock b/Cargo.Bazel.Fuzzing.json.lock index 5012189e0b0..d5e60cfffc1 100644 --- a/Cargo.Bazel.Fuzzing.json.lock +++ b/Cargo.Bazel.Fuzzing.json.lock @@ -1,5 +1,5 @@ { - "checksum": "a319c9fb6bb0b420cfe73494206c033ba3565d0de66d7314ac1b2fca923006d9", + "checksum": "97c43761d072bbe03d013ced69affc85dacfca255ce291e922ca9df6031b8cf9", "crates": { "abnf 0.12.0": { "name": "abnf", @@ -16132,7 +16132,7 @@ "target": "tar" }, { - "id": "tarpc 0.32.0", + "id": "tarpc 0.34.0", "target": "tarpc" }, { @@ -36280,13 +36280,13 @@ }, "license": "MIT" }, - "opentelemetry 0.17.0": { + "opentelemetry 0.18.0": { "name": "opentelemetry", - "version": "0.17.0", + "version": "0.18.0", "repository": { "Http": { - "url": "https://crates.io/api/v1/crates/opentelemetry/0.17.0/download", - "sha256": "6105e89802af13fdf48c49d7646d3b533a70e536d818aae7e78ba0433d01acb8" + "url": "https://crates.io/api/v1/crates/opentelemetry/0.18.0/download", + "sha256": "69d6c3d7288a106c0a363e4b0e8d308058d56902adefb16f4936f417ffef086e" } }, "targets": [ @@ -36307,11 +36307,6 @@ ], "crate_features": { "common": [ - "async-trait", - "crossbeam-channel", - "percent-encoding", - "pin-project", - "rand", "trace" ], "selects": {} @@ -36319,62 +36314,18 @@ "deps": { "common": [ { - "id": "crossbeam-channel 0.5.8", - "target": "crossbeam_channel" - }, - { - "id": "futures-channel 0.3.30", - "target": "futures_channel" - }, - { - "id": "futures-executor 0.3.28", - "target": "futures_executor" - }, - { - "id": "futures-util 0.3.30", - "target": "futures_util" - }, - { - "id": "lazy_static 1.4.0", - "target": "lazy_static" - }, - { - "id": "percent-encoding 2.3.0", - "target": "percent_encoding" - }, - { - "id": "pin-project 1.1.3", - "target": "pin_project" - }, - { - "id": "rand 0.8.5", - "target": "rand" + "id": "opentelemetry_api 0.18.0", + "target": "opentelemetry_api" }, { - "id": "thiserror 1.0.56", - "target": "thiserror" - } - ], - "selects": { - "cfg(target_arch = \"wasm32\")": [ - { - "id": "js-sys 0.3.64", - "target": "js_sys" - } - ] - } - }, - "edition": "2018", - "proc_macro_deps": { - "common": [ - { - "id": "async-trait 0.1.74", - "target": "async_trait" + "id": "opentelemetry_sdk 0.18.0", + "target": "opentelemetry_sdk" } ], "selects": {} }, - "version": "0.17.0" + "edition": "2021", + "version": "0.18.0" }, "license": "Apache-2.0" }, @@ -36663,6 +36614,80 @@ }, "license": "Apache-2.0" }, + "opentelemetry_api 0.18.0": { + "name": "opentelemetry_api", + "version": "0.18.0", + "repository": { + "Http": { + "url": "https://crates.io/api/v1/crates/opentelemetry_api/0.18.0/download", + "sha256": "c24f96e21e7acc813c7a8394ee94978929db2bcc46cf6b5014fc612bf7760c22" + } + }, + "targets": [ + { + "Library": { + "crate_name": "opentelemetry_api", + "crate_root": "src/lib.rs", + "srcs": [ + "**/*.rs" + ] + } + } + ], + "library_target_name": "opentelemetry_api", + "common_attrs": { + "compile_data_glob": [ + "**" + ], + "crate_features": { + "common": [ + "default", + "pin-project-lite", + "trace" + ], + "selects": {} + }, + "deps": { + "common": [ + { + "id": "futures-channel 0.3.30", + "target": "futures_channel" + }, + { + "id": "futures-util 0.3.30", + "target": "futures_util" + }, + { + "id": "indexmap 1.9.3", + "target": "indexmap" + }, + { + "id": "once_cell 1.19.0", + "target": "once_cell" + }, + { + "id": "pin-project-lite 0.2.13", + "target": "pin_project_lite" + }, + { + "id": "thiserror 1.0.56", + "target": "thiserror" + } + ], + "selects": { + "cfg(target_arch = \"wasm32\")": [ + { + "id": "js-sys 0.3.64", + "target": "js_sys" + } + ] + } + }, + "edition": "2021", + "version": "0.18.0" + }, + "license": "Apache-2.0" + }, "opentelemetry_api 0.20.0": { "name": "opentelemetry_api", "version": "0.20.0", @@ -36742,6 +36767,97 @@ }, "license": "Apache-2.0" }, + "opentelemetry_sdk 0.18.0": { + "name": "opentelemetry_sdk", + "version": "0.18.0", + "repository": { + "Http": { + "url": "https://crates.io/api/v1/crates/opentelemetry_sdk/0.18.0/download", + "sha256": "1ca41c4933371b61c2a2f214bf16931499af4ec90543604ec828f7a625c09113" + } + }, + "targets": [ + { + "Library": { + "crate_name": "opentelemetry_sdk", + "crate_root": "src/lib.rs", + "srcs": [ + "**/*.rs" + ] + } + } + ], + "library_target_name": "opentelemetry_sdk", + "common_attrs": { + "compile_data_glob": [ + "**" + ], + "crate_features": { + "common": [ + "async-trait", + "crossbeam-channel", + "default", + "percent-encoding", + "rand", + "trace" + ], + "selects": {} + }, + "deps": { + "common": [ + { + "id": "crossbeam-channel 0.5.8", + "target": "crossbeam_channel" + }, + { + "id": "futures-channel 0.3.30", + "target": "futures_channel" + }, + { + "id": "futures-executor 0.3.28", + "target": "futures_executor" + }, + { + "id": "futures-util 0.3.30", + "target": "futures_util" + }, + { + "id": "once_cell 1.19.0", + "target": "once_cell" + }, + { + "id": "opentelemetry_api 0.18.0", + "target": "opentelemetry_api" + }, + { + "id": "percent-encoding 2.3.0", + "target": "percent_encoding" + }, + { + "id": "rand 0.8.5", + "target": "rand" + }, + { + "id": "thiserror 1.0.56", + "target": "thiserror" + } + ], + "selects": {} + }, + "edition": "2021", + "proc_macro_deps": { + "common": [ + { + "id": "async-trait 0.1.74", + "target": "async_trait" + } + ], + "selects": {} + }, + "version": "0.18.0" + }, + "license": "Apache-2.0" + }, "opentelemetry_sdk 0.20.0": { "name": "opentelemetry_sdk", "version": "0.20.0", @@ -48717,6 +48833,7 @@ "alloc", "default", "derive", + "rc", "serde_derive", "std" ], @@ -53407,13 +53524,13 @@ }, "license": "Apache-2.0 WITH LLVM-exception" }, - "tarpc 0.32.0": { + "tarpc 0.34.0": { "name": "tarpc", - "version": "0.32.0", + "version": "0.34.0", "repository": { "Http": { - "url": "https://crates.io/api/v1/crates/tarpc/0.32.0/download", - "sha256": "f07cb5fb67b0a90ea954b5ffd2fac9944ffef5937c801b987d3f8913f0c37348" + "url": "https://crates.io/api/v1/crates/tarpc/0.34.0/download", + "sha256": "93a1870169fb9490fb3b37df7f50782986475c33cb90955f9f9b9ae659124200" } }, "targets": [ @@ -53467,7 +53584,7 @@ "target": "humantime" }, { - "id": "opentelemetry 0.17.0", + "id": "opentelemetry 0.18.0", "target": "opentelemetry" }, { @@ -53507,7 +53624,7 @@ "target": "tracing" }, { - "id": "tracing-opentelemetry 0.17.4", + "id": "tracing-opentelemetry 0.18.0", "target": "tracing_opentelemetry" } ], @@ -53517,23 +53634,23 @@ "proc_macro_deps": { "common": [ { - "id": "tarpc-plugins 0.12.0", + "id": "tarpc-plugins 0.13.1", "target": "tarpc_plugins" } ], "selects": {} }, - "version": "0.32.0" + "version": "0.34.0" }, "license": "MIT" }, - "tarpc-plugins 0.12.0": { + "tarpc-plugins 0.13.1": { "name": "tarpc-plugins", - "version": "0.12.0", + "version": "0.13.1", "repository": { "Http": { - "url": "https://crates.io/api/v1/crates/tarpc-plugins/0.12.0/download", - "sha256": "0ee42b4e559f17bce0385ebf511a7beb67d5cc33c12c96b7f4e9789919d9c10f" + "url": "https://crates.io/api/v1/crates/tarpc-plugins/0.13.1/download", + "sha256": "ad8302bea2fb8a2b01b025d23414b0b4ed32a783b95e5d818c3320a8bc4baada" } }, "targets": [ @@ -53575,8 +53692,8 @@ ], "selects": {} }, - "edition": "2018", - "version": "0.12.0" + "edition": "2021", + "version": "0.13.1" }, "license": "MIT" }, @@ -56665,13 +56782,13 @@ }, "license": "MIT" }, - "tracing-opentelemetry 0.17.4": { + "tracing-opentelemetry 0.18.0": { "name": "tracing-opentelemetry", - "version": "0.17.4", + "version": "0.18.0", "repository": { "Http": { - "url": "https://crates.io/api/v1/crates/tracing-opentelemetry/0.17.4/download", - "sha256": "fbbe89715c1dbbb790059e2565353978564924ee85017b5fff365c872ff6721f" + "url": "https://crates.io/api/v1/crates/tracing-opentelemetry/0.18.0/download", + "sha256": "21ebb87a95ea13271332df069020513ab70bdb5637ca42d6e492dc3bbbad48de" } }, "targets": [ @@ -56697,7 +56814,7 @@ "target": "once_cell" }, { - "id": "opentelemetry 0.17.0", + "id": "opentelemetry 0.18.0", "target": "opentelemetry" }, { @@ -56716,7 +56833,7 @@ "selects": {} }, "edition": "2018", - "version": "0.17.4" + "version": "0.18.0" }, "license": "MIT" }, diff --git a/Cargo.Bazel.Fuzzing.toml.lock b/Cargo.Bazel.Fuzzing.toml.lock index bab0e3639ee..8e28958fd75 100644 --- a/Cargo.Bazel.Fuzzing.toml.lock +++ b/Cargo.Bazel.Fuzzing.toml.lock @@ -7089,21 +7089,12 @@ dependencies = [ [[package]] name = "opentelemetry" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6105e89802af13fdf48c49d7646d3b533a70e536d818aae7e78ba0433d01acb8" +checksum = "69d6c3d7288a106c0a363e4b0e8d308058d56902adefb16f4936f417ffef086e" dependencies = [ - "async-trait", - "crossbeam-channel", - "futures-channel", - "futures-executor", - "futures-util", - "js-sys", - "lazy_static", - "percent-encoding 2.3.0", - "pin-project", - "rand 0.8.5", - "thiserror", + "opentelemetry_api 0.18.0", + "opentelemetry_sdk 0.18.0", ] [[package]] @@ -7112,7 +7103,7 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9591d937bc0e6d2feb6f71a559540ab300ea49955229c347a517a28d27784c54" dependencies = [ - "opentelemetry_api", + "opentelemetry_api 0.20.0", "opentelemetry_sdk 0.20.0", ] @@ -7139,7 +7130,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7d81bc254e2d572120363a2b16cdb0d715d301b5789be0cfc26ad87e4e10e53" dependencies = [ "once_cell", - "opentelemetry_api", + "opentelemetry_api 0.20.0", "opentelemetry_sdk 0.20.0", "prometheus", "protobuf", @@ -7167,6 +7158,21 @@ dependencies = [ "opentelemetry 0.21.0", ] +[[package]] +name = "opentelemetry_api" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c24f96e21e7acc813c7a8394ee94978929db2bcc46cf6b5014fc612bf7760c22" +dependencies = [ + "futures-channel", + "futures-util", + "indexmap 1.9.3", + "js-sys", + "once_cell", + "pin-project-lite", + "thiserror", +] + [[package]] name = "opentelemetry_api" version = "0.20.0" @@ -7183,6 +7189,24 @@ dependencies = [ "urlencoding", ] +[[package]] +name = "opentelemetry_sdk" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ca41c4933371b61c2a2f214bf16931499af4ec90543604ec828f7a625c09113" +dependencies = [ + "async-trait", + "crossbeam-channel", + "futures-channel", + "futures-executor", + "futures-util", + "once_cell", + "opentelemetry_api 0.18.0", + "percent-encoding 2.3.0", + "rand 0.8.5", + "thiserror", +] + [[package]] name = "opentelemetry_sdk" version = "0.20.0" @@ -7195,7 +7219,7 @@ dependencies = [ "futures-executor", "futures-util", "once_cell", - "opentelemetry_api", + "opentelemetry_api 0.20.0", "ordered-float 3.9.2", "percent-encoding 2.3.0", "rand 0.8.5", @@ -10346,15 +10370,15 @@ checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" [[package]] name = "tarpc" -version = "0.32.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f07cb5fb67b0a90ea954b5ffd2fac9944ffef5937c801b987d3f8913f0c37348" +checksum = "93a1870169fb9490fb3b37df7f50782986475c33cb90955f9f9b9ae659124200" dependencies = [ "anyhow", "fnv", "futures", "humantime", - "opentelemetry 0.17.0", + "opentelemetry 0.18.0", "pin-project", "rand 0.8.5", "serde", @@ -10370,9 +10394,9 @@ dependencies = [ [[package]] name = "tarpc-plugins" -version = "0.12.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ee42b4e559f17bce0385ebf511a7beb67d5cc33c12c96b7f4e9789919d9c10f" +checksum = "ad8302bea2fb8a2b01b025d23414b0b4ed32a783b95e5d818c3320a8bc4baada" dependencies = [ "proc-macro2 1.0.76", "quote 1.0.35", @@ -11010,12 +11034,12 @@ dependencies = [ [[package]] name = "tracing-opentelemetry" -version = "0.17.4" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbbe89715c1dbbb790059e2565353978564924ee85017b5fff365c872ff6721f" +checksum = "21ebb87a95ea13271332df069020513ab70bdb5637ca42d6e492dc3bbbad48de" dependencies = [ "once_cell", - "opentelemetry 0.17.0", + "opentelemetry 0.18.0", "tracing", "tracing-core", "tracing-subscriber", diff --git a/Cargo.Bazel.json.lock b/Cargo.Bazel.json.lock index 47cd3603980..a6abb883df1 100644 --- a/Cargo.Bazel.json.lock +++ b/Cargo.Bazel.json.lock @@ -1,5 +1,5 @@ { - "checksum": "93cb7e4e75351f6e7360907725f398bdd2564a2dea986e4eabc990c82006d7d4", + "checksum": "3a5b4ed1189bc7a68e0626286aee41ac3a64a81b7e8a23e9aec4069ede4e7230", "crates": { "abnf 0.12.0": { "name": "abnf", @@ -16001,7 +16001,7 @@ "target": "tar" }, { - "id": "tarpc 0.32.0", + "id": "tarpc 0.34.0", "target": "tarpc" }, { @@ -36241,13 +36241,13 @@ }, "license": "MIT" }, - "opentelemetry 0.17.0": { + "opentelemetry 0.18.0": { "name": "opentelemetry", - "version": "0.17.0", + "version": "0.18.0", "repository": { "Http": { - "url": "https://crates.io/api/v1/crates/opentelemetry/0.17.0/download", - "sha256": "6105e89802af13fdf48c49d7646d3b533a70e536d818aae7e78ba0433d01acb8" + "url": "https://crates.io/api/v1/crates/opentelemetry/0.18.0/download", + "sha256": "69d6c3d7288a106c0a363e4b0e8d308058d56902adefb16f4936f417ffef086e" } }, "targets": [ @@ -36268,11 +36268,6 @@ ], "crate_features": { "common": [ - "async-trait", - "crossbeam-channel", - "percent-encoding", - "pin-project", - "rand", "trace" ], "selects": {} @@ -36280,62 +36275,18 @@ "deps": { "common": [ { - "id": "crossbeam-channel 0.5.8", - "target": "crossbeam_channel" - }, - { - "id": "futures-channel 0.3.30", - "target": "futures_channel" - }, - { - "id": "futures-executor 0.3.28", - "target": "futures_executor" - }, - { - "id": "futures-util 0.3.30", - "target": "futures_util" - }, - { - "id": "lazy_static 1.4.0", - "target": "lazy_static" - }, - { - "id": "percent-encoding 2.3.0", - "target": "percent_encoding" - }, - { - "id": "pin-project 1.1.2", - "target": "pin_project" - }, - { - "id": "rand 0.8.5", - "target": "rand" + "id": "opentelemetry_api 0.18.0", + "target": "opentelemetry_api" }, { - "id": "thiserror 1.0.56", - "target": "thiserror" - } - ], - "selects": { - "cfg(target_arch = \"wasm32\")": [ - { - "id": "js-sys 0.3.64", - "target": "js_sys" - } - ] - } - }, - "edition": "2018", - "proc_macro_deps": { - "common": [ - { - "id": "async-trait 0.1.73", - "target": "async_trait" + "id": "opentelemetry_sdk 0.18.0", + "target": "opentelemetry_sdk" } ], "selects": {} }, - "version": "0.17.0" + "edition": "2021", + "version": "0.18.0" }, "license": "Apache-2.0" }, @@ -36624,6 +36575,80 @@ }, "license": "Apache-2.0" }, + "opentelemetry_api 0.18.0": { + "name": "opentelemetry_api", + "version": "0.18.0", + "repository": { + "Http": { + "url": "https://crates.io/api/v1/crates/opentelemetry_api/0.18.0/download", + "sha256": "c24f96e21e7acc813c7a8394ee94978929db2bcc46cf6b5014fc612bf7760c22" + } + }, + "targets": [ + { + "Library": { + "crate_name": "opentelemetry_api", + "crate_root": "src/lib.rs", + "srcs": [ + "**/*.rs" + ] + } + } + ], + "library_target_name": "opentelemetry_api", + "common_attrs": { + "compile_data_glob": [ + "**" + ], + "crate_features": { + "common": [ + "default", + "pin-project-lite", + "trace" + ], + "selects": {} + }, + "deps": { + "common": [ + { + "id": "futures-channel 0.3.30", + "target": "futures_channel" + }, + { + "id": "futures-util 0.3.30", + "target": "futures_util" + }, + { + "id": "indexmap 1.9.3", + "target": "indexmap" + }, + { + "id": "once_cell 1.19.0", + "target": "once_cell" + }, + { + "id": "pin-project-lite 0.2.13", + "target": "pin_project_lite" + }, + { + "id": "thiserror 1.0.56", + "target": "thiserror" + } + ], + "selects": { + "cfg(target_arch = \"wasm32\")": [ + { + "id": "js-sys 0.3.64", + "target": "js_sys" + } + ] + } + }, + "edition": "2021", + "version": "0.18.0" + }, + "license": "Apache-2.0" + }, "opentelemetry_api 0.20.0": { "name": "opentelemetry_api", "version": "0.20.0", @@ -36703,6 +36728,97 @@ }, "license": "Apache-2.0" }, + "opentelemetry_sdk 0.18.0": { + "name": "opentelemetry_sdk", + "version": "0.18.0", + "repository": { + "Http": { + "url": "https://crates.io/api/v1/crates/opentelemetry_sdk/0.18.0/download", + "sha256": "1ca41c4933371b61c2a2f214bf16931499af4ec90543604ec828f7a625c09113" + } + }, + "targets": [ + { + "Library": { + "crate_name": "opentelemetry_sdk", + "crate_root": "src/lib.rs", + "srcs": [ + "**/*.rs" + ] + } + } + ], + "library_target_name": "opentelemetry_sdk", + "common_attrs": { + "compile_data_glob": [ + "**" + ], + "crate_features": { + "common": [ + "async-trait", + "crossbeam-channel", + "default", + "percent-encoding", + "rand", + "trace" + ], + "selects": {} + }, + "deps": { + "common": [ + { + "id": "crossbeam-channel 0.5.8", + "target": "crossbeam_channel" + }, + { + "id": "futures-channel 0.3.30", + "target": "futures_channel" + }, + { + "id": "futures-executor 0.3.28", + "target": "futures_executor" + }, + { + "id": "futures-util 0.3.30", + "target": "futures_util" + }, + { + "id": "once_cell 1.19.0", + "target": "once_cell" + }, + { + "id": "opentelemetry_api 0.18.0", + "target": "opentelemetry_api" + }, + { + "id": "percent-encoding 2.3.0", + "target": "percent_encoding" + }, + { + "id": "rand 0.8.5", + "target": "rand" + }, + { + "id": "thiserror 1.0.56", + "target": "thiserror" + } + ], + "selects": {} + }, + "edition": "2021", + "proc_macro_deps": { + "common": [ + { + "id": "async-trait 0.1.73", + "target": "async_trait" + } + ], + "selects": {} + }, + "version": "0.18.0" + }, + "license": "Apache-2.0" + }, "opentelemetry_sdk 0.20.0": { "name": "opentelemetry_sdk", "version": "0.20.0", @@ -48669,6 +48785,7 @@ "alloc", "default", "derive", + "rc", "serde_derive", "std" ], @@ -53359,13 +53476,13 @@ }, "license": "Apache-2.0 WITH LLVM-exception" }, - "tarpc 0.32.0": { + "tarpc 0.34.0": { "name": "tarpc", - "version": "0.32.0", + "version": "0.34.0", "repository": { "Http": { - "url": "https://crates.io/api/v1/crates/tarpc/0.32.0/download", - "sha256": "f07cb5fb67b0a90ea954b5ffd2fac9944ffef5937c801b987d3f8913f0c37348" + "url": "https://crates.io/api/v1/crates/tarpc/0.34.0/download", + "sha256": "93a1870169fb9490fb3b37df7f50782986475c33cb90955f9f9b9ae659124200" } }, "targets": [ @@ -53419,7 +53536,7 @@ "target": "humantime" }, { - "id": "opentelemetry 0.17.0", + "id": "opentelemetry 0.18.0", "target": "opentelemetry" }, { @@ -53459,7 +53576,7 @@ "target": "tracing" }, { - "id": "tracing-opentelemetry 0.17.4", + "id": "tracing-opentelemetry 0.18.0", "target": "tracing_opentelemetry" } ], @@ -53469,23 +53586,23 @@ "proc_macro_deps": { "common": [ { - "id": "tarpc-plugins 0.12.0", + "id": "tarpc-plugins 0.13.1", "target": "tarpc_plugins" } ], "selects": {} }, - "version": "0.32.0" + "version": "0.34.0" }, "license": "MIT" }, - "tarpc-plugins 0.12.0": { + "tarpc-plugins 0.13.1": { "name": "tarpc-plugins", - "version": "0.12.0", + "version": "0.13.1", "repository": { "Http": { - "url": "https://crates.io/api/v1/crates/tarpc-plugins/0.12.0/download", - "sha256": "0ee42b4e559f17bce0385ebf511a7beb67d5cc33c12c96b7f4e9789919d9c10f" + "url": "https://crates.io/api/v1/crates/tarpc-plugins/0.13.1/download", + "sha256": "ad8302bea2fb8a2b01b025d23414b0b4ed32a783b95e5d818c3320a8bc4baada" } }, "targets": [ @@ -53527,8 +53644,8 @@ ], "selects": {} }, - "edition": "2018", - "version": "0.12.0" + "edition": "2021", + "version": "0.13.1" }, "license": "MIT" }, @@ -56648,13 +56765,13 @@ }, "license": "MIT" }, - "tracing-opentelemetry 0.17.4": { + "tracing-opentelemetry 0.18.0": { "name": "tracing-opentelemetry", - "version": "0.17.4", + "version": "0.18.0", "repository": { "Http": { - "url": "https://crates.io/api/v1/crates/tracing-opentelemetry/0.17.4/download", - "sha256": "fbbe89715c1dbbb790059e2565353978564924ee85017b5fff365c872ff6721f" + "url": "https://crates.io/api/v1/crates/tracing-opentelemetry/0.18.0/download", + "sha256": "21ebb87a95ea13271332df069020513ab70bdb5637ca42d6e492dc3bbbad48de" } }, "targets": [ @@ -56680,7 +56797,7 @@ "target": "once_cell" }, { - "id": "opentelemetry 0.17.0", + "id": "opentelemetry 0.18.0", "target": "opentelemetry" }, { @@ -56699,7 +56816,7 @@ "selects": {} }, "edition": "2018", - "version": "0.17.4" + "version": "0.18.0" }, "license": "MIT" }, diff --git a/Cargo.Bazel.toml.lock b/Cargo.Bazel.toml.lock index 6459d23e615..c13b9598fb7 100644 --- a/Cargo.Bazel.toml.lock +++ b/Cargo.Bazel.toml.lock @@ -7096,21 +7096,12 @@ dependencies = [ [[package]] name = "opentelemetry" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6105e89802af13fdf48c49d7646d3b533a70e536d818aae7e78ba0433d01acb8" +checksum = "69d6c3d7288a106c0a363e4b0e8d308058d56902adefb16f4936f417ffef086e" dependencies = [ - "async-trait", - "crossbeam-channel", - "futures-channel", - "futures-executor", - "futures-util", - "js-sys", - "lazy_static", - "percent-encoding 2.3.0", - "pin-project", - "rand 0.8.5", - "thiserror", + "opentelemetry_api 0.18.0", + "opentelemetry_sdk 0.18.0", ] [[package]] @@ -7119,7 +7110,7 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9591d937bc0e6d2feb6f71a559540ab300ea49955229c347a517a28d27784c54" dependencies = [ - "opentelemetry_api", + "opentelemetry_api 0.20.0", "opentelemetry_sdk 0.20.0", ] @@ -7146,7 +7137,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7d81bc254e2d572120363a2b16cdb0d715d301b5789be0cfc26ad87e4e10e53" dependencies = [ "once_cell", - "opentelemetry_api", + "opentelemetry_api 0.20.0", "opentelemetry_sdk 0.20.0", "prometheus", "protobuf", @@ -7174,6 +7165,21 @@ dependencies = [ "opentelemetry 0.21.0", ] +[[package]] +name = "opentelemetry_api" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c24f96e21e7acc813c7a8394ee94978929db2bcc46cf6b5014fc612bf7760c22" +dependencies = [ + "futures-channel", + "futures-util", + "indexmap 1.9.3", + "js-sys", + "once_cell", + "pin-project-lite", + "thiserror", +] + [[package]] name = "opentelemetry_api" version = "0.20.0" @@ -7190,6 +7196,24 @@ dependencies = [ "urlencoding", ] +[[package]] +name = "opentelemetry_sdk" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ca41c4933371b61c2a2f214bf16931499af4ec90543604ec828f7a625c09113" +dependencies = [ + "async-trait", + "crossbeam-channel", + "futures-channel", + "futures-executor", + "futures-util", + "once_cell", + "opentelemetry_api 0.18.0", + "percent-encoding 2.3.0", + "rand 0.8.5", + "thiserror", +] + [[package]] name = "opentelemetry_sdk" version = "0.20.0" @@ -7202,7 +7226,7 @@ dependencies = [ "futures-executor", "futures-util", "once_cell", - "opentelemetry_api", + "opentelemetry_api 0.20.0", "ordered-float 3.7.0", "percent-encoding 2.3.0", "rand 0.8.5", @@ -10349,15 +10373,15 @@ checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" [[package]] name = "tarpc" -version = "0.32.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f07cb5fb67b0a90ea954b5ffd2fac9944ffef5937c801b987d3f8913f0c37348" +checksum = "93a1870169fb9490fb3b37df7f50782986475c33cb90955f9f9b9ae659124200" dependencies = [ "anyhow", "fnv", "futures", "humantime", - "opentelemetry 0.17.0", + "opentelemetry 0.18.0", "pin-project", "rand 0.8.5", "serde", @@ -10373,9 +10397,9 @@ dependencies = [ [[package]] name = "tarpc-plugins" -version = "0.12.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ee42b4e559f17bce0385ebf511a7beb67d5cc33c12c96b7f4e9789919d9c10f" +checksum = "ad8302bea2fb8a2b01b025d23414b0b4ed32a783b95e5d818c3320a8bc4baada" dependencies = [ "proc-macro2 1.0.76", "quote 1.0.35", @@ -11015,12 +11039,12 @@ dependencies = [ [[package]] name = "tracing-opentelemetry" -version = "0.17.4" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbbe89715c1dbbb790059e2565353978564924ee85017b5fff365c872ff6721f" +checksum = "21ebb87a95ea13271332df069020513ab70bdb5637ca42d6e492dc3bbbad48de" dependencies = [ "once_cell", - "opentelemetry 0.17.0", + "opentelemetry 0.18.0", "tracing", "tracing-core", "tracing-subscriber", diff --git a/Cargo.lock b/Cargo.lock index 2ca25848164..7d47678797a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6472,6 +6472,7 @@ dependencies = [ "bincode", "bytes", "educe", + "futures", "hex", "ic-adapter-metrics", "ic-config", @@ -14078,21 +14079,12 @@ dependencies = [ [[package]] name = "opentelemetry" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6105e89802af13fdf48c49d7646d3b533a70e536d818aae7e78ba0433d01acb8" +checksum = "69d6c3d7288a106c0a363e4b0e8d308058d56902adefb16f4936f417ffef086e" dependencies = [ - "async-trait", - "crossbeam-channel", - "futures-channel", - "futures-executor", - "futures-util", - "js-sys", - "lazy_static", - "percent-encoding 2.3.0", - "pin-project", - "rand 0.8.5", - "thiserror", + "opentelemetry_api 0.18.0", + "opentelemetry_sdk 0.18.0", ] [[package]] @@ -14101,8 +14093,8 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9591d937bc0e6d2feb6f71a559540ab300ea49955229c347a517a28d27784c54" dependencies = [ - "opentelemetry_api", - "opentelemetry_sdk", + "opentelemetry_api 0.20.0", + "opentelemetry_sdk 0.20.0", ] [[package]] @@ -14112,12 +14104,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7d81bc254e2d572120363a2b16cdb0d715d301b5789be0cfc26ad87e4e10e53" dependencies = [ "once_cell", - "opentelemetry_api", - "opentelemetry_sdk", + "opentelemetry_api 0.20.0", + "opentelemetry_sdk 0.20.0", "prometheus", "protobuf", ] +[[package]] +name = "opentelemetry_api" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c24f96e21e7acc813c7a8394ee94978929db2bcc46cf6b5014fc612bf7760c22" +dependencies = [ + "futures-channel", + "futures-util", + "indexmap 1.9.2", + "js-sys", + "once_cell", + "pin-project-lite", + "thiserror", +] + [[package]] name = "opentelemetry_api" version = "0.20.0" @@ -14134,6 +14141,24 @@ dependencies = [ "urlencoding", ] +[[package]] +name = "opentelemetry_sdk" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ca41c4933371b61c2a2f214bf16931499af4ec90543604ec828f7a625c09113" +dependencies = [ + "async-trait", + "crossbeam-channel", + "futures-channel", + "futures-executor", + "futures-util", + "once_cell", + "opentelemetry_api 0.18.0", + "percent-encoding 2.3.0", + "rand 0.8.5", + "thiserror", +] + [[package]] name = "opentelemetry_sdk" version = "0.20.0" @@ -14146,7 +14171,7 @@ dependencies = [ "futures-executor", "futures-util", "once_cell", - "opentelemetry_api", + "opentelemetry_api 0.20.0", "ordered-float 3.7.0", "percent-encoding 2.3.0", "rand 0.8.5", @@ -17558,15 +17583,15 @@ checksum = "69758bda2e78f098e4ccb393021a0963bb3442eac05f135c30f61b7370bbafae" [[package]] name = "tarpc" -version = "0.32.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f07cb5fb67b0a90ea954b5ffd2fac9944ffef5937c801b987d3f8913f0c37348" +checksum = "93a1870169fb9490fb3b37df7f50782986475c33cb90955f9f9b9ae659124200" dependencies = [ "anyhow", "fnv", "futures", "humantime", - "opentelemetry 0.17.0", + "opentelemetry 0.18.0", "pin-project", "rand 0.8.5", "serde", @@ -17582,9 +17607,9 @@ dependencies = [ [[package]] name = "tarpc-plugins" -version = "0.12.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ee42b4e559f17bce0385ebf511a7beb67d5cc33c12c96b7f4e9789919d9c10f" +checksum = "ad8302bea2fb8a2b01b025d23414b0b4ed32a783b95e5d818c3320a8bc4baada" dependencies = [ "proc-macro2 1.0.75", "quote 1.0.35", @@ -18419,12 +18444,12 @@ dependencies = [ [[package]] name = "tracing-opentelemetry" -version = "0.17.4" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbbe89715c1dbbb790059e2565353978564924ee85017b5fff365c872ff6721f" +checksum = "21ebb87a95ea13271332df069020513ab70bdb5637ca42d6e492dc3bbbad48de" dependencies = [ "once_cell", - "opentelemetry 0.17.0", + "opentelemetry 0.18.0", "tracing", "tracing-core", "tracing-subscriber", diff --git a/bazel/external_crates.bzl b/bazel/external_crates.bzl index 220bc819cd2..652a67ed93a 100644 --- a/bazel/external_crates.bzl +++ b/bazel/external_crates.bzl @@ -1161,7 +1161,7 @@ def external_crates_repository(name, cargo_lockfile, lockfile, sanitizers_enable version = "^0.4.38", ), "tarpc": crate.spec( - version = "^0.32", + version = "^0.34", features = [ "full", ], diff --git a/gitlab-ci/src/rust_lint/lint.sh b/gitlab-ci/src/rust_lint/lint.sh index cebd2eced12..8eb35349496 100755 --- a/gitlab-ci/src/rust_lint/lint.sh +++ b/gitlab-ci/src/rust_lint/lint.sh @@ -9,7 +9,7 @@ cargo clippy --locked --all-features --workspace --all-targets -- \ -D clippy::mem_forget \ -C debug-assertions=off -if cargo tree -e features | grep -q 'serde feature "rc"'; then +if cargo tree --workspace --depth 1 -e features | grep -q 'serde feature "rc"'; then echo 'The serde "rc" feature seems to be enabled. Instead, the module "serde_arc" in "ic-utils" should be used.' exit 1 fi diff --git a/rs/crypto/internal/crypto_service_provider/BUILD.bazel b/rs/crypto/internal/crypto_service_provider/BUILD.bazel index 6630c7a4e10..73f695240db 100644 --- a/rs/crypto/internal/crypto_service_provider/BUILD.bazel +++ b/rs/crypto/internal/crypto_service_provider/BUILD.bazel @@ -39,6 +39,7 @@ DEPENDENCIES = [ "@crate_index//:base64", "@crate_index//:bincode", "@crate_index//:bytes", + "@crate_index//:futures", "@crate_index//:hex", "@crate_index//:time", "@crate_index//:parking_lot", diff --git a/rs/crypto/internal/crypto_service_provider/Cargo.toml b/rs/crypto/internal/crypto_service_provider/Cargo.toml index 522e3da05f8..0add18124f8 100644 --- a/rs/crypto/internal/crypto_service_provider/Cargo.toml +++ b/rs/crypto/internal/crypto_service_provider/Cargo.toml @@ -11,6 +11,7 @@ base64 = { workspace = true } bincode = "1.2" bytes = { workspace = true } educe = "0.4" +futures = "0.3" hex = "0.4.2" ic-adapter-metrics = { path = "../../../monitoring/adapter_metrics" } ic-config = { path = "../../../config" } @@ -50,7 +51,7 @@ slog = { workspace = true } stubborn-io = "0.3.2" strum = { workspace = true } strum_macros = { workspace = true } -tarpc = { version = "0.32", features = ["full"] } +tarpc = { version = "0.34", features = ["full"] } tempfile = "3.1.0" time = "0.3.20" thiserror = "1.0.26" diff --git a/rs/crypto/internal/crypto_service_provider/src/vault/remote_csp_vault/tarpc_csp_vault_server.rs b/rs/crypto/internal/crypto_service_provider/src/vault/remote_csp_vault/tarpc_csp_vault_server.rs index 97ff8b5043e..12f732a14c3 100644 --- a/rs/crypto/internal/crypto_service_provider/src/vault/remote_csp_vault/tarpc_csp_vault_server.rs +++ b/rs/crypto/internal/crypto_service_provider/src/vault/remote_csp_vault/tarpc_csp_vault_server.rs @@ -14,6 +14,7 @@ use crate::vault::local_csp_vault::{LocalCspVault, ProdLocalCspVault}; use crate::vault::remote_csp_vault::{remote_vault_codec_builder, TarpcCspVault}; use crate::vault::remote_csp_vault::{PksAndSksContainsErrors, FOUR_GIGA_BYTES}; use crate::ExternalPublicKeys; +use futures::StreamExt; use ic_crypto_internal_logmon::metrics::CryptoMetrics; use ic_crypto_internal_seed::Seed; use ic_crypto_internal_threshold_sig_bls12381::api::ni_dkg_errors::{ @@ -110,7 +111,6 @@ impl Clone for TarpcCspVaultServerWorker { } } -#[tarpc::server] impl TarpcCspVault for TarpcCspVaultServerWorker { // `BasicSignatureCspVault`-methods. async fn sign( @@ -632,9 +632,13 @@ impl TarpcCspVaultServerImpl { local_csp_vault, thread_pool, }; - let channel_executor = - BaseChannel::with_defaults(transport).execute(worker.serve()); - channel_executor.await; + let channel = BaseChannel::with_defaults(transport); + channel + .execute(worker.serve()) + .for_each(|rpc| async { + tokio::spawn(rpc); + }) + .await; }); } }