diff --git a/Cargo.lock b/Cargo.lock index 15e3c51..a809238 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -98,7 +98,7 @@ name = "awala-vpn-shield" version = "0.1.0" dependencies = [ "anyhow", - "axum", + "axum 0.7.9", "axum-test", "axum-tracing-opentelemetry", "init-tracing-opentelemetry", @@ -112,7 +112,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f" dependencies = [ "async-trait", - "axum-core", + "axum-core 0.4.5", "bytes", "futures-util", "http 1.2.0", @@ -121,7 +121,7 @@ dependencies = [ "hyper", "hyper-util", "itoa", - "matchit", + "matchit 0.7.3", "memchr", "mime", "percent-encoding", @@ -139,6 +139,32 @@ dependencies = [ "tracing", ] +[[package]] +name = "axum" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d6fd624c75e18b3b4c6b9caf42b1afe24437daaee904069137d8bab077be8b8" +dependencies = [ + "axum-core 0.5.0", + "bytes", + "futures-util", + "http 1.2.0", + "http-body", + "http-body-util", + "itoa", + "matchit 0.8.4", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "sync_wrapper", + "tower 0.5.2", + "tower-layer", + "tower-service", +] + [[package]] name = "axum-core" version = "0.4.5" @@ -160,6 +186,25 @@ dependencies = [ "tracing", ] +[[package]] +name = "axum-core" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df1362f362fd16024ae199c1970ce98f9661bf5ef94b9808fee734bc3698b733" +dependencies = [ + "bytes", + "futures-util", + "http 1.2.0", + "http-body", + "http-body-util", + "mime", + "pin-project-lite", + "rustversion", + "sync_wrapper", + "tower-layer", + "tower-service", +] + [[package]] name = "axum-test" version = "16.4.1" @@ -169,7 +214,7 @@ dependencies = [ "anyhow", "assert-json-diff", "auto-future", - "axum", + "axum 0.7.9", "bytes", "bytesize", "cookie", @@ -192,19 +237,19 @@ dependencies = [ [[package]] name = "axum-tracing-opentelemetry" -version = "0.24.1" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04637ce1dedc9d655e5a566ded972e1cc48967282719ea7cd1ef338257cf1d3c" +checksum = "3908eff5988656cb35dd96ff8753c4cce06eb40705abb074e878a2e62bf0c5c9" dependencies = [ - "axum", + "axum 0.8.1", "futures-core", "futures-util", "http 1.2.0", - "opentelemetry", + "opentelemetry 0.28.0", "pin-project-lite", "tower 0.5.2", "tracing", - "tracing-opentelemetry", + "tracing-opentelemetry 0.29.0", "tracing-opentelemetry-instrumentation-sdk", ] @@ -781,13 +826,13 @@ version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfd997151751a557e56c23870ce9ebb1ee22f12642a67bc51a55be1a3c4336b4" dependencies = [ - "opentelemetry", + "opentelemetry 0.27.1", "opentelemetry-otlp", "opentelemetry-semantic-conventions", - "opentelemetry_sdk", + "opentelemetry_sdk 0.27.1", "thiserror 1.0.69", "tracing", - "tracing-opentelemetry", + "tracing-opentelemetry 0.28.0", "tracing-subscriber", ] @@ -871,6 +916,12 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" +[[package]] +name = "matchit" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3" + [[package]] name = "memchr" version = "2.7.4" @@ -964,6 +1015,20 @@ dependencies = [ "tracing", ] +[[package]] +name = "opentelemetry" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "236e667b670a5cdf90c258f5a55794ec5ac5027e960c224bff8367a59e1e6426" +dependencies = [ + "futures-core", + "futures-sink", + "js-sys", + "pin-project-lite", + "thiserror 2.0.9", + "tracing", +] + [[package]] name = "opentelemetry-http" version = "0.27.0" @@ -973,7 +1038,7 @@ dependencies = [ "async-trait", "bytes", "http 1.2.0", - "opentelemetry", + "opentelemetry 0.27.1", "reqwest", ] @@ -986,10 +1051,10 @@ dependencies = [ "async-trait", "futures-core", "http 1.2.0", - "opentelemetry", + "opentelemetry 0.27.1", "opentelemetry-http", "opentelemetry-proto", - "opentelemetry_sdk", + "opentelemetry_sdk 0.27.1", "prost", "reqwest", "thiserror 1.0.69", @@ -1003,8 +1068,8 @@ version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a6e05acbfada5ec79023c85368af14abd0b307c015e9064d249b2a950ef459a6" dependencies = [ - "opentelemetry", - "opentelemetry_sdk", + "opentelemetry 0.27.1", + "opentelemetry_sdk 0.27.1", "prost", "tonic", ] @@ -1026,7 +1091,7 @@ dependencies = [ "futures-executor", "futures-util", "glob", - "opentelemetry", + "opentelemetry 0.27.1", "percent-encoding", "rand", "thiserror 1.0.69", @@ -1034,6 +1099,23 @@ dependencies = [ "tokio-stream", ] +[[package]] +name = "opentelemetry_sdk" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84dfad6042089c7fc1f6118b7040dc2eb4ab520abbf410b79dc481032af39570" +dependencies = [ + "async-trait", + "futures-channel", + "futures-executor", + "futures-util", + "glob", + "opentelemetry 0.28.0", + "percent-encoding", + "rand", + "thiserror 2.0.9", +] + [[package]] name = "overload" version = "0.1.1" @@ -1207,7 +1289,7 @@ dependencies = [ "once_cell", "socket2", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -1832,7 +1914,7 @@ checksum = "877c5b330756d856ffcc4553ab34a5684481ade925ecc54bcd1bf02b1d0d4d52" dependencies = [ "async-stream", "async-trait", - "axum", + "axum 0.7.9", "base64", "bytes", "h2", @@ -1954,8 +2036,26 @@ checksum = "97a971f6058498b5c0f1affa23e7ea202057a7301dbff68e968b2d578bcbd053" dependencies = [ "js-sys", "once_cell", - "opentelemetry", - "opentelemetry_sdk", + "opentelemetry 0.27.1", + "opentelemetry_sdk 0.27.1", + "smallvec", + "tracing", + "tracing-core", + "tracing-log", + "tracing-subscriber", + "web-time", +] + +[[package]] +name = "tracing-opentelemetry" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "721f2d2569dce9f3dfbbddee5906941e953bfcdf736a62da3377f5751650cc36" +dependencies = [ + "js-sys", + "once_cell", + "opentelemetry 0.28.0", + "opentelemetry_sdk 0.28.0", "smallvec", "tracing", "tracing-core", @@ -1966,14 +2066,14 @@ dependencies = [ [[package]] name = "tracing-opentelemetry-instrumentation-sdk" -version = "0.24.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ece512a961221014e69a59c75561a2889835325c7520551ca721145809f9e40c" +checksum = "3cae2c7a01582abc7b0a4672f92c47411b69cd3967b8b79bb743d5d0991c9089" dependencies = [ "http 1.2.0", - "opentelemetry", + "opentelemetry 0.28.0", "tracing", - "tracing-opentelemetry", + "tracing-opentelemetry 0.29.0", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 800f3b2..98bba2c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ release = false axum = "0.7.9" tokio = { version = "1.42.0", features = ["full"] } anyhow = "1.0.95" -axum-tracing-opentelemetry = "0.24.1" +axum-tracing-opentelemetry = "0.26.0" init-tracing-opentelemetry = { version = "0.25.0", features = ["tracing_subscriber_ext", "otlp"] } [dev-dependencies]