From 5a8ef7be1a36dbba40ae9b1d5bfa605d2931a6c2 Mon Sep 17 00:00:00 2001 From: Ziy1-Tan Date: Wed, 18 Sep 2024 23:18:56 +0800 Subject: [PATCH] clean deps Signed-off-by: Ziy1-Tan --- vmm/common/Cargo.toml | 2 - vmm/common/src/tracer.rs | 1 - vmm/sandbox/Cargo.lock | 63 +------------------- vmm/sandbox/Cargo.toml | 2 - vmm/sandbox/src/bin/cloud_hypervisor/main.rs | 2 +- vmm/task/Cargo.lock | 61 ------------------- vmm/task/Cargo.toml | 2 - 7 files changed, 2 insertions(+), 131 deletions(-) diff --git a/vmm/common/Cargo.toml b/vmm/common/Cargo.toml index 1cc31193..97869c60 100644 --- a/vmm/common/Cargo.toml +++ b/vmm/common/Cargo.toml @@ -13,14 +13,12 @@ serde = "1.0.139" lazy_static = "1.4.0" nix = "0.24.1" anyhow = "1.0.66" -log = { version = "0.4.17", features = ["std"] } ttrpc = { version = "0.7", features = ["async"] } protobuf = "3.2" async-trait = "0.1" regex = "1.5.6" tracing = "0.1.40" -tracing-opentelemetry = "0.21.0" tracing-subscriber = { version = "0.3.18", features = ["json", "env-filter"] } opentelemetry = { version = "0.20.0", features = ["rt-tokio"] } diff --git a/vmm/common/src/tracer.rs b/vmm/common/src/tracer.rs index e18c2973..47760b68 100644 --- a/vmm/common/src/tracer.rs +++ b/vmm/common/src/tracer.rs @@ -25,7 +25,6 @@ pub fn init_otlp_tracer(otlp_service_name: &str) -> anyhow::Result { opentelemetry::KeyValue::new("service.name", otlp_service_name.to_string()), ]))) .install_batch(opentelemetry::runtime::Tokio)?; - Ok(tracer) } diff --git a/vmm/sandbox/Cargo.lock b/vmm/sandbox/Cargo.lock index f82ea773..54091983 100644 --- a/vmm/sandbox/Cargo.lock +++ b/vmm/sandbox/Cargo.lock @@ -139,17 +139,6 @@ dependencies = [ "syn 2.0.28", ] -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - [[package]] name = "autocfg" version = "1.1.0" @@ -685,19 +674,6 @@ version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" -[[package]] -name = "env_logger" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" -dependencies = [ - "atty", - "humantime", - "log", - "regex", - "termcolor", -] - [[package]] name = "equivalent" version = "1.0.1" @@ -965,15 +941,6 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - [[package]] name = "hermit-abi" version = "0.3.2" @@ -1037,12 +1004,6 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - [[package]] name = "hyper" version = "0.14.27" @@ -1532,7 +1493,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.2", + "hermit-abi", "libc", ] @@ -2459,15 +2420,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "termcolor" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" -dependencies = [ - "winapi-util", -] - [[package]] name = "thiserror" version = "1.0.44" @@ -3095,7 +3047,6 @@ dependencies = [ "async-trait", "containerd-sandbox", "lazy_static", - "log", "nix 0.24.3", "opentelemetry", "opentelemetry-otlp", @@ -3104,7 +3055,6 @@ dependencies = [ "serde", "tonic-build", "tracing", - "tracing-opentelemetry", "tracing-subscriber", "ttrpc", "ttrpc-codegen 0.4.1", @@ -3123,7 +3073,6 @@ dependencies = [ "clap", "containerd-sandbox", "containerd-shim", - "env_logger", "futures-util", "hostname", "lazy_static", @@ -3133,7 +3082,6 @@ dependencies = [ "nix 0.26.2", "oci-spec", "opentelemetry", - "opentelemetry-otlp", "os_pipe", "path-clean", "proc-macro2", @@ -3283,15 +3231,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -[[package]] -name = "winapi-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" diff --git a/vmm/sandbox/Cargo.toml b/vmm/sandbox/Cargo.toml index ef465719..803460ff 100644 --- a/vmm/sandbox/Cargo.toml +++ b/vmm/sandbox/Cargo.toml @@ -30,7 +30,6 @@ nix = "0.26" rand = "0.8.4" procfs = "0.13.0" futures-util = "0.3.21" -env_logger = "0.9.0" prost-types = "0.10.1" time = "0.3.5" log = { version = "0.4.17", features = ["std"] } @@ -56,7 +55,6 @@ tracing-opentelemetry = "0.21.0" tracing-subscriber = { version = "0.3.18", features = ["json", "env-filter"] } opentelemetry = { version = "0.20.0", features = ["rt-tokio"] } -opentelemetry-otlp = "0.13.0" [[bin]] name = "qemu" diff --git a/vmm/sandbox/src/bin/cloud_hypervisor/main.rs b/vmm/sandbox/src/bin/cloud_hypervisor/main.rs index fa8d5386..53a715ab 100644 --- a/vmm/sandbox/src/bin/cloud_hypervisor/main.rs +++ b/vmm/sandbox/src/bin/cloud_hypervisor/main.rs @@ -16,7 +16,7 @@ limitations under the License. use clap::Parser; use opentelemetry::global; -use tracing::{info, info_span}; +use tracing::info_span; use tracing_subscriber::{layer::SubscriberExt, Layer, Registry}; use vmm_common::tracer::{init_logger_filter, init_otlp_tracer}; use vmm_sandboxer::{ diff --git a/vmm/task/Cargo.lock b/vmm/task/Cargo.lock index 813bfca4..9cad17cf 100644 --- a/vmm/task/Cargo.lock +++ b/vmm/task/Cargo.lock @@ -68,17 +68,6 @@ dependencies = [ "syn 2.0.18", ] -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - [[package]] name = "autocfg" version = "1.1.0" @@ -524,19 +513,6 @@ version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" -[[package]] -name = "env_logger" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" -dependencies = [ - "atty", - "humantime", - "log", - "regex", - "termcolor", -] - [[package]] name = "errno" version = "0.3.1" @@ -752,15 +728,6 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - [[package]] name = "hermit-abi" version = "0.2.6" @@ -816,12 +783,6 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - [[package]] name = "hyper" version = "0.14.26" @@ -2062,15 +2023,6 @@ dependencies = [ "windows-sys", ] -[[package]] -name = "termcolor" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" -dependencies = [ - "winapi-util", -] - [[package]] name = "thiserror" version = "1.0.40" @@ -2559,7 +2511,6 @@ dependencies = [ "async-trait", "containerd-sandbox", "lazy_static", - "log", "nix 0.24.3", "opentelemetry", "opentelemetry-otlp", @@ -2568,7 +2519,6 @@ dependencies = [ "serde", "tonic-build", "tracing", - "tracing-opentelemetry", "tracing-subscriber", "ttrpc", "ttrpc-codegen 0.4.1", @@ -2583,7 +2533,6 @@ dependencies = [ "containerd-sandbox", "containerd-shim", "crossbeam", - "env_logger", "futures", "ipnetwork", "lazy_static", @@ -2595,7 +2544,6 @@ dependencies = [ "nix 0.28.0", "oci-spec", "opentelemetry", - "opentelemetry-otlp", "pin-project-lite", "protobuf 3.2.0", "rtnetlink", @@ -2721,15 +2669,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -[[package]] -name = "winapi-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" diff --git a/vmm/task/Cargo.toml b/vmm/task/Cargo.toml index 4b36d81a..f4733af3 100644 --- a/vmm/task/Cargo.toml +++ b/vmm/task/Cargo.toml @@ -17,7 +17,6 @@ serde = { version = "1.0.133", features = ["derive"] } serde_json = "1.0.74" oci-spec = "0.5.4" crossbeam = "0.8.1" -env_logger = "0.9.0" lazy_static = "1.4.0" netlink-sys = { version = "0.7.0", features = ["tokio_socket"] } rtnetlink = "0.14.1" @@ -32,7 +31,6 @@ tracing-opentelemetry = "0.21.0" tracing-subscriber = { version = "0.3.18", features = ["json", "env-filter"] } opentelemetry = { version = "0.20.0", features = ["rt-tokio"] } -opentelemetry-otlp = "0.13.0" # Async dependencies async-trait = { version = "0.1.51" }