diff --git a/Cargo.lock b/Cargo.lock index 26ae68c..2c4570b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -314,7 +314,7 @@ dependencies = [ "protocol", "serde_json", "shuttle-axum", - "shuttle-runtime", + "shuttle-runtime 0.35.0", "tokio", "tower-http 0.5.0", "tracing", @@ -1173,6 +1173,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" @@ -1242,6 +1256,7 @@ dependencies = [ "ordered-float", "percent-encoding", "rand", + "serde_json", "thiserror", "tokio", "tokio-stream", @@ -1702,7 +1717,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c9c2181bcd2e70d58fee742fe6f24e85f7c21aa7a8f54e0872e35f1e51068a6e" dependencies = [ "axum 0.7.2", - "shuttle-runtime", + "shuttle-runtime 0.34.1", ] [[package]] @@ -1717,6 +1732,18 @@ dependencies = [ "syn 2.0.28", ] +[[package]] +name = "shuttle-codegen" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0aa40ce33e1b1aec9c3842ce309c2de14ee366fc94d90950881f7043005c99" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.28", +] + [[package]] name = "shuttle-common" version = "0.34.1" @@ -1759,6 +1786,50 @@ dependencies = [ "zeroize", ] +[[package]] +name = "shuttle-common" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad586504f3453786f8994e92bb1d6497eb27f89ce5c308eedb56c62b6d698def" +dependencies = [ + "anyhow", + "async-trait", + "axum 0.6.20", + "bytes", + "chrono", + "comfy-table", + "crossterm 0.27.0", + "headers", + "http 0.2.9", + "http-body 0.4.5", + "hyper 0.14.27", + "jsonwebtoken", + "opentelemetry", + "opentelemetry-appender-tracing", + "opentelemetry-http", + "opentelemetry-otlp", + "opentelemetry_sdk", + "pin-project", + "rustrict", + "semver", + "serde", + "serde_json", + "strum 0.25.0", + "thiserror", + "tokio", + "tonic 0.10.2", + "tower", + "tower-http 0.4.4", + "tracing", + "tracing-core", + "tracing-opentelemetry", + "tracing-subscriber", + "ttl_cache", + "url", + "uuid", + "zeroize", +] + [[package]] name = "shuttle-proto" version = "0.34.1" @@ -1768,7 +1839,20 @@ dependencies = [ "futures-core", "prost 0.12.3", "prost-types", - "shuttle-common", + "shuttle-common 0.34.1", + "tonic 0.10.2", +] + +[[package]] +name = "shuttle-proto" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "007fee4c4a09cb60e2e6af3136c80ccae49e45d421677bd861815f1d264d65a1" +dependencies = [ + "futures-core", + "prost 0.12.3", + "prost-types", + "shuttle-common 0.35.0", "tonic 0.10.2", ] @@ -1784,10 +1868,34 @@ dependencies = [ "prost-types", "serde", "serde_json", - "shuttle-codegen", - "shuttle-common", - "shuttle-proto", - "shuttle-service", + "shuttle-codegen 0.34.1", + "shuttle-common 0.34.1", + "shuttle-proto 0.34.1", + "shuttle-service 0.34.1", + "strfmt", + "thiserror", + "tokio", + "tokio-stream", + "tonic 0.10.2", + "tower", +] + +[[package]] +name = "shuttle-runtime" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69d171a6a029eccc0c7a56a8a6de693a4d29278656a0f893207a6bf40f3a8804" +dependencies = [ + "anyhow", + "async-trait", + "chrono", + "prost-types", + "serde", + "serde_json", + "shuttle-codegen 0.35.0", + "shuttle-common 0.35.0", + "shuttle-proto 0.35.0", + "shuttle-service 0.35.0", "strfmt", "thiserror", "tokio", @@ -1805,7 +1913,21 @@ dependencies = [ "anyhow", "async-trait", "serde", - "shuttle-common", + "shuttle-common 0.34.1", + "strfmt", + "thiserror", +] + +[[package]] +name = "shuttle-service" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a83831eaa185d65300efc0e3bf41e8b5a80bc2dfd2d26228cf20124770192e01" +dependencies = [ + "anyhow", + "async-trait", + "serde", + "shuttle-common 0.35.0", "strfmt", "thiserror", ] @@ -2318,6 +2440,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" @@ -2328,12 +2460,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/coordinator/Cargo.toml b/coordinator/Cargo.toml index 9e61e9a..6f08fcd 100644 --- a/coordinator/Cargo.toml +++ b/coordinator/Cargo.toml @@ -45,6 +45,6 @@ optional = true # Feature `shuttle` depend on it. [dependencies.shuttle-runtime] -version = "0.34" +version = "0.35" default-features = false optional = true