From 8e7ea892f20ae8037df7062e1fec3d0d2c7a8aca Mon Sep 17 00:00:00 2001 From: Stachelbeere1248 Date: Mon, 25 Dec 2023 06:48:51 +0100 Subject: [PATCH] shuttle 0.35.2 --- Cargo.lock | 79 +++++++++++++++++++++++++++++++++++++++++++----------- Cargo.toml | 8 +++--- 2 files changed, 67 insertions(+), 20 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6af7777..d980727 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -358,9 +358,9 @@ dependencies = [ [[package]] name = "cargo-shuttle" -version = "0.34.1" +version = "0.35.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d90c0ff7346b30a3a82368cd83da974cd7da42e3bae2da4256b8ce6cb987b3cd" +checksum = "1007c59f5c3a8092e48be5b7a035104aecad16f3f014380f912e896211463dbe" dependencies = [ "anyhow", "async-trait", @@ -369,6 +369,7 @@ dependencies = [ "chrono", "clap", "clap_complete", + "clap_mangen", "crossterm 0.27.0", "dialoguer", "dirs", @@ -510,6 +511,16 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" +[[package]] +name = "clap_mangen" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3be86020147691e1d2ef58f75346a3d4d94807bfc473e377d52f09f0f7d77f7" +dependencies = [ + "clap", + "roff", +] + [[package]] name = "clru" version = "0.6.1" @@ -2546,6 +2557,20 @@ dependencies = [ "urlencoding", ] +[[package]] +name = "opentelemetry-appender-tracing" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12c4bd073648dae8ac45cfc81588d74b3dc5f334119ac08567ddcbfe16f2d809" +dependencies = [ + "once_cell", + "opentelemetry", + "opentelemetry_sdk", + "tracing", + "tracing-core", + "tracing-subscriber", +] + [[package]] name = "opentelemetry-http" version = "0.10.0" @@ -2615,6 +2640,7 @@ dependencies = [ "ordered-float 4.1.1", "percent-encoding", "rand", + "serde_json", "thiserror", "tokio", "tokio-stream", @@ -3197,6 +3223,12 @@ dependencies = [ "serde", ] +[[package]] +name = "roff" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b833d8d034ea094b1ea68aa6d5c740e0d04bad9d16568d08ba6f76823a114316" + [[package]] name = "rustc-demangle" version = "0.1.23" @@ -3541,9 +3573,9 @@ checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" [[package]] name = "shuttle-codegen" -version = "0.34.1" +version = "0.35.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99f584e6f02d513abb864d5a33fb24531318080385eeac6160a9ccf2988b31bb" +checksum = "a0d8979720bfd909ca7d7b188f55b1a266d455a5f4fc687153eae1883ba470b8" dependencies = [ "proc-macro-error", "proc-macro2", @@ -3553,9 +3585,9 @@ dependencies = [ [[package]] name = "shuttle-common" -version = "0.34.1" +version = "0.35.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0406c689a1edb0d12bd813d2b245619752ce0ad6122dad35c3f08ffccd2a40c" +checksum = "774cf8a2f4bfa3d81d286a2f90fcd9fdfafc0526470ed575c1245aa9ddc3137f" dependencies = [ "anyhow", "async-trait", @@ -3570,6 +3602,7 @@ dependencies = [ "hyper", "jsonwebtoken", "opentelemetry", + "opentelemetry-appender-tracing", "opentelemetry-http", "opentelemetry-otlp", "opentelemetry_sdk", @@ -3586,6 +3619,7 @@ dependencies = [ "tower", "tower-http", "tracing", + "tracing-core", "tracing-opentelemetry", "tracing-subscriber", "ttl_cache", @@ -3596,9 +3630,9 @@ dependencies = [ [[package]] name = "shuttle-poise" -version = "0.34.1" +version = "0.35.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b3ebc6b39118cf7884c940d58f2310fbf7c6fe4f8337be401b7305aa71d054f" +checksum = "adfcdf8cfe7243ae9b202fc0647afd0f4d954cc842c794068cdcb17e7cf58186" dependencies = [ "poise", "shuttle-runtime", @@ -3606,9 +3640,9 @@ dependencies = [ [[package]] name = "shuttle-proto" -version = "0.34.1" +version = "0.35.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa63942eb5dfbc6370a82611f40254b9af28f323985d3c01be400baf729c1104" +checksum = "c6a2740bb2148e6aa2ad57568ca9bf317cfd5bb241fc622fa512d9e45b046afa" dependencies = [ "futures-core", "prost 0.12.3", @@ -3619,9 +3653,9 @@ dependencies = [ [[package]] name = "shuttle-runtime" -version = "0.34.1" +version = "0.35.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8c49e755478841ae03351c3a4e7af99c684ce9757e5ddb0071d1ac42d33937" +checksum = "d425ff8765955c524714b98c855350e1441237ee43e058c208d1552405cf3099" dependencies = [ "anyhow", "async-trait", @@ -3645,9 +3679,9 @@ dependencies = [ [[package]] name = "shuttle-secrets" -version = "0.34.1" +version = "0.35.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0e0269b915526626e515996f77f68b433defc3be35221da87ed3eea4dce25a4" +checksum = "95f328ab4dc937400a07d3b7e96ae84eaae8eefe756ef533c3c0545fd2f155ab" dependencies = [ "async-trait", "secrecy", @@ -3657,9 +3691,9 @@ dependencies = [ [[package]] name = "shuttle-service" -version = "0.34.1" +version = "0.35.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c89dbd86fb79a791587317252daac5aa5026ed6fd73ce9f458acd30245bb13" +checksum = "7341769b2e27c2a6175ee71a041f7d0479c122d809fd8ab06c62864ff8fe362d" dependencies = [ "anyhow", "async-trait", @@ -4305,6 +4339,16 @@ dependencies = [ "web-time", ] +[[package]] +name = "tracing-serde" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" +dependencies = [ + "serde", + "tracing-core", +] + [[package]] name = "tracing-subscriber" version = "0.3.18" @@ -4315,12 +4359,15 @@ dependencies = [ "nu-ansi-term", "once_cell", "regex", + "serde", + "serde_json", "sharded-slab", "smallvec", "thread_local", "tracing", "tracing-core", "tracing-log", + "tracing-serde", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 1d6478c..07a9723 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,10 +10,10 @@ poise = "0.5.6" serenity = { version = "0.12.0", default-features = false, features = ["client", "gateway", "model", "rustls_backend", "utils"]} tokio = { version = "1.21.2", features = ["macros", "rt-multi-thread", "rt"] } env_logger = "0.10.0" -shuttle-secrets = "0.34.1" -shuttle-poise = "0.34.1" -shuttle-runtime = "0.34.1" +shuttle-secrets = "0.35.2" +shuttle-poise = "0.35.2" +shuttle-runtime = "0.35.2" anyhow = "1.0.75" tracing = "0.1.40" regex = "1.10.2" -cargo-shuttle = "0.34.1" +cargo-shuttle = { version = "0.35.2" }