From c59bdeed1ddfa9a1dbc5f3b8916a2f00e83bc042 Mon Sep 17 00:00:00 2001 From: "Aode (lion)" Date: Fri, 4 Feb 2022 11:33:12 -0600 Subject: [PATCH] opentelemetry 0.17, actix-web rc.2 --- Cargo.lock | 213 ++++++++++++----------------------------------------- Cargo.toml | 14 ++-- 2 files changed, 56 insertions(+), 171 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index dfcafb9..aaefd04 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -184,19 +184,17 @@ dependencies = [ [[package]] name = "actix-web" -version = "4.0.0-rc.1" +version = "4.0.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7bfa913583b6cfe5f0d1588e752bcf6b107556422624fefdaf99c40ba2b7f16" +checksum = "73170d019de2d82c0d826c1f315c3106134bd764e9247505ba6f0d78d22dfe9e" dependencies = [ "actix-codec", "actix-http", - "actix-macros", "actix-router", "actix-rt", "actix-server", "actix-service", "actix-utils", - "actix-web-codegen", "ahash 0.7.6", "bytes", "cfg-if", @@ -220,18 +218,6 @@ dependencies = [ "url", ] -[[package]] -name = "actix-web-codegen" -version = "0.5.0-rc.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d0976042e6ddc82c7d0dedd64d39959bc26d9bba098b2f6c32a73fbef784eaf" -dependencies = [ - "actix-router", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "adler" version = "1.0.2" @@ -510,10 +496,10 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14f67643a7d716307ad10b3e3aef02826382acbe349a3e7605ac57556148bc87" dependencies = [ - "prost 0.9.0", - "prost-types 0.9.0", - "tonic 0.6.2", - "tonic-build 0.6.2", + "prost", + "prost-types", + "tonic", + "tonic-build", "tracing-core", ] @@ -533,7 +519,7 @@ dependencies = [ "thread_local", "tokio", "tokio-stream", - "tonic 0.6.2", + "tonic", "tracing", "tracing-core", "tracing-subscriber", @@ -718,12 +704,6 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d3d6188b8804df28032815ea256b6955c9625c24da7525f387a7af02fbb8f01" -[[package]] -name = "fixedbitset" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d" - [[package]] name = "fixedbitset" version = "0.4.1" @@ -776,7 +756,6 @@ checksum = "28560757fe2bb34e79f907794bb6b22ae8b0e5c669b638a1132f2592b19035b4" dependencies = [ "futures-channel", "futures-core", - "futures-executor", "futures-io", "futures-sink", "futures-task", @@ -1160,9 +1139,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.116" +version = "0.2.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "565dbd88872dbe4cc8a46e527f26483c1d1f7afa6b884a3bd6cd893d4f98da74" +checksum = "e74d72e0f9b65b5b4ca49a346af3976df0f9c61d550727f349ecd559f251a26c" [[package]] name = "linked-hash-map" @@ -1408,13 +1387,15 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "opentelemetry" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cf9b1c4e9a6c4de793c632496fa490bdc0e1eea73f0c91394f7b6990935d22" +checksum = "6105e89802af13fdf48c49d7646d3b533a70e536d818aae7e78ba0433d01acb8" dependencies = [ "async-trait", "crossbeam-channel", - "futures", + "futures-channel", + "futures-executor", + "futures-util", "js-sys", "lazy_static", "percent-encoding", @@ -1427,19 +1408,20 @@ dependencies = [ [[package]] name = "opentelemetry-otlp" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f19d4b43842433c420c548c985d158f5628bba5b518e0be64627926d19889992" +checksum = "9d1a6ca9de4c8b00aa7f1a153bd76cb263287155cec642680d79d98706f3d28a" dependencies = [ "async-trait", "futures", + "futures-util", "http", "opentelemetry", - "prost 0.8.0", + "prost", "thiserror", "tokio", - "tonic 0.5.2", - "tonic-build 0.5.2", + "tonic", + "tonic-build", ] [[package]] @@ -1489,29 +1471,19 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" -[[package]] -name = "petgraph" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "467d164a6de56270bd7c4d070df81d07beace25012d5103ced4e9ff08d6afdb7" -dependencies = [ - "fixedbitset 0.2.0", - "indexmap", -] - [[package]] name = "petgraph" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4a13a2fa9d0b63e5f22328828741e523766fff0ee9e779316902290dff3f824f" dependencies = [ - "fixedbitset 0.4.1", + "fixedbitset", "indexmap", ] [[package]] name = "pict-rs" -version = "0.3.0-beta.18" +version = "0.3.0-beta.19" dependencies = [ "actix-form-data", "actix-rt", @@ -1627,16 +1599,6 @@ dependencies = [ "unicode-xid", ] -[[package]] -name = "prost" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de5e2533f59d08fcf364fd374ebda0692a70bd6d7e66ef97f306f45c6c5d8020" -dependencies = [ - "bytes", - "prost-derive 0.8.0", -] - [[package]] name = "prost" version = "0.9.0" @@ -1644,25 +1606,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001" dependencies = [ "bytes", - "prost-derive 0.9.0", -] - -[[package]] -name = "prost-build" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "355f634b43cdd80724ee7848f95770e7e70eefa6dcf14fea676216573b8fd603" -dependencies = [ - "bytes", - "heck", - "itertools", - "log", - "multimap", - "petgraph 0.5.1", - "prost 0.8.0", - "prost-types 0.8.0", - "tempfile", - "which", + "prost-derive", ] [[package]] @@ -1677,27 +1621,14 @@ dependencies = [ "lazy_static", "log", "multimap", - "petgraph 0.6.0", - "prost 0.9.0", - "prost-types 0.9.0", + "petgraph", + "prost", + "prost-types", "regex", "tempfile", "which", ] -[[package]] -name = "prost-derive" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "600d2f334aa05acb02a755e217ef1ab6dea4d51b58b7846588b747edec04efba" -dependencies = [ - "anyhow", - "itertools", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "prost-derive" version = "0.9.0" @@ -1711,16 +1642,6 @@ dependencies = [ "syn", ] -[[package]] -name = "prost-types" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "603bbd6394701d13f3f25aada59c7de9d35a6a5887cfc156181234a44002771b" -dependencies = [ - "bytes", - "prost 0.8.0", -] - [[package]] name = "prost-types" version = "0.9.0" @@ -1728,7 +1649,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a" dependencies = [ "bytes", - "prost 0.9.0", + "prost", ] [[package]] @@ -2428,37 +2349,6 @@ dependencies = [ "serde 1.0.136", ] -[[package]] -name = "tonic" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "796c5e1cd49905e65dd8e700d4cb1dffcbfdb4fc9d017de08c1a537afd83627c" -dependencies = [ - "async-stream", - "async-trait", - "base64", - "bytes", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-timeout", - "percent-encoding", - "pin-project", - "prost 0.8.0", - "prost-derive 0.8.0", - "tokio", - "tokio-stream", - "tokio-util", - "tower", - "tower-layer", - "tower-service", - "tracing", - "tracing-futures", -] - [[package]] name = "tonic" version = "0.6.2" @@ -2478,8 +2368,8 @@ dependencies = [ "hyper-timeout", "percent-encoding", "pin-project", - "prost 0.9.0", - "prost-derive 0.9.0", + "prost", + "prost-derive", "tokio", "tokio-stream", "tokio-util", @@ -2490,18 +2380,6 @@ dependencies = [ "tracing-futures", ] -[[package]] -name = "tonic-build" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12b52d07035516c2b74337d2ac7746075e7dcae7643816c1b12c5ff8a7484c08" -dependencies = [ - "proc-macro2", - "prost-build 0.8.0", - "quote", - "syn", -] - [[package]] name = "tonic-build" version = "0.6.2" @@ -2509,7 +2387,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9403f1bafde247186684b230dc6f38b5cd514584e8bec1dd32514be4745fa757" dependencies = [ "proc-macro2", - "prost-build 0.9.0", + "prost-build", "quote", "syn", ] @@ -2549,9 +2427,9 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" [[package]] name = "tracing" -version = "0.1.29" +version = "0.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105" +checksum = "2d8d93354fe2a8e50d5953f5ae2e47a3fc2ef03292e7ea46e3cc38f549525fb9" dependencies = [ "cfg-if", "log", @@ -2562,9 +2440,9 @@ dependencies = [ [[package]] name = "tracing-actix-web" -version = "0.5.0-rc.1" +version = "0.5.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0066b8102bdd05325d02966fac8b5e360eafd8dcdf81006c4d30f3543f488714" +checksum = "eba9ba7b978b6fd2838d47cd459cd4e23451bdd571448509e71476531b9306f2" dependencies = [ "actix-web", "opentelemetry", @@ -2577,9 +2455,9 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f480b8f81512e825f337ad51e94c1eb5d3bbdf2b363dcd01e2b19a9ffe3f8e" +checksum = "8276d9a4a3a558d7b7ad5303ad50b53d58264641b82914b7ada36bd762e7a716" dependencies = [ "proc-macro2", "quote", @@ -2588,9 +2466,9 @@ dependencies = [ [[package]] name = "tracing-awc" -version = "0.1.0-beta.21" +version = "0.1.0-beta.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6fbb546f391778848209c60f8e501e282fc00fa1dca1216fc2b947a49af485b" +checksum = "d055968fc655e9957a14868f3ae0aa5e298a6e549345fbfddea055022c0b858d" dependencies = [ "actix-http", "actix-service", @@ -2605,11 +2483,12 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4ed65637b8390770814083d20756f87bfa2c21bf2f110babdc5438351746e4" +checksum = "03cfcb51380632a72d3111cb8d3447a8d908e577d31beeac006f836383d29a23" dependencies = [ "lazy_static", + "valuable", ] [[package]] @@ -2645,9 +2524,9 @@ dependencies = [ [[package]] name = "tracing-opentelemetry" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ffbf13a0f8b054a4e59df3a173b818e9c6177c02789871f2073977fd0062076" +checksum = "dff3ebfa73490b6d574ca747819b6bde3e8d006b58861f34cafa89898d91eb9c" dependencies = [ "opentelemetry", "tracing", @@ -2764,6 +2643,12 @@ dependencies = [ "serde 1.0.136", ] +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + [[package]] name = "vec_map" version = "0.8.2" diff --git a/Cargo.toml b/Cargo.toml index 14e7834..aeecce1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "pict-rs" description = "A simple image hosting service" -version = "0.3.0-beta.18" +version = "0.3.0-beta.19" authors = ["asonix "] license = "AGPL-3.0" readme = "README.md" @@ -22,7 +22,7 @@ io-uring = [ [dependencies] actix-form-data = "0.6.0-beta.11" -actix-rt = "2.6.0" +actix-rt = { version = "2.6.0", default-features = false } actix-server = "2.0.0" actix-web = { version = "4.0.0-rc.1", default-features = false } anyhow = "1.0" @@ -38,8 +38,8 @@ futures-util = "0.3.17" mime = "0.3.1" num_cpus = "1.13" once_cell = "1.4.0" -opentelemetry = { version = "0.16", features = ["rt-tokio"] } -opentelemetry-otlp = "0.9" +opentelemetry = { version = "0.17", features = ["rt-tokio"] } +opentelemetry-otlp = "0.10" pin-project-lite = "0.2.7" reqwest = { version = "0.11.5", default-features = false, features = [ "rustls-tls", @@ -64,7 +64,7 @@ tracing = "0.1.15" tracing-error = "0.2.0" tracing-futures = "0.2.4" tracing-log = "0.1.2" -tracing-opentelemetry = "0.16" +tracing-opentelemetry = "0.17" tracing-subscriber = { version = "0.3.0", features = [ "env-filter", "fmt", @@ -76,9 +76,9 @@ uuid = { version = "0.8.2", features = ["v4", "serde"] } [dependencies.tracing-actix-web] version = "0.5.0-rc.1" default-features = false -features = ["emit_event_on_error", "opentelemetry_0_16"] +features = ["emit_event_on_error", "opentelemetry_0_17"] [dependencies.tracing-awc] version = "0.1.0-beta.14" default-features = false -features = ["emit_event_on_error", "opentelemetry_0_16"] +features = ["emit_event_on_error", "opentelemetry_0_17"]