diff --git a/Cargo.lock b/Cargo.lock index a2ab8d8e8..37722700a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -515,7 +515,7 @@ dependencies = [ "rusoto_core 0.42.0", "rusoto_credential 0.42.0", "rusoto_dynamodb 0.42.0", - "sentry 0.18.1", + "sentry 0.19.1", "serde 1.0.126", "serde_derive", "serde_dynamodb 0.4.1", @@ -733,9 +733,9 @@ dependencies = [ [[package]] name = "cadence" -version = "0.24.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e47ac30b0598bfd991b91817387bff591a75fb8e63f5b318c80e61d29aaf20c0" +checksum = "847f3952612c1559b60fe3a4de76b5c0c7745c5f3214a80b29e7aa844fee06d3" dependencies = [ "crossbeam-channel", ] @@ -794,9 +794,9 @@ dependencies = [ [[package]] name = "config" -version = "0.10.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b076e143e1d9538dde65da30f8481c2a6c44040edb8e02b9bf1351edb92ce3" +checksum = "1b1b9d958c2b1368a663f05538fc1b5975adce1e19f435acceae987aceeeb369" dependencies = [ "lazy_static", "nom", @@ -2067,16 +2067,6 @@ version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "789da6d93f1b866ffe175afc5322a4d76c038605a1c3319bb57b06967ca98a36" -[[package]] -name = "linked-hash-map" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d262045c5b87c0861b3f004610afd0e2c851e2908d08b6c870cbb9d5f494ecd" -dependencies = [ - "serde 0.8.23", - "serde_test", -] - [[package]] name = "linked-hash-map" version = "0.5.4" @@ -2116,7 +2106,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c" dependencies = [ - "linked-hash-map 0.5.4", + "linked-hash-map", ] [[package]] @@ -3501,6 +3491,7 @@ dependencies = [ "sentry-backtrace", "sentry-contexts", "sentry-core", + "sentry-error-chain", "sentry-failure", "sentry-panic", ] @@ -3545,6 +3536,17 @@ dependencies = [ "sentry-types 0.19.1", ] +[[package]] +name = "sentry-error-chain" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "720d205ebab53abf8a14560e3b6be02b9efd74ad79408e9d71b3f2687c625d8c" +dependencies = [ + "error-chain", + "sentry-backtrace", + "sentry-core", +] + [[package]] name = "sentry-failure" version = "0.19.1" @@ -3618,7 +3620,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a3a4e0ea8a88553209f6cc6cfe8724ecad22e1acf372793c27d995290fe74f8" dependencies = [ "lazy_static", - "linked-hash-map 0.3.0", "num-traits 0.1.43", "regex", "serde 0.8.23", @@ -3667,15 +3668,6 @@ dependencies = [ "serde 1.0.126", ] -[[package]] -name = "serde_test" -version = "0.8.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "110b3dbdf8607ec493c22d5d947753282f3bae73c0f56d322af1e8c78e4c23d5" -dependencies = [ - "serde 0.8.23", -] - [[package]] name = "serde_urlencoded" version = "0.5.5" @@ -5106,7 +5098,7 @@ version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" dependencies = [ - "linked-hash-map 0.5.4", + "linked-hash-map", ] [[package]] diff --git a/autoendpoint/Cargo.toml b/autoendpoint/Cargo.toml index 05e28dbb1..df2063c6e 100644 --- a/autoendpoint/Cargo.toml +++ b/autoendpoint/Cargo.toml @@ -22,8 +22,8 @@ async-trait = "0.1" autopush_common = { path = "../autopush-common" } backtrace = "0.3" base64 = "0.13" -cadence = "0.24" -config = "0.10.1" +cadence = "0.25" +config = "0.11" docopt = "1.1.0" fernet = "0.1.3" futures = "0.3" diff --git a/autopush-common/Cargo.toml b/autopush-common/Cargo.toml index 66ff3f110..b7d031904 100644 --- a/autopush-common/Cargo.toml +++ b/autopush-common/Cargo.toml @@ -15,30 +15,27 @@ name = "autopush_common" [dependencies] base64 = "0.13" -cadence = "0.24" +cadence = "0.25" chrono = "0.4" -config = "0.10.1" +config = "0.11" error-chain = "0.12" fernet = "0.1.3" -# XXX: pin to 0.1 until likely hyper 0.13 -futures = "0.1.29" +futures = "0.1.29" # 0.1.30 requires hyper 0.13+ futures-backoff = "0.1.0" hex = "0.4.2" httparse = "1.3" -# XXX: pin to hyper 0.12 for now: 0.13 has many changes.. -hyper = "^0.12.36" +hyper = "^0.12.36" # 0.13+ requires too many changes lazy_static = "1.4.0" log = { version = "0.4", features = ["max_level_info", "release_max_level_info"] } mozsvc-common = "0.1.1" openssl = "0.10" rand = "0.8" regex = "1.4" -# XXX: pin to < 0.10 until futures 0.3 -reqwest = "0.9.24" +reqwest = "0.9.24" # 0.10+ requires futures 0.3+ rusoto_core = "0.42.0" # 0.46+ requires futures 0.3+ rusoto_credential = "0.42.0" # 0.46+ requires futures 0.3+ rusoto_dynamodb = "0.42.0" # 0.46+ requires futures 0.3+ -sentry = { version = "0.18.1", features = ["with_error_chain"] } +sentry = { version = "0.19", features = ["with_error_chain"] } # 0.20+ requires new sentry server serde = "1.0" serde_derive = "1.0" serde_dynamodb = "0.4.1" # 0.7+ requires rusoto 0.46+ @@ -51,7 +48,6 @@ slog-scope = "4.4.0" slog-stdlog = "4.1.0" smallvec = "1.6" # for RUSTSEC-2021-0003 tokio-core = "0.1.17" -# XXX: pin to < 0.10 until hyper 0.13 -tungstenite = { version = "0.9.2", default-features = false } +tungstenite = { version = "0.9.2", default-features = false } # 0.10+ requires hyper 0.13+ url = "2.2" uuid = { version = "0.8", features = ["serde", "v4"] } diff --git a/autopush/Cargo.toml b/autopush/Cargo.toml index 24a94b269..c626b8220 100644 --- a/autopush/Cargo.toml +++ b/autopush/Cargo.toml @@ -18,10 +18,10 @@ autopush_common = { path = "../autopush-common" } base64 = "0.13" # XXX: pin to < 0.5 for hyper 0.12 bytes = "0.4" -cadence = "0.24" +cadence = "0.25" crossbeam-channel = "0.5" chrono = "0.4" -config = "0.10.1" +config = "0.11" docopt = "1.1.0" env_logger = "0.8" error-chain = "0.12"