From 0916b26d678c06ca5196433a636ae4914f00b1a2 Mon Sep 17 00:00:00 2001 From: "Aode (lion)" Date: Tue, 1 Feb 2022 11:47:17 -0600 Subject: [PATCH] Update deps --- .cargo/config | 2 +- Cargo.lock | 137 +++++++++++++++++++++++++------------------------- Cargo.toml | 31 +++++++----- src/error.rs | 5 +- src/main.rs | 6 ++- 5 files changed, 97 insertions(+), 84 deletions(-) diff --git a/.cargo/config b/.cargo/config index bff29e6..5dbf2c8 100644 --- a/.cargo/config +++ b/.cargo/config @@ -1,2 +1,2 @@ [build] -rustflags = ["--cfg", "tokio_unstable"] +# rustflags = ["--cfg", "tokio_unstable"] diff --git a/Cargo.lock b/Cargo.lock index 1c0f029..e6544a6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,16 +4,16 @@ version = 3 [[package]] name = "activitystreams" -version = "0.7.0-alpha.16" +version = "0.7.0-alpha.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31bca51dcfddda6551570371a1c065528050eea2151a29897ac2dad67b5624cb" +checksum = "40c952a7b1b76c4a7355bf4635ff4e13f4b545bbb7fd75397c9ee1b91ff04c50" dependencies = [ "activitystreams-kinds", "iri-string", "mime", - "serde 1.0.135", + "serde 1.0.136", "serde_json", - "time 0.3.6", + "time 0.3.7", ] [[package]] @@ -23,7 +23,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb8e19a0810cc25df3535061a08b7d8f8a734d309ea4411c57a9767e4a2ffa0e" dependencies = [ "activitystreams", - "serde 1.0.135", + "serde 1.0.136", "serde_json", ] @@ -34,7 +34,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4a762e3441050b51cd0695c1413735cd04195950f50dba8f5da5d7201628fcfc" dependencies = [ "iri-string", - "serde 1.0.135", + "serde 1.0.136", ] [[package]] @@ -56,9 +56,9 @@ dependencies = [ [[package]] name = "actix-http" -version = "3.0.0-beta.19" +version = "3.0.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae58d21721388ea9b2cd0d4c11756b0f34424cdcd6e5cc74c3ce37b4641c8af0" +checksum = "08aac516b88cb8cfbfa834c76b58607ffac75946d947dcb6a9ffc5673e1e875d" dependencies = [ "actix-codec", "actix-rt", @@ -100,16 +100,16 @@ dependencies = [ [[package]] name = "actix-router" -version = "0.5.0-rc.2" +version = "0.5.0-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e0b59ad08167ffbb686ddb495846707231e96908b829b1fc218198ec581e2ad" +checksum = "cb6506dbef336634ff35d994d58daa0a412ea23751f15f9b4dcac4d594b1ed1f" dependencies = [ "bytestring", "firestorm", "http", "log", "regex", - "serde 1.0.135", + "serde 1.0.136", ] [[package]] @@ -154,15 +154,14 @@ dependencies = [ [[package]] name = "actix-tls" -version = "3.0.1" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b161450ff646361005a300716e85856780ddc2fde569fd81335cc3c15b2e0933" +checksum = "a31ab31563b611fa822480b4255e8750cf0af9ce1b8b7bde298afe8447ef9333" dependencies = [ "actix-codec", "actix-rt", "actix-service", "actix-utils", - "derive_more", "futures-core", "http", "log", @@ -184,9 +183,9 @@ dependencies = [ [[package]] name = "actix-web" -version = "4.0.0-beta.21" +version = "4.0.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "606fc29a9bde2907243086ceb93ce56df7584276c2c46abc64a524f645c63c5e" +checksum = "d7bfa913583b6cfe5f0d1588e752bcf6b107556422624fefdaf99c40ba2b7f16" dependencies = [ "actix-codec", "actix-http", @@ -211,20 +210,20 @@ dependencies = [ "once_cell", "pin-project-lite", "regex", - "serde 1.0.135", + "serde 1.0.136", "serde_json", "serde_urlencoded", "smallvec", "socket2", - "time 0.3.6", + "time 0.3.7", "url", ] [[package]] name = "actix-web-codegen" -version = "0.5.0-rc.1" +version = "0.5.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98a793e4a7bd059e06e1bc1bd9943b57a47f806de3599d2437441682292c333e" +checksum = "4d0976042e6ddc82c7d0dedd64d39959bc26d9bba098b2f6c32a73fbef784eaf" dependencies = [ "actix-router", "proc-macro2", @@ -241,7 +240,7 @@ dependencies = [ "actix-rt", "actix-web", "awc", - "serde 1.0.135", + "serde 1.0.136", "serde_derive", "thiserror", ] @@ -304,7 +303,7 @@ checksum = "94a45b455c14666b85fc40a019e8ab9eb75e3a124e05494f5397122bc9eb06e0" [[package]] name = "ap-relay" -version = "0.3.15" +version = "0.3.16" dependencies = [ "activitystreams", "activitystreams-ext", @@ -331,7 +330,7 @@ dependencies = [ "rsa", "rsa-magic-public-key", "ructe", - "serde 1.0.135", + "serde 1.0.136", "serde_json", "sha2", "sled", @@ -431,9 +430,9 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" [[package]] name = "awc" -version = "3.0.0-beta.19" +version = "3.0.0-beta.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a4cf9b623ee9974723a10c77a3b8c1060ac2d6cfe6d3326512bbc50fe36fad8" +checksum = "4a64a95bbf4905fd057ea45b70fdfeeb9c7ae09f03f091642c4e66a16ebb3ad5" dependencies = [ "actix-codec", "actix-http", @@ -457,7 +456,7 @@ dependencies = [ "pin-project-lite", "rand 0.8.4", "rustls", - "serde 1.0.135", + "serde 1.0.136", "serde_json", "serde_urlencoded", "tokio", @@ -485,7 +484,7 @@ dependencies = [ "async-trait", "background-jobs-core", "num_cpus", - "serde 1.0.135", + "serde 1.0.136", "serde_json", "thiserror", "tokio", @@ -504,10 +503,10 @@ dependencies = [ "anyhow", "async-mutex", "async-trait", - "serde 1.0.135", + "serde 1.0.136", "serde_json", "thiserror", - "time 0.3.6", + "time 0.3.7", "tracing", "tracing-futures", "uuid", @@ -621,7 +620,7 @@ dependencies = [ "lazy_static", "nom 5.1.2", "rust-ini", - "serde 1.0.135", + "serde 1.0.136", "serde-hjson", "serde_json", "toml", @@ -652,7 +651,7 @@ dependencies = [ "futures", "hdrhistogram", "humantime", - "serde 1.0.135", + "serde 1.0.136", "serde_json", "thread_local", "tokio", @@ -1040,9 +1039,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c9de88456263e249e241fcd211d3954e2c9b0ef7ccfc235a444eb367cae3689" +checksum = "d9f1f717ddc7b2ba36df7e871fd88db79326551d3d6f1fc406fbfd28b582ff8e" dependencies = [ "bytes", "fnv", @@ -1144,9 +1143,9 @@ dependencies = [ [[package]] name = "http-signature-normalization-actix" -version = "0.6.0-beta.2" +version = "0.6.0-beta.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3580657f3ad5b1e4f5c79861b66f3f4be4a9bc62c7f19ea210da8ef4b0ae3528" +checksum = "7a871b913b23e7617c75bbc902d63f7a3b3e753d846883c679253a3b975fbec9" dependencies = [ "actix-http", "actix-rt", @@ -1249,11 +1248,11 @@ dependencies = [ [[package]] name = "iri-string" -version = "0.5.0-beta.3" +version = "0.5.0-beta.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4b6441947fa91e8defdfcc0cf2e7d5d2c424e30efb11e97eb80a6bde58d778d" +checksum = "3e646c4df8aab0077f846d8869c8c677989f1aa27819456c3792ead45c0d10b5" dependencies = [ - "serde 1.0.135", + "serde 1.0.136", ] [[package]] @@ -1316,9 +1315,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.113" +version = "0.2.116" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eef78b64d87775463c549fbd80e19249ef436ea3bf1de2a1eb7e717ec7fab1e9" +checksum = "565dbd88872dbe4cc8a46e527f26483c1d1f7afa6b884a3bd6cd893d4f98da74" [[package]] name = "libm" @@ -1352,9 +1351,9 @@ checksum = "902eb695eb0591864543cbfbf6d742510642a605a61fc5e97fe6ceb5a30ac4fb" [[package]] name = "lock_api" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712a4d093c9976e24e7dbca41db895dabcbac38eb5f4045393d17a95bdfb1109" +checksum = "88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b" dependencies = [ "scopeguard", ] @@ -1600,7 +1599,7 @@ dependencies = [ "num-iter", "num-traits 0.2.14", "rand 0.8.4", - "serde 1.0.135", + "serde 1.0.136", "smallvec", "zeroize", ] @@ -1668,9 +1667,9 @@ dependencies = [ [[package]] name = "num_threads" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71a1eb3a36534514077c1e079ada2fb170ef30c47d203aa6916138cf882ecd52" +checksum = "97ba99ba6393e2c3734791401b66902d981cb03bf190af674ca69949b6d5fb15" dependencies = [ "libc", ] @@ -2317,9 +2316,9 @@ checksum = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8" [[package]] name = "serde" -version = "1.0.135" +version = "1.0.136" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cf9235533494ea2ddcdb794665461814781c53f19d87b76e571a1c35acbad2b" +checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789" dependencies = [ "serde_derive", ] @@ -2338,9 +2337,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.135" +version = "1.0.136" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dcde03d87d4c973c04be249e7d8f0b35db1c848c487bd43032808e59dd8328d" +checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9" dependencies = [ "proc-macro2", "quote", @@ -2355,7 +2354,7 @@ checksum = "d23c1ba4cf0efd44be32017709280b32d1cea5c3f1275c3b6d9e8bc54f758085" dependencies = [ "itoa 1.0.1", "ryu", - "serde 1.0.135", + "serde 1.0.136", ] [[package]] @@ -2367,7 +2366,7 @@ dependencies = [ "form_urlencoded", "itoa 1.0.1", "ryu", - "serde 1.0.135", + "serde 1.0.136", ] [[package]] @@ -2446,9 +2445,9 @@ checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" [[package]] name = "socket2" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f82496b90c36d70af5fcd482edaa2e0bd16fade569de1330405fecbbdac736b" +checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0" dependencies = [ "libc", "winapi", @@ -2486,7 +2485,7 @@ dependencies = [ "parking_lot", "phf_shared", "precomputed-hash", - "serde 1.0.135", + "serde 1.0.136", ] [[package]] @@ -2641,14 +2640,14 @@ dependencies = [ [[package]] name = "time" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8d54b9298e05179c335de2b9645d061255bcd5155f843b3e328d2cfe0a5b413" +checksum = "004cbc98f30fa233c61a38bc77e96a9106e65c88f2d3bef182ae952027e5753d" dependencies = [ "itoa 1.0.1", "libc", "num_threads", - "serde 1.0.135", + "serde 1.0.136", ] [[package]] @@ -2668,9 +2667,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.15.0" +version = "1.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbbf1c778ec206785635ce8ad57fe52b3009ae9e0c9f574a728f3049d3e55838" +checksum = "0c27a64b625de6d309e8c57716ba93021dccf1b3b5c97edd6d3dd2d2135afc0a" dependencies = [ "bytes", "libc", @@ -2749,7 +2748,7 @@ version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" dependencies = [ - "serde 1.0.135", + "serde 1.0.136", ] [[package]] @@ -2886,9 +2885,9 @@ dependencies = [ [[package]] name = "tracing-actix-web" -version = "0.5.0-beta.11" +version = "0.5.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71f2dfaaf009c5e9786e2f2dfbde63d5fa44409434d64190abfef5ade67d89b1" +checksum = "0066b8102bdd05325d02966fac8b5e360eafd8dcdf81006c4d30f3543f488714" dependencies = [ "actix-web", "pin-project", @@ -2910,9 +2909,9 @@ dependencies = [ [[package]] name = "tracing-awc" -version = "0.1.0-beta.20" +version = "0.1.0-beta.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff704c1995cdf9178e6252f560823147f51f1bb2f81de3941acfcb0827a6dd90" +checksum = "f6fbb546f391778848209c60f8e501e282fc00fa1dca1216fc2b947a49af485b" dependencies = [ "actix-http", "actix-service", @@ -2978,9 +2977,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77be66445c4eeebb934a7340f227bfe7b338173d3f8c00a60a5a58005c9faecf" +checksum = "5312f325fe3588e277415f5a6cca1f4ccad0f248c4cd5a4bd33032d7286abc22" dependencies = [ "ansi_term", "lazy_static", @@ -3070,7 +3069,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" dependencies = [ "getrandom 0.2.4", - "serde 1.0.135", + "serde 1.0.136", ] [[package]] @@ -3192,9 +3191,9 @@ dependencies = [ [[package]] name = "which" -version = "4.2.2" +version = "4.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea187a8ef279bc014ec368c27a920da2024d2a711109bfbe3440585d5cf27ad9" +checksum = "2a5a7e487e921cf220206864a94a89b6c6905bfc19f1057fa26a4cb360e5c1d2" dependencies = [ "either", "lazy_static", diff --git a/Cargo.toml b/Cargo.toml index 13700ae..cc239b1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "ap-relay" description = "A simple activitypub relay" -version = "0.3.15" +version = "0.3.16" authors = ["asonix "] license-file = "LICENSE" readme = "README.md" @@ -14,21 +14,27 @@ build = "src/build.rs" name = "relay" path = "src/main.rs" +[features] +console = ["console-subscriber"] +default = [] + # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] anyhow = "1.0" actix-rt = "2.6.0" -actix-web = { version = "4.0.0-beta.19", default-features = false } +actix-web = { version = "4.0.0-rc.1", default-features = false } actix-webfinger = "0.4.0-beta.5" activitystreams = "0.7.0-alpha.16" activitystreams-ext = "0.1.0-alpha.2" ammonia = "3.1.0" async-rwlock = "1.3.0" -awc = { version = "3.0.0-beta.6", default-features = false, features = ["rustls"] } +awc = { version = "3.0.0-beta.20", default-features = false, features = [ + "rustls", +] } base64 = "0.13" config = "0.11.0" -console-subscriber = "0.1" +console-subscriber = { version = "0.1", optional = true } dashmap = "5.0.0" dotenv = "0.15.0" futures-util = "0.3.17" @@ -46,29 +52,30 @@ sled = "0.34.6" structopt = "0.3.12" thiserror = "1.0" tracing = "0.1" -tracing-awc = "0.1.0-beta.19" +tracing-awc = "0.1.0-beta.21" tracing-error = "0.2" tracing-futures = "0.2" tracing-log = "0.1" tracing-opentelemetry = "0.16" -tracing-subscriber = { version = "0.3", features = ["ansi", "env-filter", "fmt"] } +tracing-subscriber = { version = "0.3", features = [ + "ansi", + "env-filter", + "fmt", +] } uuid = { version = "0.8", features = ["v4", "serde"] } [dependencies.background-jobs] version = "0.12.0" default-features = false -features = [ - "background-jobs-actix", - "error-logging" -] +features = ["background-jobs-actix", "error-logging"] [dependencies.http-signature-normalization-actix] -version = "0.6.0-beta.2" +version = "0.6.0-beta.3" default-features = false features = ["client", "server", "sha-2"] [dependencies.tracing-actix-web] -version = "0.5.0-beta.10" +version = "0.5.0-rc.1" [build-dependencies] anyhow = "1.0" diff --git a/src/error.rs b/src/error.rs index 32ce4a1..aa8204d 100644 --- a/src/error.rs +++ b/src/error.rs @@ -60,7 +60,10 @@ pub(crate) enum ErrorKind { ParseIri(#[from] activitystreams::iri_string::validate::Error), #[error("Couldn't normalize IRI, {0}")] - NormalizeIri(#[from] activitystreams::iri_string::normalize::Error), + NormalizeIri( + #[from] + activitystreams::iri_string::task::Error, + ), #[error("Couldn't perform IO, {0}")] Io(#[from] io::Error), diff --git a/src/main.rs b/src/main.rs index 89c1802..b1cb715 100644 --- a/src/main.rs +++ b/src/main.rs @@ -3,6 +3,7 @@ use activitystreams::iri_string::types::IriString; use actix_web::{web, App, HttpServer}; +#[cfg(feature = "console")] use console_subscriber::ConsoleLayer; use opentelemetry::{sdk::Resource, KeyValue}; use opentelemetry_otlp::WithExportConfig; @@ -46,6 +47,7 @@ fn init_subscriber( .with_span_events(FmtSpan::NEW | FmtSpan::CLOSE) .with_filter(targets.clone()); + #[cfg(feature = "console")] let console_layer = ConsoleLayer::builder() .with_default_env() .server_addr(([0, 0, 0, 0], 6669)) @@ -53,10 +55,12 @@ fn init_subscriber( .spawn(); let subscriber = tracing_subscriber::Registry::default() - .with(console_layer) .with(format_layer) .with(ErrorLayer::default()); + #[cfg(feature = "console")] + let subscriber = subscriber.with(console_layer); + if let Some(url) = opentelemetry_url { let tracer = opentelemetry_otlp::new_pipeline()