diff --git a/Cargo.lock b/Cargo.lock index a5a944f..8ebc98c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -276,7 +276,7 @@ dependencies = [ "futures-core", "futures-util", "http 1.1.0", - "opentelemetry", + "opentelemetry 0.23.0", "pin-project-lite", "tower", "tracing", @@ -1254,7 +1254,7 @@ dependencies = [ "hyper 0.14.30", "log", "rustls 0.22.4", - "rustls-native-certs", + "rustls-native-certs 0.7.1", "rustls-pki-types", "tokio", "tokio-rustls 0.25.0", @@ -1271,7 +1271,7 @@ dependencies = [ "hyper 1.4.1", "hyper-util", "rustls 0.23.11", - "rustls-native-certs", + "rustls-native-certs 0.7.1", "rustls-pki-types", "tokio", "tokio-rustls 0.26.0", @@ -1291,6 +1291,19 @@ dependencies = [ "tokio-io-timeout", ] +[[package]] +name = "hyper-timeout" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3203a961e5c83b6f5498933e78b6b263e208c197b63e9c6c53cc82ffd3f63793" +dependencies = [ + "hyper 1.4.1", + "hyper-util", + "pin-project-lite", + "tokio", + "tower-service", +] + [[package]] name = "hyper-util" version = "0.1.6" @@ -1721,6 +1734,20 @@ dependencies = [ "thiserror", ] +[[package]] +name = "opentelemetry" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "803801d3d3b71cd026851a53f974ea03df3d179cb758b260136a6c9e22e196af" +dependencies = [ + "futures-core", + "futures-sink", + "js-sys", + "once_cell", + "pin-project-lite", + "thiserror", +] + [[package]] name = "opentelemetry-otlp" version = "0.16.0" @@ -1730,13 +1757,13 @@ dependencies = [ "async-trait", "futures-core", "http 0.2.12", - "opentelemetry", + "opentelemetry 0.23.0", "opentelemetry-proto", - "opentelemetry_sdk", - "prost", + "opentelemetry_sdk 0.23.0", + "prost 0.12.6", "thiserror", "tokio", - "tonic", + "tonic 0.11.0", ] [[package]] @@ -1745,23 +1772,23 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "984806e6cf27f2b49282e2a05e288f30594f3dbc74eb7a6e99422bc48ed78162" dependencies = [ - "opentelemetry", - "opentelemetry_sdk", - "prost", - "tonic", + "opentelemetry 0.23.0", + "opentelemetry_sdk 0.23.0", + "prost 0.12.6", + "tonic 0.11.0", ] [[package]] name = "opentelemetry-semantic-conventions" -version = "0.15.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1869fb4bb9b35c5ba8a1e40c9b128a7b4c010d07091e864a29da19e4fe2ca4d7" +checksum = "9b8e442487022a943e2315740e443dc5ee95fd541c18f509a5a6251b408a9f95" [[package]] name = "opentelemetry-stackdriver" -version = "0.20.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66fb59381142651c2cef3c27330528cded686bdfce11c8c4a57aa93b28c9cffb" +checksum = "94519ae644718ecbe82d500e28d0677991859c1d3f4b031d6804037f86a6be1c" dependencies = [ "async-trait", "futures-channel", @@ -1769,16 +1796,15 @@ dependencies = [ "futures-util", "gcp_auth", "hex", - "http 0.2.12", - "hyper 0.14.30", + "http 1.1.0", "once_cell", - "opentelemetry", + "opentelemetry 0.25.0", "opentelemetry-semantic-conventions", - "opentelemetry_sdk", - "prost", + "opentelemetry_sdk 0.25.0", + "prost 0.13.3", "prost-types", "thiserror", - "tonic", + "tonic 0.12.3", ] [[package]] @@ -1794,7 +1820,7 @@ dependencies = [ "glob", "lazy_static", "once_cell", - "opentelemetry", + "opentelemetry 0.23.0", "ordered-float", "percent-encoding 2.3.1", "rand", @@ -1803,6 +1829,23 @@ dependencies = [ "tokio-stream", ] +[[package]] +name = "opentelemetry_sdk" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0da0d6b47a3dbc6e9c9e36a0520e25cf943e046843818faaa3f87365a548c82" +dependencies = [ + "async-trait", + "futures-channel", + "futures-executor", + "futures-util", + "once_cell", + "opentelemetry 0.25.0", + "percent-encoding 2.3.1", + "rand", + "thiserror", +] + [[package]] name = "ordered-float" version = "4.2.1" @@ -2041,7 +2084,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" dependencies = [ "bytes", - "prost-derive", + "prost-derive 0.12.6", +] + +[[package]] +name = "prost" +version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b0487d90e047de87f984913713b85c601c05609aad5b0df4b4573fbf69aa13f" +dependencies = [ + "bytes", + "prost-derive 0.13.3", ] [[package]] @@ -2057,13 +2110,26 @@ dependencies = [ "syn", ] +[[package]] +name = "prost-derive" +version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9552f850d5f0964a4e4d0bf306459ac29323ddfbae05e35a7c0d35cb0803cc5" +dependencies = [ + "anyhow", + "itertools 0.13.0", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "prost-types" -version = "0.12.6" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" +checksum = "4759aa0d3a6232fb8dbdb97b61de2c20047c68aca932c7ed76da9d788508d670" dependencies = [ - "prost", + "prost 0.13.3", ] [[package]] @@ -2409,6 +2475,7 @@ version = "0.23.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4828ea528154ae444e5a642dbb7d5623354030dc9822b83fd9bb79683c7399d0" dependencies = [ + "log", "once_cell", "ring", "rustls-pki-types", @@ -2430,6 +2497,19 @@ dependencies = [ "security-framework", ] +[[package]] +name = "rustls-native-certs" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a" +dependencies = [ + "openssl-probe", + "rustls-pemfile 2.1.2", + "rustls-pki-types", + "schannel", + "security-framework", +] + [[package]] name = "rustls-pemfile" version = "1.0.4" @@ -3020,10 +3100,10 @@ dependencies = [ "email_address", "jsonwebtoken", "once_cell", - "opentelemetry", + "opentelemetry 0.23.0", "opentelemetry-otlp", "opentelemetry-stackdriver", - "opentelemetry_sdk", + "opentelemetry_sdk 0.23.0", "regex", "reqwest", "rstest", @@ -3248,9 +3328,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" +checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" dependencies = [ "futures-core", "pin-project-lite", @@ -3335,20 +3415,49 @@ dependencies = [ "axum 0.6.20", "base64 0.21.7", "bytes", - "flate2", "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", "hyper 0.14.30", - "hyper-timeout", + "hyper-timeout 0.4.1", + "percent-encoding 2.3.1", + "pin-project", + "prost 0.12.6", + "tokio", + "tokio-stream", + "tower", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tonic" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877c5b330756d856ffcc4553ab34a5684481ade925ecc54bcd1bf02b1d0d4d52" +dependencies = [ + "async-stream", + "async-trait", + "axum 0.7.5", + "base64 0.22.1", + "bytes", + "flate2", + "h2 0.4.5", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", + "hyper 1.4.1", + "hyper-timeout 0.5.1", + "hyper-util", "percent-encoding 2.3.1", "pin-project", - "prost", - "rustls-native-certs", + "prost 0.13.3", + "rustls-native-certs 0.8.0", "rustls-pemfile 2.1.2", - "rustls-pki-types", + "socket2", "tokio", - "tokio-rustls 0.25.0", + "tokio-rustls 0.26.0", "tokio-stream", "tower", "tower-layer", @@ -3496,8 +3605,8 @@ checksum = "f68803492bf28ab40aeccaecc7021096bd256baf7ca77c3d425d89b35a7be4e4" dependencies = [ "js-sys", "once_cell", - "opentelemetry", - "opentelemetry_sdk", + "opentelemetry 0.23.0", + "opentelemetry_sdk 0.23.0", "smallvec", "tracing", "tracing-core", @@ -3513,7 +3622,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7065f4c337874edb2ba504cb1e487b3bb4f1533a5bb6fcdf72da1575564814c" dependencies = [ "http 1.1.0", - "opentelemetry", + "opentelemetry 0.23.0", "tracing", "tracing-opentelemetry", ] diff --git a/apps/server/Cargo.toml b/apps/server/Cargo.toml index 89faba6..0bc5e88 100644 --- a/apps/server/Cargo.toml +++ b/apps/server/Cargo.toml @@ -41,7 +41,7 @@ tower-http = { version = "0.5.2", features = ["cors", "trace"] } axum-extra = { version = "0.9.3", features = ["typed-header"] } axum-tracing-opentelemetry = "0.19.0" regex = "1.10.5" -opentelemetry-stackdriver = { version = "0.20.0", features = ["propagator"] } +opentelemetry-stackdriver = { version = "0.22.0", features = ["propagator"] } [dependencies.axum] version = "0.7.5"