From 15ff93d96a54eef5f52e43ba8af2dbcf523fa4fd Mon Sep 17 00:00:00 2001 From: dev0 Date: Mon, 18 Sep 2023 22:20:16 +1000 Subject: [PATCH] fix tests --- Cargo.Bazel.lock | 1696 ++++++---------------------------- Cargo.lock | 253 +---- WORKSPACE | 5 +- clash_lib/Cargo.toml | 2 +- clash_lib/src/app/logging.rs | 2 +- 5 files changed, 304 insertions(+), 1654 deletions(-) diff --git a/Cargo.Bazel.lock b/Cargo.Bazel.lock index 7fc53b1b3..80846d0ae 100644 --- a/Cargo.Bazel.lock +++ b/Cargo.Bazel.lock @@ -1,5 +1,5 @@ { - "checksum": "cd646971bde929e9531258c538327382207ae404646944887a4f150fa4ae0e78", + "checksum": "3c3c27ea9c9a38f852465cfb4aefc74073fec9876d6bf04d4bdb313304c0ce5a", "crates": { "addr2line 0.20.0": { "name": "addr2line", @@ -1067,53 +1067,6 @@ }, "license": "MIT OR Apache-2.0" }, - "async-channel 1.9.0": { - "name": "async-channel", - "version": "1.9.0", - "repository": { - "Http": { - "url": "https://crates.io/api/v1/crates/async-channel/1.9.0/download", - "sha256": "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" - } - }, - "targets": [ - { - "Library": { - "crate_name": "async_channel", - "crate_root": "src/lib.rs", - "srcs": [ - "**/*.rs" - ] - } - } - ], - "library_target_name": "async_channel", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "deps": { - "common": [ - { - "id": "concurrent-queue 2.2.0", - "target": "concurrent_queue" - }, - { - "id": "event-listener 2.5.3", - "target": "event_listener" - }, - { - "id": "futures-core 0.3.28", - "target": "futures_core" - } - ], - "selects": {} - }, - "edition": "2018", - "version": "1.9.0" - }, - "license": "Apache-2.0 OR MIT" - }, "async-recursion 1.0.4": { "name": "async-recursion", "version": "1.0.4", @@ -3043,36 +2996,6 @@ }, "license": "MIT" }, - "castaway 0.1.2": { - "name": "castaway", - "version": "0.1.2", - "repository": { - "Http": { - "url": "https://crates.io/api/v1/crates/castaway/0.1.2/download", - "sha256": "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6" - } - }, - "targets": [ - { - "Library": { - "crate_name": "castaway", - "crate_root": "src/lib.rs", - "srcs": [ - "**/*.rs" - ] - } - } - ], - "library_target_name": "castaway", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "edition": "2018", - "version": "0.1.2" - }, - "license": "MIT" - }, "cc 1.0.79": { "name": "cc", "version": "1.0.79", @@ -4455,52 +4378,6 @@ }, "license": "MIT OR Apache-2.0" }, - "concurrent-queue 2.2.0": { - "name": "concurrent-queue", - "version": "2.2.0", - "repository": { - "Http": { - "url": "https://crates.io/api/v1/crates/concurrent-queue/2.2.0/download", - "sha256": "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" - } - }, - "targets": [ - { - "Library": { - "crate_name": "concurrent_queue", - "crate_root": "src/lib.rs", - "srcs": [ - "**/*.rs" - ] - } - } - ], - "library_target_name": "concurrent_queue", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "crate_features": { - "common": [ - "default", - "std" - ], - "selects": {} - }, - "deps": { - "common": [ - { - "id": "crossbeam-utils 0.8.16", - "target": "crossbeam_utils" - } - ], - "selects": {} - }, - "edition": "2018", - "version": "2.2.0" - }, - "license": "Apache-2.0 OR MIT" - }, "const-oid 0.7.1": { "name": "const-oid", "version": "0.7.1", @@ -4838,7 +4715,6 @@ ], "crate_features": { "common": [ - "default", "std" ], "selects": {} @@ -5140,19 +5016,19 @@ }, "license": "MIT OR Apache-2.0" }, - "curl 0.4.44": { - "name": "curl", - "version": "0.4.44", + "curve25519-dalek 4.0.0-rc.3": { + "name": "curve25519-dalek", + "version": "4.0.0-rc.3", "repository": { "Http": { - "url": "https://crates.io/api/v1/crates/curl/0.4.44/download", - "sha256": "509bd11746c7ac09ebd19f0b17782eae80aadee26237658a6b4808afb5c11a22" + "url": "https://crates.io/api/v1/crates/curve25519-dalek/4.0.0-rc.3/download", + "sha256": "436ace70fc06e06f7f689d2624dc4e2f0ea666efb5aa704215f7249ae6e047a7" } }, "targets": [ { "Library": { - "crate_name": "curl", + "crate_name": "curve25519_dalek", "crate_root": "src/lib.rs", "srcs": [ "**/*.rs" @@ -5169,431 +5045,201 @@ } } ], - "library_target_name": "curl", + "library_target_name": "curve25519_dalek", "common_attrs": { "compile_data_glob": [ "**" ], "crate_features": { "common": [ - "default", - "openssl-probe", - "openssl-sys", - "ssl" + "alloc", + "precomputed-tables", + "zeroize" ], "selects": {} }, "deps": { "common": [ { - "id": "curl 0.4.44", - "target": "build_script_build" + "id": "cfg-if 1.0.0", + "target": "cfg_if" }, { - "id": "curl-sys 0.4.65+curl-8.2.1", - "target": "curl_sys" + "id": "curve25519-dalek 4.0.0-rc.3", + "target": "build_script_build" }, { - "id": "libc 0.2.147", - "target": "libc" + "id": "subtle 2.5.0", + "target": "subtle" }, { - "id": "socket2 0.4.9", - "target": "socket2" + "id": "zeroize 1.6.0", + "target": "zeroize" } ], "selects": { - "cfg(all(unix, not(target_os = \"macos\")))": [ - { - "id": "openssl-probe 0.1.5", - "target": "openssl_probe" - }, + "cfg(curve25519_dalek_backend = \"fiat\")": [ { - "id": "openssl-sys 0.9.91", - "target": "openssl_sys" + "id": "fiat-crypto 0.1.20", + "target": "fiat_crypto" } ], - "cfg(target_env = \"msvc\")": [ + "cfg(target_arch = \"x86_64\")": [ { - "id": "schannel 0.1.22", - "target": "schannel" - }, + "id": "cpufeatures 0.2.9", + "target": "cpufeatures" + } + ] + } + }, + "edition": "2021", + "proc_macro_deps": { + "common": [], + "selects": { + "cfg(all(not(curve25519_dalek_backend = \"fiat\"), not(curve25519_dalek_backend = \"serial\"), target_arch = \"x86_64\"))": [ { - "id": "winapi 0.3.9", - "target": "winapi" + "id": "curve25519-dalek-derive 0.1.0", + "target": "curve25519_dalek_derive" } ] } }, - "edition": "2018", - "version": "0.4.44" + "version": "4.0.0-rc.3" }, "build_script_attrs": { "data_glob": [ "**" ], - "link_deps": { + "deps": { "common": [ { - "id": "curl-sys 0.4.65+curl-8.2.1", - "target": "curl_sys" + "id": "platforms 3.1.2", + "target": "platforms" + }, + { + "id": "rustc_version 0.4.0", + "target": "rustc_version" } ], - "selects": { - "cfg(all(unix, not(target_os = \"macos\")))": [ - { - "id": "openssl-sys 0.9.91", - "target": "openssl_sys" - } + "selects": {} + } + }, + "license": "BSD-3-Clause" + }, + "curve25519-dalek-derive 0.1.0": { + "name": "curve25519-dalek-derive", + "version": "0.1.0", + "repository": { + "Http": { + "url": "https://crates.io/api/v1/crates/curve25519-dalek-derive/0.1.0/download", + "sha256": "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b" + } + }, + "targets": [ + { + "ProcMacro": { + "crate_name": "curve25519_dalek_derive", + "crate_root": "src/lib.rs", + "srcs": [ + "**/*.rs" ] } } + ], + "library_target_name": "curve25519_dalek_derive", + "common_attrs": { + "compile_data_glob": [ + "**" + ], + "deps": { + "common": [ + { + "id": "proc-macro2 1.0.66", + "target": "proc_macro2" + }, + { + "id": "quote 1.0.32", + "target": "quote" + }, + { + "id": "syn 2.0.28", + "target": "syn" + } + ], + "selects": {} + }, + "edition": "2021", + "version": "0.1.0" }, - "license": "MIT" + "license": "MIT/Apache-2.0" }, - "curl-sys 0.4.65+curl-8.2.1": { - "name": "curl-sys", - "version": "0.4.65+curl-8.2.1", + "data-encoding 2.4.0": { + "name": "data-encoding", + "version": "2.4.0", "repository": { "Http": { - "url": "https://crates.io/api/v1/crates/curl-sys/0.4.65+curl-8.2.1/download", - "sha256": "961ba061c9ef2fe34bbd12b807152d96f0badd2bebe7b90ce6c8c8b7572a0986" + "url": "https://crates.io/api/v1/crates/data-encoding/2.4.0/download", + "sha256": "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" } }, "targets": [ { "Library": { - "crate_name": "curl_sys", - "crate_root": "lib.rs", + "crate_name": "data_encoding", + "crate_root": "src/lib.rs", "srcs": [ "**/*.rs" ] } + } + ], + "library_target_name": "data_encoding", + "common_attrs": { + "compile_data_glob": [ + "**" + ], + "crate_features": { + "common": [ + "alloc", + "default", + "std" + ], + "selects": {} }, + "edition": "2018", + "version": "2.4.0" + }, + "license": "MIT" + }, + "der 0.5.1": { + "name": "der", + "version": "0.5.1", + "repository": { + "Http": { + "url": "https://crates.io/api/v1/crates/der/0.5.1/download", + "sha256": "6919815d73839e7ad218de758883aae3a257ba6759ce7a9992501efbb53d705c" + } + }, + "targets": [ { - "BuildScript": { - "crate_name": "build_script_build", - "crate_root": "build.rs", + "Library": { + "crate_name": "der", + "crate_root": "src/lib.rs", "srcs": [ "**/*.rs" ] } } ], - "library_target_name": "curl_sys", + "library_target_name": "der", "common_attrs": { "compile_data_glob": [ "**" ], "crate_features": { "common": [ - "default", - "openssl-sys", - "ssl" - ], - "selects": {} - }, - "deps": { - "common": [ - { - "id": "curl-sys 0.4.65+curl-8.2.1", - "target": "build_script_build" - }, - { - "id": "libc 0.2.147", - "target": "libc" - }, - { - "id": "libz-sys 1.1.9", - "target": "libz_sys" - } - ], - "selects": { - "cfg(all(unix, not(target_os = \"macos\")))": [ - { - "id": "openssl-sys 0.9.91", - "target": "openssl_sys" - } - ], - "cfg(windows)": [ - { - "id": "winapi 0.3.9", - "target": "winapi" - } - ] - } - }, - "edition": "2018", - "version": "0.4.65+curl-8.2.1" - }, - "build_script_attrs": { - "data_glob": [ - "**" - ], - "deps": { - "common": [ - { - "id": "cc 1.0.79", - "target": "cc" - }, - { - "id": "pkg-config 0.3.27", - "target": "pkg_config" - } - ], - "selects": { - "cfg(target_env = \"msvc\")": [ - { - "id": "vcpkg 0.2.15", - "target": "vcpkg" - } - ] - } - }, - "link_deps": { - "common": [ - { - "id": "libz-sys 1.1.9", - "target": "libz_sys" - } - ], - "selects": { - "cfg(all(unix, not(target_os = \"macos\")))": [ - { - "id": "openssl-sys 0.9.91", - "target": "openssl_sys" - } - ] - } - }, - "links": "curl" - }, - "license": "MIT" - }, - "curve25519-dalek 4.0.0-rc.3": { - "name": "curve25519-dalek", - "version": "4.0.0-rc.3", - "repository": { - "Http": { - "url": "https://crates.io/api/v1/crates/curve25519-dalek/4.0.0-rc.3/download", - "sha256": "436ace70fc06e06f7f689d2624dc4e2f0ea666efb5aa704215f7249ae6e047a7" - } - }, - "targets": [ - { - "Library": { - "crate_name": "curve25519_dalek", - "crate_root": "src/lib.rs", - "srcs": [ - "**/*.rs" - ] - } - }, - { - "BuildScript": { - "crate_name": "build_script_build", - "crate_root": "build.rs", - "srcs": [ - "**/*.rs" - ] - } - } - ], - "library_target_name": "curve25519_dalek", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "crate_features": { - "common": [ - "alloc", - "precomputed-tables", - "zeroize" - ], - "selects": {} - }, - "deps": { - "common": [ - { - "id": "cfg-if 1.0.0", - "target": "cfg_if" - }, - { - "id": "curve25519-dalek 4.0.0-rc.3", - "target": "build_script_build" - }, - { - "id": "subtle 2.5.0", - "target": "subtle" - }, - { - "id": "zeroize 1.6.0", - "target": "zeroize" - } - ], - "selects": { - "cfg(curve25519_dalek_backend = \"fiat\")": [ - { - "id": "fiat-crypto 0.1.20", - "target": "fiat_crypto" - } - ], - "cfg(target_arch = \"x86_64\")": [ - { - "id": "cpufeatures 0.2.9", - "target": "cpufeatures" - } - ] - } - }, - "edition": "2021", - "proc_macro_deps": { - "common": [], - "selects": { - "cfg(all(not(curve25519_dalek_backend = \"fiat\"), not(curve25519_dalek_backend = \"serial\"), target_arch = \"x86_64\"))": [ - { - "id": "curve25519-dalek-derive 0.1.0", - "target": "curve25519_dalek_derive" - } - ] - } - }, - "version": "4.0.0-rc.3" - }, - "build_script_attrs": { - "data_glob": [ - "**" - ], - "deps": { - "common": [ - { - "id": "platforms 3.1.2", - "target": "platforms" - }, - { - "id": "rustc_version 0.4.0", - "target": "rustc_version" - } - ], - "selects": {} - } - }, - "license": "BSD-3-Clause" - }, - "curve25519-dalek-derive 0.1.0": { - "name": "curve25519-dalek-derive", - "version": "0.1.0", - "repository": { - "Http": { - "url": "https://crates.io/api/v1/crates/curve25519-dalek-derive/0.1.0/download", - "sha256": "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b" - } - }, - "targets": [ - { - "ProcMacro": { - "crate_name": "curve25519_dalek_derive", - "crate_root": "src/lib.rs", - "srcs": [ - "**/*.rs" - ] - } - } - ], - "library_target_name": "curve25519_dalek_derive", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "deps": { - "common": [ - { - "id": "proc-macro2 1.0.66", - "target": "proc_macro2" - }, - { - "id": "quote 1.0.32", - "target": "quote" - }, - { - "id": "syn 2.0.28", - "target": "syn" - } - ], - "selects": {} - }, - "edition": "2021", - "version": "0.1.0" - }, - "license": "MIT/Apache-2.0" - }, - "data-encoding 2.4.0": { - "name": "data-encoding", - "version": "2.4.0", - "repository": { - "Http": { - "url": "https://crates.io/api/v1/crates/data-encoding/2.4.0/download", - "sha256": "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" - } - }, - "targets": [ - { - "Library": { - "crate_name": "data_encoding", - "crate_root": "src/lib.rs", - "srcs": [ - "**/*.rs" - ] - } - } - ], - "library_target_name": "data_encoding", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "crate_features": { - "common": [ - "alloc", - "default", - "std" - ], - "selects": {} - }, - "edition": "2018", - "version": "2.4.0" - }, - "license": "MIT" - }, - "der 0.5.1": { - "name": "der", - "version": "0.5.1", - "repository": { - "Http": { - "url": "https://crates.io/api/v1/crates/der/0.5.1/download", - "sha256": "6919815d73839e7ad218de758883aae3a257ba6759ce7a9992501efbb53d705c" - } - }, - "targets": [ - { - "Library": { - "crate_name": "der", - "crate_root": "src/lib.rs", - "srcs": [ - "**/*.rs" - ] - } - } - ], - "library_target_name": "der", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "crate_features": { - "common": [ - "const-oid", - "oid" + "const-oid", + "oid" ], "selects": {} }, @@ -6589,77 +6235,6 @@ }, "license": "MIT" }, - "event-listener 2.5.3": { - "name": "event-listener", - "version": "2.5.3", - "repository": { - "Http": { - "url": "https://crates.io/api/v1/crates/event-listener/2.5.3/download", - "sha256": "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - } - }, - "targets": [ - { - "Library": { - "crate_name": "event_listener", - "crate_root": "src/lib.rs", - "srcs": [ - "**/*.rs" - ] - } - } - ], - "library_target_name": "event_listener", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "edition": "2018", - "version": "2.5.3" - }, - "license": "Apache-2.0 OR MIT" - }, - "fastrand 1.9.0": { - "name": "fastrand", - "version": "1.9.0", - "repository": { - "Http": { - "url": "https://crates.io/api/v1/crates/fastrand/1.9.0/download", - "sha256": "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" - } - }, - "targets": [ - { - "Library": { - "crate_name": "fastrand", - "crate_root": "src/lib.rs", - "srcs": [ - "**/*.rs" - ] - } - } - ], - "library_target_name": "fastrand", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "deps": { - "common": [], - "selects": { - "cfg(all(target_arch = \"wasm32\", not(target_os = \"wasi\")))": [ - { - "id": "instant 0.1.12", - "target": "instant" - } - ] - } - }, - "edition": "2018", - "version": "1.9.0" - }, - "license": "Apache-2.0 OR MIT" - }, "fastrand 2.0.0": { "name": "fastrand", "version": "2.0.0", @@ -7492,94 +7067,17 @@ "common_attrs": { "compile_data_glob": [ "**" - ], - "crate_features": { - "common": [ - "default", - "std" - ], - "selects": {} - }, - "edition": "2018", - "version": "0.3.28" - }, - "license": "MIT OR Apache-2.0" - }, - "futures-lite 1.13.0": { - "name": "futures-lite", - "version": "1.13.0", - "repository": { - "Http": { - "url": "https://crates.io/api/v1/crates/futures-lite/1.13.0/download", - "sha256": "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" - } - }, - "targets": [ - { - "Library": { - "crate_name": "futures_lite", - "crate_root": "src/lib.rs", - "srcs": [ - "**/*.rs" - ] - } - } - ], - "library_target_name": "futures_lite", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "crate_features": { - "common": [ - "alloc", - "default", - "fastrand", - "futures-io", - "memchr", - "parking", - "std", - "waker-fn" - ], - "selects": {} - }, - "deps": { + ], + "crate_features": { "common": [ - { - "id": "fastrand 1.9.0", - "target": "fastrand" - }, - { - "id": "futures-core 0.3.28", - "target": "futures_core" - }, - { - "id": "futures-io 0.3.28", - "target": "futures_io" - }, - { - "id": "memchr 2.5.0", - "target": "memchr" - }, - { - "id": "parking 2.1.0", - "target": "parking" - }, - { - "id": "pin-project-lite 0.2.10", - "target": "pin_project_lite" - }, - { - "id": "waker-fn 1.1.0", - "target": "waker_fn" - } + "std" ], "selects": {} }, "edition": "2018", - "version": "1.13.0" + "version": "0.3.28" }, - "license": "Apache-2.0 OR MIT" + "license": "MIT OR Apache-2.0" }, "futures-macro 0.3.28": { "name": "futures-macro", @@ -8363,6 +7861,112 @@ }, "license": "MIT OR Apache-2.0" }, + "headers 0.3.8": { + "name": "headers", + "version": "0.3.8", + "repository": { + "Http": { + "url": "https://crates.io/api/v1/crates/headers/0.3.8/download", + "sha256": "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584" + } + }, + "targets": [ + { + "Library": { + "crate_name": "headers", + "crate_root": "src/lib.rs", + "srcs": [ + "**/*.rs" + ] + } + } + ], + "library_target_name": "headers", + "common_attrs": { + "compile_data_glob": [ + "**" + ], + "deps": { + "common": [ + { + "id": "base64 0.13.1", + "target": "base64" + }, + { + "id": "bitflags 1.3.2", + "target": "bitflags" + }, + { + "id": "bytes 1.4.0", + "target": "bytes" + }, + { + "id": "headers-core 0.2.0", + "target": "headers_core" + }, + { + "id": "http 0.2.9", + "target": "http" + }, + { + "id": "httpdate 1.0.2", + "target": "httpdate" + }, + { + "id": "mime 0.3.17", + "target": "mime" + }, + { + "id": "sha1 0.10.5", + "target": "sha1" + } + ], + "selects": {} + }, + "edition": "2015", + "version": "0.3.8" + }, + "license": "MIT" + }, + "headers-core 0.2.0": { + "name": "headers-core", + "version": "0.2.0", + "repository": { + "Http": { + "url": "https://crates.io/api/v1/crates/headers-core/0.2.0/download", + "sha256": "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" + } + }, + "targets": [ + { + "Library": { + "crate_name": "headers_core", + "crate_root": "src/lib.rs", + "srcs": [ + "**/*.rs" + ] + } + } + ], + "library_target_name": "headers_core", + "common_attrs": { + "compile_data_glob": [ + "**" + ], + "deps": { + "common": [ + { + "id": "http 0.2.9", + "target": "http" + } + ], + "selects": {} + }, + "edition": "2015", + "version": "0.2.0" + }, + "license": "MIT" + }, "heck 0.4.1": { "name": "heck", "version": "0.4.1", @@ -9564,45 +9168,6 @@ }, "license": "MIT OR Apache-2.0" }, - "instant 0.1.12": { - "name": "instant", - "version": "0.1.12", - "repository": { - "Http": { - "url": "https://crates.io/api/v1/crates/instant/0.1.12/download", - "sha256": "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" - } - }, - "targets": [ - { - "Library": { - "crate_name": "instant", - "crate_root": "src/lib.rs", - "srcs": [ - "**/*.rs" - ] - } - } - ], - "library_target_name": "instant", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "deps": { - "common": [ - { - "id": "cfg-if 1.0.0", - "target": "cfg_if" - } - ], - "selects": {} - }, - "edition": "2018", - "version": "0.1.12" - }, - "license": "BSD-3-Clause" - }, "integer-encoding 3.0.4": { "name": "integer-encoding", "version": "3.0.4", @@ -9974,141 +9539,11 @@ "id": "windows-sys 0.48.0", "target": "windows_sys" } - ] - } - }, - "edition": "2018", - "version": "0.4.9" - }, - "license": "MIT" - }, - "isahc 1.7.2": { - "name": "isahc", - "version": "1.7.2", - "repository": { - "Http": { - "url": "https://crates.io/api/v1/crates/isahc/1.7.2/download", - "sha256": "334e04b4d781f436dc315cb1e7515bd96826426345d498149e4bde36b67f8ee9" - } - }, - "targets": [ - { - "Library": { - "crate_name": "isahc", - "crate_root": "src/lib.rs", - "srcs": [ - "**/*.rs" - ] - } - }, - { - "BuildScript": { - "crate_name": "build_script_build", - "crate_root": "build.rs", - "srcs": [ - "**/*.rs" - ] - } - } - ], - "library_target_name": "isahc", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "deps": { - "common": [ - { - "id": "async-channel 1.9.0", - "target": "async_channel" - }, - { - "id": "castaway 0.1.2", - "target": "castaway" - }, - { - "id": "crossbeam-utils 0.8.16", - "target": "crossbeam_utils" - }, - { - "id": "curl 0.4.44", - "target": "curl" - }, - { - "id": "curl-sys 0.4.65+curl-8.2.1", - "target": "curl_sys" - }, - { - "id": "event-listener 2.5.3", - "target": "event_listener" - }, - { - "id": "futures-lite 1.13.0", - "target": "futures_lite" - }, - { - "id": "http 0.2.9", - "target": "http" - }, - { - "id": "isahc 1.7.2", - "target": "build_script_build" - }, - { - "id": "log 0.4.19", - "target": "log" - }, - { - "id": "once_cell 1.18.0", - "target": "once_cell" - }, - { - "id": "polling 2.8.0", - "target": "polling" - }, - { - "id": "slab 0.4.8", - "target": "slab" - }, - { - "id": "sluice 0.5.5", - "target": "sluice" - }, - { - "id": "tracing 0.1.37", - "target": "tracing" - }, - { - "id": "tracing-futures 0.2.5", - "target": "tracing_futures" - }, - { - "id": "url 2.4.0", - "target": "url" - }, - { - "id": "waker-fn 1.1.0", - "target": "waker_fn" - } - ], - "selects": {} - }, - "edition": "2018", - "version": "1.7.2" - }, - "build_script_attrs": { - "data_glob": [ - "**" - ], - "link_deps": { - "common": [ - { - "id": "curl-sys 0.4.65+curl-8.2.1", - "target": "curl_sys" - } - ], - "selects": {} - } + ] + } + }, + "edition": "2018", + "version": "0.4.9" }, "license": "MIT" }, @@ -10563,90 +9998,6 @@ }, "license": "ISC" }, - "libz-sys 1.1.9": { - "name": "libz-sys", - "version": "1.1.9", - "repository": { - "Http": { - "url": "https://crates.io/api/v1/crates/libz-sys/1.1.9/download", - "sha256": "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db" - } - }, - "targets": [ - { - "Library": { - "crate_name": "libz_sys", - "crate_root": "src/lib.rs", - "srcs": [ - "**/*.rs" - ] - } - }, - { - "BuildScript": { - "crate_name": "build_script_build", - "crate_root": "build.rs", - "srcs": [ - "**/*.rs" - ] - } - } - ], - "library_target_name": "libz_sys", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "crate_features": { - "common": [ - "libc" - ], - "selects": {} - }, - "deps": { - "common": [ - { - "id": "libc 0.2.147", - "target": "libc" - }, - { - "id": "libz-sys 1.1.9", - "target": "build_script_build" - } - ], - "selects": {} - }, - "edition": "2018", - "version": "1.1.9" - }, - "build_script_attrs": { - "data_glob": [ - "**" - ], - "deps": { - "common": [ - { - "id": "cc 1.0.79", - "target": "cc" - }, - { - "id": "pkg-config 0.3.27", - "target": "pkg_config" - } - ], - "selects": { - "cfg(target_env = \"msvc\")": [ - { - "id": "vcpkg 0.2.15", - "target": "vcpkg" - } - ] - } - }, - "links": "z" - }, - "license": "MIT OR Apache-2.0" - }, "linked-hash-map 0.5.6": { "name": "linked-hash-map", "version": "0.5.6", @@ -12486,111 +11837,6 @@ }, "license": "MIT OR Apache-2.0" }, - "openssl-probe 0.1.5": { - "name": "openssl-probe", - "version": "0.1.5", - "repository": { - "Http": { - "url": "https://crates.io/api/v1/crates/openssl-probe/0.1.5/download", - "sha256": "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - } - }, - "targets": [ - { - "Library": { - "crate_name": "openssl_probe", - "crate_root": "src/lib.rs", - "srcs": [ - "**/*.rs" - ] - } - } - ], - "library_target_name": "openssl_probe", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "edition": "2015", - "version": "0.1.5" - }, - "license": "MIT/Apache-2.0" - }, - "openssl-sys 0.9.91": { - "name": "openssl-sys", - "version": "0.9.91", - "repository": { - "Http": { - "url": "https://crates.io/api/v1/crates/openssl-sys/0.9.91/download", - "sha256": "866b5f16f90776b9bb8dc1e1802ac6f0513de3a7a7465867bfbc563dc737faac" - } - }, - "targets": [ - { - "Library": { - "crate_name": "openssl_sys", - "crate_root": "src/lib.rs", - "srcs": [ - "**/*.rs" - ] - } - }, - { - "BuildScript": { - "crate_name": "build_script_main", - "crate_root": "build/main.rs", - "srcs": [ - "**/*.rs" - ] - } - } - ], - "library_target_name": "openssl_sys", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "deps": { - "common": [ - { - "id": "libc 0.2.147", - "target": "libc" - }, - { - "id": "openssl-sys 0.9.91", - "target": "build_script_main" - } - ], - "selects": {} - }, - "edition": "2018", - "version": "0.9.91" - }, - "build_script_attrs": { - "data_glob": [ - "**" - ], - "deps": { - "common": [ - { - "id": "cc 1.0.79", - "target": "cc" - }, - { - "id": "pkg-config 0.3.27", - "target": "pkg_config" - }, - { - "id": "vcpkg 0.2.15", - "target": "vcpkg" - } - ], - "selects": {} - }, - "links": "openssl" - }, - "license": "MIT" - }, "opentelemetry 0.20.0": { "name": "opentelemetry", "version": "0.20.0", @@ -12670,7 +11916,8 @@ ], "crate_features": { "common": [ - "isahc" + "hyper", + "tokio" ], "selects": {} }, @@ -12685,12 +11932,16 @@ "target": "http" }, { - "id": "isahc 1.7.2", - "target": "isahc" + "id": "hyper 0.14.27", + "target": "hyper" }, { "id": "opentelemetry_api 0.20.0", "target": "opentelemetry_api" + }, + { + "id": "tokio 1.29.1", + "target": "tokio" } ], "selects": {} @@ -12738,9 +11989,10 @@ "common": [ "collector_client", "default", + "headers", "http", - "isahc", - "isahc_collector_client", + "hyper", + "hyper_collector_client", "opentelemetry-http", "rt-tokio", "tokio" @@ -12757,13 +12009,17 @@ "id": "futures-util 0.3.28", "target": "futures_util" }, + { + "id": "headers 0.3.8", + "target": "headers" + }, { "id": "http 0.2.9", "target": "http" }, { - "id": "isahc 1.7.2", - "target": "isahc" + "id": "hyper 0.14.27", + "target": "hyper" }, { "id": "opentelemetry 0.20.0", @@ -13261,36 +12517,6 @@ }, "license": "Apache-2.0 OR MIT" }, - "parking 2.1.0": { - "name": "parking", - "version": "2.1.0", - "repository": { - "Http": { - "url": "https://crates.io/api/v1/crates/parking/2.1.0/download", - "sha256": "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" - } - }, - "targets": [ - { - "Library": { - "crate_name": "parking", - "crate_root": "src/lib.rs", - "srcs": [ - "**/*.rs" - ] - } - } - ], - "library_target_name": "parking", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "edition": "2018", - "version": "2.1.0" - }, - "license": "Apache-2.0 OR MIT" - }, "parking_lot 0.12.1": { "name": "parking_lot", "version": "0.12.1", @@ -13634,36 +12860,6 @@ }, "license": "MIT OR Apache-2.0" }, - "pkg-config 0.3.27": { - "name": "pkg-config", - "version": "0.3.27", - "repository": { - "Http": { - "url": "https://crates.io/api/v1/crates/pkg-config/0.3.27/download", - "sha256": "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" - } - }, - "targets": [ - { - "Library": { - "crate_name": "pkg_config", - "crate_root": "src/lib.rs", - "srcs": [ - "**/*.rs" - ] - } - } - ], - "library_target_name": "pkg_config", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "edition": "2015", - "version": "0.3.27" - }, - "license": "MIT OR Apache-2.0" - }, "platforms 3.1.2": { "name": "platforms", "version": "3.1.2", @@ -13684,53 +12880,7 @@ } } ], - "library_target_name": "platforms", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "crate_features": { - "common": [ - "default", - "std" - ], - "selects": {} - }, - "edition": "2018", - "version": "3.1.2" - }, - "license": "Apache-2.0 OR MIT" - }, - "polling 2.8.0": { - "name": "polling", - "version": "2.8.0", - "repository": { - "Http": { - "url": "https://crates.io/api/v1/crates/polling/2.8.0/download", - "sha256": "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" - } - }, - "targets": [ - { - "Library": { - "crate_name": "polling", - "crate_root": "src/lib.rs", - "srcs": [ - "**/*.rs" - ] - } - }, - { - "BuildScript": { - "crate_name": "build_script_build", - "crate_root": "build.rs", - "srcs": [ - "**/*.rs" - ] - } - } - ], - "library_target_name": "polling", + "library_target_name": "platforms", "common_attrs": { "compile_data_glob": [ "**" @@ -13742,64 +12892,8 @@ ], "selects": {} }, - "deps": { - "common": [ - { - "id": "cfg-if 1.0.0", - "target": "cfg_if" - }, - { - "id": "log 0.4.19", - "target": "log" - }, - { - "id": "polling 2.8.0", - "target": "build_script_build" - } - ], - "selects": { - "cfg(any(unix, target_os = \"fuchsia\", target_os = \"vxworks\"))": [ - { - "id": "libc 0.2.147", - "target": "libc" - } - ], - "cfg(windows)": [ - { - "id": "bitflags 1.3.2", - "target": "bitflags" - }, - { - "id": "concurrent-queue 2.2.0", - "target": "concurrent_queue" - }, - { - "id": "pin-project-lite 0.2.10", - "target": "pin_project_lite" - }, - { - "id": "windows-sys 0.48.0", - "target": "windows_sys" - } - ] - } - }, "edition": "2018", - "version": "2.8.0" - }, - "build_script_attrs": { - "data_glob": [ - "**" - ], - "deps": { - "common": [ - { - "id": "autocfg 1.1.0", - "target": "autocfg" - } - ], - "selects": {} - } + "version": "3.1.2" }, "license": "Apache-2.0 OR MIT" }, @@ -15865,45 +14959,6 @@ }, "license": "Unlicense/MIT" }, - "schannel 0.1.22": { - "name": "schannel", - "version": "0.1.22", - "repository": { - "Http": { - "url": "https://crates.io/api/v1/crates/schannel/0.1.22/download", - "sha256": "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" - } - }, - "targets": [ - { - "Library": { - "crate_name": "schannel", - "crate_root": "src/lib.rs", - "srcs": [ - "**/*.rs" - ] - } - } - ], - "library_target_name": "schannel", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "deps": { - "common": [ - { - "id": "windows-sys 0.48.0", - "target": "windows_sys" - } - ], - "selects": {} - }, - "edition": "2018", - "version": "0.1.22" - }, - "license": "MIT" - }, "scoped-tls 1.0.1": { "name": "scoped-tls", "version": "1.0.1", @@ -17366,53 +16421,6 @@ }, "license": "MIT" }, - "sluice 0.5.5": { - "name": "sluice", - "version": "0.5.5", - "repository": { - "Http": { - "url": "https://crates.io/api/v1/crates/sluice/0.5.5/download", - "sha256": "6d7400c0eff44aa2fcb5e31a5f24ba9716ed90138769e4977a2ba6014ae63eb5" - } - }, - "targets": [ - { - "Library": { - "crate_name": "sluice", - "crate_root": "src/lib.rs", - "srcs": [ - "**/*.rs" - ] - } - } - ], - "library_target_name": "sluice", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "deps": { - "common": [ - { - "id": "async-channel 1.9.0", - "target": "async_channel" - }, - { - "id": "futures-core 0.3.28", - "target": "futures_core" - }, - { - "id": "futures-io 0.3.28", - "target": "futures_io" - } - ], - "selects": {} - }, - "edition": "2018", - "version": "0.5.5" - }, - "license": "MIT" - }, "smallvec 1.11.0": { "name": "smallvec", "version": "1.11.0", @@ -19858,57 +18866,6 @@ }, "license": "MIT" }, - "tracing-futures 0.2.5": { - "name": "tracing-futures", - "version": "0.2.5", - "repository": { - "Http": { - "url": "https://crates.io/api/v1/crates/tracing-futures/0.2.5/download", - "sha256": "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" - } - }, - "targets": [ - { - "Library": { - "crate_name": "tracing_futures", - "crate_root": "src/lib.rs", - "srcs": [ - "**/*.rs" - ] - } - } - ], - "library_target_name": "tracing_futures", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "crate_features": { - "common": [ - "pin-project", - "std", - "std-future" - ], - "selects": {} - }, - "deps": { - "common": [ - { - "id": "pin-project 1.1.2", - "target": "pin_project" - }, - { - "id": "tracing 0.1.37", - "target": "tracing" - } - ], - "selects": {} - }, - "edition": "2018", - "version": "0.2.5" - }, - "license": "MIT" - }, "tracing-log 0.1.3": { "name": "tracing-log", "version": "0.1.3", @@ -21933,36 +20890,6 @@ }, "license": "MIT" }, - "vcpkg 0.2.15": { - "name": "vcpkg", - "version": "0.2.15", - "repository": { - "Http": { - "url": "https://crates.io/api/v1/crates/vcpkg/0.2.15/download", - "sha256": "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - } - }, - "targets": [ - { - "Library": { - "crate_name": "vcpkg", - "crate_root": "src/lib.rs", - "srcs": [ - "**/*.rs" - ] - } - } - ], - "library_target_name": "vcpkg", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "edition": "2015", - "version": "0.2.15" - }, - "license": "MIT/Apache-2.0" - }, "vec_map 0.8.2": { "name": "vec_map", "version": "0.8.2", @@ -22023,36 +20950,6 @@ }, "license": "MIT/Apache-2.0" }, - "waker-fn 1.1.0": { - "name": "waker-fn", - "version": "1.1.0", - "repository": { - "Http": { - "url": "https://crates.io/api/v1/crates/waker-fn/1.1.0/download", - "sha256": "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" - } - }, - "targets": [ - { - "Library": { - "crate_name": "waker_fn", - "crate_root": "src/lib.rs", - "srcs": [ - "**/*.rs" - ] - } - } - ], - "library_target_name": "waker_fn", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "edition": "2018", - "version": "1.1.0" - }, - "license": "Apache-2.0 OR MIT" - }, "walkdir 2.3.3": { "name": "walkdir", "version": "2.3.3", @@ -22730,7 +21627,6 @@ "handleapi", "iphlpapi", "iptypes", - "libloaderapi", "minwinbase", "minwindef", "netioapi", @@ -22743,10 +21639,8 @@ "timezoneapi", "winbase", "wincon", - "wincrypt", "winerror", "winnt", - "winsock2", "ws2def", "ws2ipdef", "ws2tcpip", @@ -23288,10 +22182,6 @@ "Win32_Networking", "Win32_Networking_WinSock", "Win32_Security", - "Win32_Security_Authentication", - "Win32_Security_Authentication_Identity", - "Win32_Security_Credentials", - "Win32_Security_Cryptography", "Win32_Storage", "Win32_Storage_FileSystem", "Win32_System", @@ -23299,8 +22189,6 @@ "Win32_System_Diagnostics", "Win32_System_Diagnostics_Debug", "Win32_System_IO", - "Win32_System_LibraryLoader", - "Win32_System_Memory", "Win32_System_Pipes", "Win32_System_Registry", "Win32_System_SystemServices", @@ -24846,26 +23734,6 @@ "cfg(all(target_arch = \"x86_64\", target_env = \"msvc\", not(windows_raw_dylib)))": [ "x86_64-pc-windows-msvc" ], - "cfg(all(unix, not(target_os = \"macos\")))": [ - "aarch64-apple-ios", - "aarch64-apple-ios-sim", - "aarch64-fuchsia", - "aarch64-linux-android", - "aarch64-unknown-linux-gnu", - "arm-unknown-linux-gnueabi", - "armv7-linux-androideabi", - "armv7-unknown-linux-gnueabi", - "i686-linux-android", - "i686-unknown-freebsd", - "i686-unknown-linux-gnu", - "powerpc-unknown-linux-gnu", - "s390x-unknown-linux-gnu", - "x86_64-apple-ios", - "x86_64-fuchsia", - "x86_64-linux-android", - "x86_64-unknown-freebsd", - "x86_64-unknown-linux-gnu" - ], "cfg(any(target_arch = \"aarch64\", target_arch = \"x86\", target_arch = \"x86_64\"))": [ "aarch64-apple-darwin", "aarch64-apple-ios", @@ -25044,29 +23912,6 @@ "x86_64-apple-darwin", "x86_64-apple-ios" ], - "cfg(any(unix, target_os = \"fuchsia\", target_os = \"vxworks\"))": [ - "aarch64-apple-darwin", - "aarch64-apple-ios", - "aarch64-apple-ios-sim", - "aarch64-fuchsia", - "aarch64-linux-android", - "aarch64-unknown-linux-gnu", - "arm-unknown-linux-gnueabi", - "armv7-linux-androideabi", - "armv7-unknown-linux-gnueabi", - "i686-apple-darwin", - "i686-linux-android", - "i686-unknown-freebsd", - "i686-unknown-linux-gnu", - "powerpc-unknown-linux-gnu", - "s390x-unknown-linux-gnu", - "x86_64-apple-darwin", - "x86_64-apple-ios", - "x86_64-fuchsia", - "x86_64-linux-android", - "x86_64-unknown-freebsd", - "x86_64-unknown-linux-gnu" - ], "cfg(any(unix, target_os = \"redox\"))": [ "aarch64-apple-darwin", "aarch64-apple-ios", @@ -25271,11 +24116,6 @@ "x86_64-unknown-linux-gnu", "x86_64-unknown-none" ], - "cfg(target_env = \"msvc\")": [ - "aarch64-pc-windows-msvc", - "i686-pc-windows-msvc", - "x86_64-pc-windows-msvc" - ], "cfg(target_os = \"android\")": [ "aarch64-linux-android", "armv7-linux-androideabi", diff --git a/Cargo.lock b/Cargo.lock index e3ffeef44..e6467f00c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -221,17 +221,6 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" -[[package]] -name = "async-channel" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" -dependencies = [ - "concurrent-queue", - "event-listener", - "futures-core", -] - [[package]] name = "async-recursion" version = "1.0.4" @@ -577,12 +566,6 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" -[[package]] -name = "castaway" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6" - [[package]] name = "cc" version = "1.0.79" @@ -918,15 +901,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" -[[package]] -name = "concurrent-queue" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" -dependencies = [ - "crossbeam-utils", -] - [[package]] name = "console-api" version = "0.5.0" @@ -1174,36 +1148,6 @@ dependencies = [ "cipher 0.4.4", ] -[[package]] -name = "curl" -version = "0.4.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "509bd11746c7ac09ebd19f0b17782eae80aadee26237658a6b4808afb5c11a22" -dependencies = [ - "curl-sys", - "libc", - "openssl-probe", - "openssl-sys", - "schannel", - "socket2 0.4.9", - "winapi", -] - -[[package]] -name = "curl-sys" -version = "0.4.65+curl-8.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "961ba061c9ef2fe34bbd12b807152d96f0badd2bebe7b90ce6c8c8b7572a0986" -dependencies = [ - "cc", - "libc", - "libz-sys", - "openssl-sys", - "pkg-config", - "vcpkg", - "winapi", -] - [[package]] name = "curve25519-dalek" version = "4.0.0-rc.3" @@ -1445,21 +1389,6 @@ dependencies = [ "libc", ] -[[package]] -name = "event-listener" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - -[[package]] -name = "fastrand" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - [[package]] name = "fastrand" version = "2.0.0" @@ -1624,21 +1553,6 @@ version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" -[[package]] -name = "futures-lite" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" -dependencies = [ - "fastrand 1.9.0", - "futures-core", - "futures-io", - "memchr", - "parking", - "pin-project-lite", - "waker-fn", -] - [[package]] name = "futures-macro" version = "0.3.28" @@ -1806,6 +1720,31 @@ dependencies = [ "num-traits", ] +[[package]] +name = "headers" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584" +dependencies = [ + "base64 0.13.1", + "bitflags 1.3.2", + "bytes", + "headers-core", + "http", + "httpdate", + "mime", + "sha1", +] + +[[package]] +name = "headers-core" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" +dependencies = [ + "http", +] + [[package]] name = "heck" version = "0.4.1" @@ -2053,15 +1992,6 @@ dependencies = [ "generic-array", ] -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - [[package]] name = "integer-encoding" version = "3.0.4" @@ -2134,31 +2064,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "isahc" -version = "1.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "334e04b4d781f436dc315cb1e7515bd96826426345d498149e4bde36b67f8ee9" -dependencies = [ - "async-channel", - "castaway", - "crossbeam-utils", - "curl", - "curl-sys", - "event-listener", - "futures-lite", - "http", - "log", - "once_cell", - "polling", - "slab", - "sluice", - "tracing", - "tracing-futures", - "url", - "waker-fn", -] - [[package]] name = "itertools" version = "0.10.5" @@ -2231,18 +2136,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "libz-sys" -version = "1.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - [[package]] name = "linked-hash-map" version = "0.5.6" @@ -2596,24 +2489,6 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "openssl-sys" -version = "0.9.91" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "866b5f16f90776b9bb8dc1e1802ac6f0513de3a7a7465867bfbc563dc737faac" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - [[package]] name = "opentelemetry" version = "0.20.0" @@ -2633,8 +2508,9 @@ dependencies = [ "async-trait", "bytes", "http", - "isahc", + "hyper", "opentelemetry_api", + "tokio", ] [[package]] @@ -2646,8 +2522,9 @@ dependencies = [ "async-trait", "futures-core", "futures-util", + "headers", "http", - "isahc", + "hyper", "opentelemetry", "opentelemetry-http", "opentelemetry-semantic-conventions", @@ -2754,12 +2631,6 @@ dependencies = [ "sec1", ] -[[package]] -name = "parking" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" - [[package]] name = "parking_lot" version = "0.12.1" @@ -2827,12 +2698,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" -[[package]] -name = "pkg-config" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" - [[package]] name = "platforms" version = "3.1.2" @@ -2867,22 +2732,6 @@ dependencies = [ "plotters-backend", ] -[[package]] -name = "polling" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" -dependencies = [ - "autocfg", - "bitflags 1.3.2", - "cfg-if", - "concurrent-queue", - "libc", - "log", - "pin-project-lite", - "windows-sys 0.48.0", -] - [[package]] name = "poly1305" version = "0.7.2" @@ -3304,15 +3153,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "schannel" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" -dependencies = [ - "windows-sys 0.48.0", -] - [[package]] name = "scoped-tls" version = "1.0.1" @@ -3581,17 +3421,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "sluice" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d7400c0eff44aa2fcb5e31a5f24ba9716ed90138769e4977a2ba6014ae63eb5" -dependencies = [ - "async-channel", - "futures-core", - "futures-io", -] - [[package]] name = "smallvec" version = "1.11.0" @@ -3695,7 +3524,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5486094ee78b2e5038a6382ed7645bc084dc2ec433426ca4c3cb61e2007b8998" dependencies = [ "cfg-if", - "fastrand 2.0.0", + "fastrand", "redox_syscall 0.3.5", "rustix", "windows-sys 0.48.0", @@ -4132,16 +3961,6 @@ dependencies = [ "valuable", ] -[[package]] -name = "tracing-futures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" -dependencies = [ - "pin-project", - "tracing", -] - [[package]] name = "tracing-log" version = "0.1.3" @@ -4551,12 +4370,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - [[package]] name = "vec_map" version = "0.8.2" @@ -4569,12 +4382,6 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" -[[package]] -name = "waker-fn" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" - [[package]] name = "walkdir" version = "2.3.3" diff --git a/WORKSPACE b/WORKSPACE index a214b48d8..f21ba6c0b 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -26,7 +26,7 @@ load("@rules_rust//crate_universe:repositories.bzl", "crate_universe_dependencie crate_universe_dependencies() -load("@rules_rust//crate_universe:defs.bzl", "crate", "crates_repository") +load("@rules_rust//crate_universe:defs.bzl", "crate", "crates_repository", "splicing_config") MACOS_BINDGEN_FLAGS = "-I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/" @@ -61,6 +61,9 @@ crates_repository( "//clash_lib:Cargo.toml", "//clash_doc:Cargo.toml", ], + splicing_config = splicing_config( + resolver_version = "2", + ), ) load("@crate_index//:defs.bzl", "crate_repositories") diff --git a/clash_lib/Cargo.toml b/clash_lib/Cargo.toml index 8be8cbe7e..b0db1c8a6 100644 --- a/clash_lib/Cargo.toml +++ b/clash_lib/Cargo.toml @@ -45,7 +45,7 @@ once_cell = "1.18.0" # opentelemetry opentelemetry = "0.20" tracing-opentelemetry = "0.21" -opentelemetry-jaeger = { version = "0.19", features = ["collector_client", "isahc_collector_client", "rt-tokio"] } +opentelemetry-jaeger = { version = "0.19", features = ["collector_client", "hyper_collector_client", "rt-tokio"] } crc32fast = "1.3.2" brotli = "3.3.4" diff --git a/clash_lib/src/app/logging.rs b/clash_lib/src/app/logging.rs index b6210ef6c..93c90c9bc 100644 --- a/clash_lib/src/app/logging.rs +++ b/clash_lib/src/app/logging.rs @@ -83,7 +83,7 @@ pub fn setup_logging(level: LogLevel, collector: EventCollector) -> anyhow::Resu let tracer = opentelemetry_jaeger::new_collector_pipeline() .with_service_name("clash-rs") .with_endpoint(jager_endpoint) - .with_isahc() + .with_hyper() .install_batch(opentelemetry::runtime::Tokio)?; Some(tracing_opentelemetry::layer().with_tracer(tracer))