matrix/authentication-service
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-authentication-service.git synced 2025-07-31 09:24:31 +03:00
Code Activity

Bump dependencies

Browse Source
This commit is contained in:
Quentin Gliech
2022-02-04 10:18:01 +01:00
parent e4277180e5
commit 26a340d5dc
11 changed files with 101 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

153
Cargo.lock generated
View File

@ -93,9 +93,9 @@ dependencies = [
[[package]]
name = "async-compression"
version = "0.3.8"
version = "0.3.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5443ccbb270374a2b1055fc72da40e1f237809cd6bb0e97e66d264cd138473a6"
checksum = "f2bf394cfbbe876f0ac67b13b6ca819f9c9f2fb9ec67223cceb1555fbab1c31a"
dependencies = [
"brotli",
"flate2",
@ -327,7 +327,7 @@ dependencies = [
"percent-encoding",
"regex",
"ring",
"time 0.3.6",
"time 0.3.7",
"tracing",
]
@ -430,7 +430,7 @@ dependencies = [
"itoa 1.0.1",
"num-integer",
"ryu",
"time 0.3.6",
"time 0.3.7",
]
[[package]]
@ -458,9 +458,9 @@ dependencies = [
[[package]]
name = "backtrace"
version = "0.3.63"
version = "0.3.64"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "321629d8ba6513061f26707241fa9bc89524ff1cd7a915a97ef0c62c666ce1b6"
checksum = "5e121dee8023ce33ab248d9ce1493df03c3b38a659b240096fcbd7048ff9c31f"
dependencies = [
"addr2line",
"cc",
@ -741,9 +741,9 @@ dependencies = [
[[package]]
name = "clap"
version = "3.0.13"
version = "3.0.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "08799f92c961c7a1cf0cc398a9073da99e21ce388b46372c37f3191f2f3eed3e"
checksum = "b63edc3f163b3c71ec8aa23f9bd6070f77edbf3d1d198b164afa90ff00e4ec62"
dependencies = [
"atty",
"bitflags",
@ -758,9 +758,9 @@ dependencies = [
[[package]]
name = "clap_derive"
version = "3.0.12"
version = "3.0.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0fd2078197a22f338bd4fbf7d6387eb6f0d6a3c69e6cbc09f5c93e97321fd92a"
checksum = "9a1132dc3944b31c20dd8b906b3a9f0a5d0243e092d59171414969657ac6aa85"
dependencies = [
"heck 0.4.0",
"proc-macro-error",
@ -787,7 +787,7 @@ version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "94d4706de1b0fa5b132270cddffa8585166037822e260a944fe161acd137ca05"
dependencies = [
"time 0.3.6",
"time 0.3.7",
"version_check 0.9.4",
]
@ -1173,9 +1173,9 @@ dependencies = [
[[package]]
name = "fixedbitset"
version = "0.2.0"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d"
checksum = "279fb028e20b3c4c320317955b77c5e0c9701f05a1d309905d6fc702cdc5053e"
[[package]]
name = "flate2"
@ -1385,9 +1385,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 1.1.0",
"fnv",
@ -1702,9 +1702,9 @@ dependencies = [
[[package]]
name = "integer-encoding"
version = "1.1.7"
version = "3.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "48dc51180a9b377fd75814d0cc02199c20f8e99433d6762f650d39cdbbd3b56f"
checksum = "90c11140ffea82edce8dcd74137ce9324ec24b3cf0175fc9d7e29164da9915b8"
[[package]]
name = "iovec"
@ -1808,9 +1808,9 @@ dependencies = [
[[package]]
name = "libc"
version = "0.2.113"
version = "0.2.117"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eef78b64d87775463c549fbd80e19249ef436ea3bf1de2a1eb7e717ec7fab1e9"
checksum = "e74d72e0f9b65b5b4ca49a346af3976df0f9c61d550727f349ecd559f251a26c"
[[package]]
name = "libm"
@ -1826,9 +1826,9 @@ checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3"
[[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",
]
@ -2349,9 +2349,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",
]
@ -2411,15 +2411,17 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
[[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 0.5.2",
"dashmap",
"fnv",
"futures 0.3.19",
"futures-channel",
"futures-executor",
"futures-util",
"js-sys",
"lazy_static",
"percent-encoding",
@ -2432,13 +2434,12 @@ dependencies = [
[[package]]
name = "opentelemetry-http"
version = "0.5.0"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d50ceb0b0e8b75cb3e388a2571a807c8228dabc5d6670f317b6eb21301095373"
checksum = "449048140ee61e28f57abe6e9975eedc1f3a29855c7407bd6c12b18578863379"
dependencies = [
"async-trait",
"bytes 1.1.0",
"futures-util",
"http",
"opentelemetry",
"reqwest",
@ -2446,9 +2447,9 @@ dependencies = [
[[package]]
name = "opentelemetry-jaeger"
version = "0.15.0"
version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "db22f492873ea037bc267b35a0e8e4fb846340058cb7c864efe3d0bf23684593"
checksum = "f8c0b12cd9e3f9b35b52f6e0dac66866c519b26f424f4bbf96e3fe8bfbdc5229"
dependencies = [
"async-trait",
"headers",
@ -2465,12 +2466,13 @@ 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 0.3.19",
"futures-util",
"http",
"opentelemetry",
"prost",
@ -2482,18 +2484,18 @@ dependencies = [
[[package]]
name = "opentelemetry-semantic-conventions"
version = "0.8.0"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ffeac823339e8b0f27b961f4385057bf9f97f2863bc745bd015fd6091f2270e9"
checksum = "985cc35d832d412224b2cffe2f9194b1b89b6aa5d0bef76d080dce09d90e62bd"
dependencies = [
"opentelemetry",
]
[[package]]
name = "opentelemetry-zipkin"
version = "0.14.0"
version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "03d12766fd02acef686cf2f97b2fb6cbd9ba78313e051d3c4cca9591d5c947ed"
checksum = "fb86c6e02de97a3a7ffa5d267e1ff3f0c930ccf8a31e286277a209af6ed6cfc1"
dependencies = [
"async-trait",
"http",
@ -2692,9 +2694,9 @@ dependencies = [
[[package]]
name = "petgraph"
version = "0.5.1"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "467d164a6de56270bd7c4d070df81d07beace25012d5103ced4e9ff08d6afdb7"
checksum = "4a13a2fa9d0b63e5f22328828741e523766fff0ee9e779316902290dff3f824f"
dependencies = [
"fixedbitset",
"indexmap",
@ -2858,9 +2860,9 @@ dependencies = [
[[package]]
name = "prost"
version = "0.8.0"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "de5e2533f59d08fcf364fd374ebda0692a70bd6d7e66ef97f306f45c6c5d8020"
checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001"
dependencies = [
"bytes 1.1.0",
"prost-derive",
@ -2868,27 +2870,29 @@ dependencies = [
[[package]]
name = "prost-build"
version = "0.8.0"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "355f634b43cdd80724ee7848f95770e7e70eefa6dcf14fea676216573b8fd603"
checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5"
dependencies = [
"bytes 1.1.0",
"heck 0.3.3",
"itertools",
"lazy_static",
"log",
"multimap",
"petgraph",
"prost",
"prost-types",
"regex",
"tempfile",
"which",
]
[[package]]
name = "prost-derive"
version = "0.8.0"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "600d2f334aa05acb02a755e217ef1ab6dea4d51b58b7846588b747edec04efba"
checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe"
dependencies = [
"anyhow",
"itertools",
@ -2899,9 +2903,9 @@ dependencies = [
[[package]]
name = "prost-types"
version = "0.8.0"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "603bbd6394701d13f3f25aada59c7de9d35a6a5887cfc156181234a44002771b"
checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a"
dependencies = [
"bytes 1.1.0",
"prost",
@ -3090,7 +3094,7 @@ dependencies = [
[[package]]
name = "rsa"
version = "0.5.0"
source = "git+https://github.com/RustCrypto/RSA.git#6717592cc857a81c8c6f7d78c3e40ef36bd5cd67"
source = "git+https://github.com/RustCrypto/RSA.git#7395997c40b0f2c0bdb362b2998cbf9250408276"
dependencies = [
"byteorder",
"digest 0.10.1",
@ -3322,9 +3326,9 @@ dependencies = [
[[package]]
name = "security-framework"
version = "2.5.0"
version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d09d3c15d814eda1d6a836f2f2b56a6abc1446c8a34351cb3180d3db92ffe4ce"
checksum = "3fed7948b6c68acbb6e20c334f55ad635dc0f75506963de4464289fbd3b051ac"
dependencies = [
"bitflags",
"core-foundation",
@ -3335,9 +3339,9 @@ dependencies = [
[[package]]
name = "security-framework-sys"
version = "2.5.0"
version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e90dd10c41c6bfc633da6e0c659bd25d31e0791e5974ac42970267d59eba87f7"
checksum = "a57321bf8bc2362081b2599912d2961fe899c0efadf1b4b2f8d48b3e253bb96c"
dependencies = [
"core-foundation-sys",
"libc",
@ -3561,9 +3565,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",
@ -3851,9 +3855,9 @@ dependencies = [
[[package]]
name = "thrift"
version = "0.13.0"
version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c6d965454947cc7266d22716ebfd07b18d84ebaf35eec558586bbb2a8cb6b5b"
checksum = "b82ca8f46f95b3ce96081fe3dd89160fdea970c254bb72925255d1b62aae692e"
dependencies = [
"byteorder",
"integer-encoding",
@ -3875,9 +3879,9 @@ 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",
@ -4010,9 +4014,9 @@ dependencies = [
[[package]]
name = "tonic"
version = "0.5.2"
version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "796c5e1cd49905e65dd8e700d4cb1dffcbfdb4fc9d017de08c1a537afd83627c"
checksum = "ff08f4649d10a70ffa3522ca559031285d8e421d727ac85c60825761818f5d0a"
dependencies = [
"async-stream",
"async-trait",
@ -4041,9 +4045,9 @@ dependencies = [
[[package]]
name = "tonic-build"
version = "0.5.2"
version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "12b52d07035516c2b74337d2ac7746075e7dcae7643816c1b12c5ff8a7484c08"
checksum = "9403f1bafde247186684b230dc6f38b5cd514584e8bec1dd32514be4745fa757"
dependencies = [
"proc-macro2",
"prost-build",
@ -4116,9 +4120,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 1.0.0",
"log",
@ -4134,15 +4138,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "94571df2eae3ed4353815ea5a90974a594a1792d8782ff2cbcc9392d1101f366"
dependencies = [
"crossbeam-channel 0.5.2",
"time 0.3.6",
"time 0.3.7",
"tracing-subscriber",
]
[[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",
@ -4151,11 +4155,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]]
@ -4181,9 +4186,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",
@ -4415,6 +4420,12 @@ version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
[[package]]
name = "valuable"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
[[package]]
name = "version_check"
version = "0.1.5"

18
crates/cli/Cargo.toml
View File

@ -9,7 +9,7 @@ license = "Apache-2.0"
tokio = { version = "1.16.1", features = ["full"] }
futures = "0.3.19"
anyhow = { version = "1.0.53", features = ["backtrace"] }
clap = { version = "3.0.13", features = ["derive"] }
clap = { version = "3.0.14", features = ["derive"] }
dotenv = "0.15.0"
schemars = { version = "0.8.8", features = ["url", "chrono"] }
tower = { version = "0.4.11", features = ["full"] }
@ -23,16 +23,16 @@ reqwest = { version = "0.11.9", features = ["rustls-tls"], default-features = fa
watchman_client = "0.7.1"
atty = "0.2.14"
tracing = "0.1.29"
tracing = "0.1.30"
tracing-appender = "0.2.0"
tracing-subscriber = { version = "0.3.7", features = ["env-filter"] }
tracing-opentelemetry = "0.16.0"
opentelemetry = { version = "0.16.0", features = ["trace", "metrics", "rt-tokio"] }
opentelemetry-http = "0.5.0"
opentelemetry-semantic-conventions = "0.8.0"
opentelemetry-jaeger = { version = "0.15.0", features = ["rt-tokio", "reqwest_collector_client"], optional = true }
opentelemetry-otlp = { version = "0.9.0", features = ["trace", "metrics"], optional = true }
opentelemetry-zipkin = { version = "0.14.0", features = ["reqwest-client", "reqwest-rustls"], default-features = false, optional = true }
tracing-opentelemetry = "0.17.0"
opentelemetry = { version = "0.17.0", features = ["trace", "metrics", "rt-tokio"] }
opentelemetry-http = "0.6.0"
opentelemetry-semantic-conventions = "0.9.0"
opentelemetry-jaeger = { version = "0.16.0", features = ["rt-tokio", "reqwest_collector_client"], optional = true }
opentelemetry-otlp = { version = "0.10.0", features = ["trace", "metrics"], optional = true }
opentelemetry-zipkin = { version = "0.15.0", features = ["reqwest-client", "reqwest-rustls"], default-features = false, optional = true }
mas-config = { path = "../config" }
mas-handlers = { path = "../handlers" }

4
crates/cli/src/telemetry.rs
View File

@ -206,9 +206,7 @@ fn otlp_meter(_endpoint: &Option<url::Url>) -> anyhow::Result<()> {
}
fn stdout_meter() {
sdk::export::metrics::stdout(tokio::spawn, interval)
.with_pretty_print(true)
.init();
sdk::export::metrics::stdout(tokio::spawn, interval).init();
}
fn meter(config: &MetricsExporterConfig) -> anyhow::Result<()> {

2
crates/config/Cargo.toml
View File

@ -7,7 +7,7 @@ license = "Apache-2.0"
[dependencies]
tokio = { version = "1.16.1", features = [] }
tracing = { version = "0.1.29", features = ["log"] }
tracing = { version = "0.1.30", features = ["log"] }
async-trait = "0.1.52"
thiserror = "1.0.30"

2
crates/email/Cargo.toml
View File

@ -12,7 +12,7 @@ tokio = { version = "1.16.1", features = ["macros"] }
mas-templates = { path = "../templates" }
mas-config = { path = "../config" }
tracing = "0.1.29"
tracing = "0.1.30"
aws-sdk-sesv2 = "0.6.0"
aws-config = "0.6.0"

2
crates/handlers/Cargo.toml
View File

@ -13,7 +13,7 @@ dev = ["mas-static-files/dev", "mas-templates/dev"]
tokio = { version = "1.16.1", features = ["macros"] }
# Logging and tracing
tracing = "0.1.29"
tracing = "0.1.30"
# Error management
thiserror = "1.0.30"

2
crates/iana-codegen/Cargo.toml
View File

@ -14,5 +14,5 @@ futures-util = "0.3.19"
reqwest = { version = "0.11.9", features = ["blocking", "rustls-tls"], default-features = false }
serde = { version = "1.0.136", features = ["derive"] }
tokio = { version = "1.16.1", features = ["full"] }
tracing = "0.1.29"
tracing = "0.1.30"
tracing-subscriber = "0.3.7"

2
crates/storage/Cargo.toml
View File

@ -12,7 +12,7 @@ chrono = { version = "0.4.19", features = ["serde"] }
serde = { version = "1.0.136", features = ["derive"] }
thiserror = "1.0.30"
anyhow = "1.0.53"
tracing = "0.1.29"
tracing = "0.1.30"
warp = "0.3.2"
# Password hashing

2
crates/tasks/Cargo.toml
View File

@ -10,7 +10,7 @@ tokio = "1.16.1"
async-trait = "0.1.52"
tokio-stream = "0.1.8"
futures-util = "0.3.19"
tracing = "0.1.29"
tracing = "0.1.30"
sqlx = { version = "0.5.10", features = ["runtime-tokio-rustls", "postgres"] }
mas-storage = { path = "../storage" }

2
crates/templates/Cargo.toml
View File

@ -9,7 +9,7 @@ license = "Apache-2.0"
dev = []
[dependencies]
tracing = "0.1.29"
tracing = "0.1.30"
tokio = { version = "1.16.1", features = ["macros"] }
anyhow = "1.0.53"

4
crates/warp-utils/Cargo.toml
View File

@ -21,8 +21,8 @@ serde_json = "1.0.78"
serde_urlencoded = "0.7.1"
data-encoding = "2.3.2"
once_cell = "1.9.0"
tracing = "0.1.29"
opentelemetry = "0.16.0"
tracing = "0.1.30"
opentelemetry = "0.17.0"
rand = "0.8.4"
mime = "0.3.16"
bincode = "1.3.3"