diff --git a/Cargo.lock b/Cargo.lock
index e6544a6..3e461a4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -183,19 +183,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",
"bytes",
"cfg-if",
@@ -219,18 +217,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 = "actix-webfinger"
version = "0.4.0-beta.5"
@@ -303,7 +289,7 @@ checksum = "94a45b455c14666b85fc40a019e8ab9eb75e3a124e05494f5397122bc9eb06e0"
[[package]]
name = "ap-relay"
-version = "0.3.16"
+version = "0.3.17"
dependencies = [
"activitystreams",
"activitystreams-ext",
@@ -633,10 +619,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",
]
@@ -656,7 +642,7 @@ dependencies = [
"thread_local",
"tokio",
"tokio-stream",
- "tonic 0.6.2",
+ "tonic",
"tracing",
"tracing-core",
"tracing-subscriber",
@@ -841,12 +827,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"
@@ -899,9 +879,9 @@ checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7"
[[package]]
name = "futf"
-version = "0.1.4"
+version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c9c1ce3fa9336301af935ab852c437817d14cd33690446569392e65170aac3b"
+checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843"
dependencies = [
"mac",
"new_debug_unreachable",
@@ -915,7 +895,6 @@ checksum = "28560757fe2bb34e79f907794bb6b22ae8b0e5c669b638a1132f2592b19035b4"
dependencies = [
"futures-channel",
"futures-core",
- "futures-executor",
"futures-io",
"futures-sink",
"futures-task",
@@ -1143,9 +1122,9 @@ dependencies = [
[[package]]
name = "http-signature-normalization-actix"
-version = "0.6.0-beta.3"
+version = "0.6.0-beta.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a871b913b23e7617c75bbc902d63f7a3b3e753d846883c679253a3b975fbec9"
+checksum = "aa7289f4b1207d093fafdb1c5dae26975c2bfeb741694c1e6faf8fc622f40316"
dependencies = [
"actix-http",
"actix-rt",
@@ -1315,9 +1294,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 = "libm"
@@ -1682,13 +1661,15 @@ checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5"
[[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",
@@ -1701,19 +1682,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]]
@@ -1762,23 +1744,13 @@ 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",
]
@@ -1788,7 +1760,7 @@ version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12"
dependencies = [
- "phf_shared",
+ "phf_shared 0.8.0",
]
[[package]]
@@ -1798,7 +1770,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815"
dependencies = [
"phf_generator",
- "phf_shared",
+ "phf_shared 0.8.0",
]
[[package]]
@@ -1807,7 +1779,7 @@ version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526"
dependencies = [
- "phf_shared",
+ "phf_shared 0.8.0",
"rand 0.7.3",
]
@@ -1820,6 +1792,15 @@ dependencies = [
"siphasher",
]
+[[package]]
+name = "phf_shared"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096"
+dependencies = [
+ "siphasher",
+]
+
[[package]]
name = "pin-project"
version = "1.0.10"
@@ -1921,16 +1902,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"
@@ -1938,25 +1909,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]]
@@ -1971,27 +1924,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"
@@ -2005,16 +1945,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"
@@ -2022,7 +1952,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a"
dependencies = [
"bytes",
- "prost 0.9.0",
+ "prost",
]
[[package]]
@@ -2476,14 +2406,14 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
[[package]]
name = "string_cache"
-version = "0.8.2"
+version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "923f0f39b6267d37d23ce71ae7235602134b250ace715dd2c90421998ddac0c6"
+checksum = "33994d0838dc2d152d17a62adf608a869b5e846b65b389af7f3dbc1de45c5b26"
dependencies = [
"lazy_static",
"new_debug_unreachable",
"parking_lot",
- "phf_shared",
+ "phf_shared 0.10.0",
"precomputed-hash",
"serde 1.0.136",
]
@@ -2495,7 +2425,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f24c8e5e19d22a726626f1a5e16fe15b132dcf21d10177fa5a45ce7962996b97"
dependencies = [
"phf_generator",
- "phf_shared",
+ "phf_shared 0.8.0",
"proc-macro2",
"quote",
]
@@ -2751,37 +2681,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"
@@ -2801,8 +2700,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",
@@ -2813,18 +2712,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"
@@ -2832,7 +2719,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",
]
@@ -2872,9 +2759,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",
@@ -2885,9 +2772,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",
"pin-project",
@@ -2898,9 +2785,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",
@@ -2909,9 +2796,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",
@@ -2924,11 +2811,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]]
@@ -2964,9 +2852,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",
@@ -3072,6 +2960,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 cc239b1..61fafdc 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
[package]
name = "ap-relay"
description = "A simple activitypub relay"
-version = "0.3.16"
+version = "0.3.17"
authors = ["asonix <asonix@asonix.dog>"]
license-file = "LICENSE"
readme = "README.md"
@@ -23,7 +23,7 @@ default = []
[dependencies]
anyhow = "1.0"
actix-rt = "2.6.0"
-actix-web = { version = "4.0.0-rc.1", default-features = false }
+actix-web = { version = "4.0.0-rc.2", default-features = false }
actix-webfinger = "0.4.0-beta.5"
activitystreams = "0.7.0-alpha.16"
activitystreams-ext = "0.1.0-alpha.2"
@@ -40,8 +40,8 @@ dotenv = "0.15.0"
futures-util = "0.3.17"
lru = "0.7.0"
mime = "0.3.16"
-opentelemetry = { version = "0.16", features = ["rt-tokio"] }
-opentelemetry-otlp = "0.9"
+opentelemetry = { version = "0.17", features = ["rt-tokio"] }
+opentelemetry-otlp = "0.10"
rand = "0.8"
rsa = "0.5"
rsa-magic-public-key = "0.4.0"
@@ -52,11 +52,11 @@ sled = "0.34.6"
structopt = "0.3.12"
thiserror = "1.0"
tracing = "0.1"
-tracing-awc = "0.1.0-beta.21"
+tracing-awc = "0.1.0-beta.22"
tracing-error = "0.2"
tracing-futures = "0.2"
tracing-log = "0.1"
-tracing-opentelemetry = "0.16"
+tracing-opentelemetry = "0.17"
tracing-subscriber = { version = "0.3", features = [
"ansi",
"env-filter",
@@ -70,12 +70,12 @@ default-features = false
features = ["background-jobs-actix", "error-logging"]
[dependencies.http-signature-normalization-actix]
-version = "0.6.0-beta.3"
+version = "0.6.0-beta.4"
default-features = false
features = ["client", "server", "sha-2"]
[dependencies.tracing-actix-web]
-version = "0.5.0-rc.1"
+version = "0.5.0-rc.2"
[build-dependencies]
anyhow = "1.0"