From 3fe23784bcdbd2edd235bb8001f4914ce4542e53 Mon Sep 17 00:00:00 2001 From: Syfaro Date: Tue, 6 Feb 2024 21:52:04 -0500 Subject: [PATCH] More updates. --- Cargo.lock | 298 ++++++++++------------------------------------------- 1 file changed, 55 insertions(+), 243 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1e6a9ea..70e9e69 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -606,28 +606,6 @@ dependencies = [ "url", ] -[[package]] -name = "async-stream" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" -dependencies = [ - "async-stream-impl", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-stream-impl" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" -dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", -] - [[package]] name = "async-trait" version = "0.1.77" @@ -814,7 +792,7 @@ dependencies = [ "proc-macro2 0.4.30", "quote 0.6.13", "regex", - "which 2.0.1", + "which", ] [[package]] @@ -1442,19 +1420,6 @@ dependencies = [ "syn 2.0.48", ] -[[package]] -name = "dashmap" -version = "5.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" -dependencies = [ - "cfg-if 1.0.0", - "hashbrown 0.14.3", - "lock_api", - "once_cell", - "parking_lot_core 0.9.9", -] - [[package]] name = "data-encoding" version = "2.5.0" @@ -1895,12 +1860,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6" -[[package]] -name = "fixedbitset" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" - [[package]] name = "flate2" version = "1.0.28" @@ -1944,25 +1903,26 @@ dependencies = [ [[package]] name = "foxlib" version = "0.1.0" -source = "git+https://github.com/Syfaro/foxlib.git#daad066144c13f421ee50583d7c1f8bc827df925" +source = "git+https://github.com/Syfaro/foxlib.git#1981d644cbea1e9a9f38b89dc02540e72a2bac19" dependencies = [ "chrono", "faktory 0.12.4", "hyper", "lazy_static", - "opentelemetry 0.18.0", - "opentelemetry-http 0.7.0", - "opentelemetry-jaeger 0.17.0", + "opentelemetry 0.21.0", + "opentelemetry-http 0.10.0", + "opentelemetry-jaeger 0.20.0", "opentelemetry-otlp", - "opentelemetry-semantic-conventions 0.10.0", + "opentelemetry-semantic-conventions 0.13.0", + "opentelemetry_sdk", "prometheus", "serde", "serde_json", "thiserror", "tokio", "tracing", - "tracing-log 0.1.4", - "tracing-opentelemetry 0.18.0", + "tracing-log 0.2.0", + "tracing-opentelemetry 0.22.0", "tracing-serde", "tracing-subscriber", ] @@ -2118,20 +2078,20 @@ dependencies = [ [[package]] name = "fuzzysearch" version = "0.2.0" -source = "git+https://github.com/Syfaro/fuzzysearch-rs.git#a98dc6207062ce4a0b9a51e31c5aa461b267a357" +source = "git+https://github.com/Syfaro/fuzzysearch-rs.git#0ba619d9b7c313bf8f50530b712ff50bb117cf91" dependencies = [ "chrono", "hex", "image", "img_hash", - "opentelemetry 0.18.0", - "opentelemetry-http 0.7.0", + "opentelemetry 0.21.0", + "opentelemetry-http 0.10.0", "reqwest", "serde", "serde_json", "tracing", "tracing-futures", - "tracing-opentelemetry 0.18.0", + "tracing-opentelemetry 0.22.0", "tracing-subscriber", ] @@ -2490,15 +2450,6 @@ dependencies = [ "digest 0.10.7", ] -[[package]] -name = "home" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" -dependencies = [ - "windows-sys 0.52.0", -] - [[package]] name = "hostname" version = "0.3.1" @@ -3168,12 +3119,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "multimap" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" - [[package]] name = "mutually_exclusive_features" version = "0.0.3" @@ -3444,16 +3389,6 @@ dependencies = [ "tokio-stream", ] -[[package]] -name = "opentelemetry" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69d6c3d7288a106c0a363e4b0e8d308058d56902adefb16f4936f417ffef086e" -dependencies = [ - "opentelemetry_api", - "opentelemetry_sdk 0.18.0", -] - [[package]] name = "opentelemetry" version = "0.21.0" @@ -3484,14 +3419,14 @@ dependencies = [ [[package]] name = "opentelemetry-http" -version = "0.7.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1edc79add46364183ece1a4542592ca593e6421c60807232f5b8f7a31703825d" +checksum = "7f51189ce8be654f9b5f7e70e49967ed894e84a06fc35c6c042e64ac1fc5399e" dependencies = [ "async-trait", "bytes", "http", - "opentelemetry_api", + "opentelemetry 0.21.0", ] [[package]] @@ -3511,32 +3446,32 @@ dependencies = [ [[package]] name = "opentelemetry-jaeger" -version = "0.17.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e785d273968748578931e4dc3b4f5ec86b26e09d9e0d66b55adda7fce742f7a" +checksum = "e617c66fd588e40e0dbbd66932fdc87393095b125d4459b1a3a10feb1712f8a1" dependencies = [ "async-trait", - "futures 0.3.30", - "futures-executor", - "once_cell", - "opentelemetry 0.18.0", - "opentelemetry-semantic-conventions 0.10.0", - "thiserror", - "thrift 0.16.0", + "futures-core", + "futures-util", + "opentelemetry 0.21.0", + "opentelemetry-semantic-conventions 0.13.0", + "opentelemetry_sdk", + "thrift 0.17.0", ] [[package]] name = "opentelemetry-otlp" -version = "0.11.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1c928609d087790fc936a1067bdc310ae702bdf3b090c3f281b713622c8bbde" +checksum = "f24cda83b20ed2433c68241f918d0f6fdec8b1d43b7a9590ab4420c5095ca930" dependencies = [ "async-trait", - "futures 0.3.30", - "futures-util", + "futures-core", "http", - "opentelemetry 0.18.0", + "opentelemetry 0.21.0", "opentelemetry-proto", + "opentelemetry-semantic-conventions 0.13.0", + "opentelemetry_sdk", "prost", "thiserror", "tokio", @@ -3545,16 +3480,14 @@ dependencies = [ [[package]] name = "opentelemetry-proto" -version = "0.1.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61a2f56df5574508dd86aaca016c917489e589ece4141df1b5e349af8d66c28" +checksum = "a2e155ce5cc812ea3d1dffbd1539aed653de4bf4882d60e6e04dcf0901d674e1" dependencies = [ - "futures 0.3.30", - "futures-util", - "opentelemetry 0.18.0", + "opentelemetry 0.21.0", + "opentelemetry_sdk", "prost", "tonic", - "tonic-build", ] [[package]] @@ -3568,49 +3501,11 @@ dependencies = [ [[package]] name = "opentelemetry-semantic-conventions" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b02e0230abb0ab6636d18e2ba8fa02903ea63772281340ccac18e0af3ec9eeb" -dependencies = [ - "opentelemetry 0.18.0", -] - -[[package]] -name = "opentelemetry_api" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c24f96e21e7acc813c7a8394ee94978929db2bcc46cf6b5014fc612bf7760c22" -dependencies = [ - "fnv", - "futures-channel", - "futures-util", - "indexmap 1.9.3", - "js-sys", - "once_cell", - "pin-project-lite", - "thiserror", -] - -[[package]] -name = "opentelemetry_sdk" -version = "0.18.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ca41c4933371b61c2a2f214bf16931499af4ec90543604ec828f7a625c09113" +checksum = "f5774f1ef1f982ef2a447f6ee04ec383981a3ab99c8e77a1a7b30182e65bbc84" dependencies = [ - "async-trait", - "crossbeam-channel", - "dashmap", - "fnv", - "futures-channel", - "futures-executor", - "futures-util", - "once_cell", - "opentelemetry_api", - "percent-encoding", - "rand 0.8.5", - "thiserror", - "tokio", - "tokio-stream", + "opentelemetry 0.21.0", ] [[package]] @@ -3631,6 +3526,8 @@ dependencies = [ "percent-encoding", "rand 0.8.5", "thiserror", + "tokio", + "tokio-stream", ] [[package]] @@ -3642,6 +3539,15 @@ dependencies = [ "num-traits", ] +[[package]] +name = "ordered-float" +version = "2.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c" +dependencies = [ + "num-traits", +] + [[package]] name = "ordered-float" version = "4.2.0" @@ -3772,16 +3678,6 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" -[[package]] -name = "petgraph" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" -dependencies = [ - "fixedbitset", - "indexmap 2.2.2", -] - [[package]] name = "phf" version = "0.8.0" @@ -4012,16 +3908,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" -[[package]] -name = "prettyplease" -version = "0.1.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" -dependencies = [ - "proc-macro2 1.0.78", - "syn 1.0.109", -] - [[package]] name = "proc-macro-hack" version = "0.5.20+deprecated" @@ -4086,28 +3972,6 @@ dependencies = [ "prost-derive", ] -[[package]] -name = "prost-build" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" -dependencies = [ - "bytes", - "heck", - "itertools 0.10.5", - "lazy_static", - "log", - "multimap", - "petgraph", - "prettyplease", - "prost", - "prost-types", - "regex", - "syn 1.0.109", - "tempfile", - "which 4.4.2", -] - [[package]] name = "prost-derive" version = "0.11.9" @@ -4121,15 +3985,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "prost-types" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" -dependencies = [ - "prost", -] - [[package]] name = "protobuf" version = "2.28.0" @@ -5809,14 +5664,14 @@ dependencies = [ [[package]] name = "thrift" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09678c4cdbb4eed72e18b7c2af1329c69825ed16fcbac62d083fc3e2b0590ff0" +checksum = "7e54bc85fc7faa8bc175c4bab5b92ba8d9a3ce893d0e9f42cc455c8ab16a9e09" dependencies = [ "byteorder", "integer-encoding", "log", - "ordered-float 1.1.1", + "ordered-float 2.10.1", "threadpool", ] @@ -5975,14 +5830,13 @@ dependencies = [ [[package]] name = "tonic" -version = "0.8.3" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f219fad3b929bef19b1f86fbc0358d35daed8f2cac972037ac0dc10bbb8d5fb" +checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a" dependencies = [ - "async-stream", "async-trait", "axum", - "base64 0.13.1", + "base64 0.21.7", "bytes", "futures-core", "futures-util", @@ -5994,28 +5848,12 @@ dependencies = [ "percent-encoding", "pin-project", "prost", - "prost-derive", "tokio", "tokio-stream", - "tokio-util", "tower", "tower-layer", "tower-service", "tracing", - "tracing-futures", -] - -[[package]] -name = "tonic-build" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bf5e9b9c0f7e0a7c027dcfaba7b2c60816c7049171f679d99ee2ff65d0de8c4" -dependencies = [ - "prettyplease", - "proc-macro2 1.0.78", - "prost-build", - "quote 1.0.35", - "syn 1.0.109", ] [[package]] @@ -6144,20 +5982,6 @@ dependencies = [ "tracing-subscriber", ] -[[package]] -name = "tracing-opentelemetry" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21ebb87a95ea13271332df069020513ab70bdb5637ca42d6e492dc3bbbad48de" -dependencies = [ - "once_cell", - "opentelemetry 0.18.0", - "tracing", - "tracing-core", - "tracing-log 0.1.4", - "tracing-subscriber", -] - [[package]] name = "tracing-opentelemetry" version = "0.22.0" @@ -6167,7 +5991,7 @@ dependencies = [ "js-sys", "once_cell", "opentelemetry 0.21.0", - "opentelemetry_sdk 0.21.2", + "opentelemetry_sdk", "smallvec", "tracing", "tracing-core", @@ -6545,18 +6369,6 @@ dependencies = [ "libc", ] -[[package]] -name = "which" -version = "4.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" -dependencies = [ - "either", - "home", - "once_cell", - "rustix 0.38.31", -] - [[package]] name = "whoami" version = "1.4.1"