diff --git a/.github/workflows/publish-rust.yaml b/.github/workflows/publish-rust.yaml index 93d2d984b1..f57f14268a 100644 --- a/.github/workflows/publish-rust.yaml +++ b/.github/workflows/publish-rust.yaml @@ -71,7 +71,7 @@ jobs: npm run cargo:fix - name: Install Protoc - uses: arduino/setup-protoc@v1 + uses: arduino/setup-protoc@v3 with: repo-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/configs/cargo/Cargo.lock b/configs/cargo/Cargo.lock index ec5d966f23..7256f7ddd2 100644 --- a/configs/cargo/Cargo.lock +++ b/configs/cargo/Cargo.lock @@ -179,9 +179,9 @@ dependencies = [ [[package]] name = "apollo-router" -version = "1.45.0" +version = "1.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7975150f5d6619dbd4c0377869a178a8659ef5d0aa4dec15b42afc355850ca0" +checksum = "f6c79fc453260ad367afc3ec1ab32bdc85a0b1e5a6907dff69d1d928a686f632" dependencies = [ "access-json", "anyhow", @@ -260,6 +260,7 @@ dependencies = [ "opentelemetry-semantic-conventions", "opentelemetry-zipkin", "opentelemetry_api", + "opentelemetry_sdk", "parking_lot", "paste", "pin-project-lite", @@ -307,7 +308,6 @@ dependencies = [ "tracing", "tracing-core", "tracing-futures", - "tracing-opentelemetry", "tracing-serde", "tracing-subscriber", "trust-dns-resolver", @@ -2943,6 +2943,7 @@ checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" dependencies = [ "autocfg", "scopeguard", + "serde", ] [[package]] @@ -4310,9 +4311,9 @@ dependencies = [ [[package]] name = "router-bridge" -version = "0.5.18+v2.7.2" +version = "0.5.21+v2.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "673a5f56dd761938c87c89d33affb6f53e0129457d14bf12389f0cb4ebe74cfd" +checksum = "b2142445fe3fe2aae7a3c3c5083d1211a448a0dabb489a14dd90d427cf6c0b13" dependencies = [ "anyhow", "async-channel", @@ -5491,17 +5492,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "tracing-log" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" -dependencies = [ - "lazy_static", - "log", - "tracing-core", -] - [[package]] name = "tracing-log" version = "0.2.0" @@ -5513,22 +5503,6 @@ dependencies = [ "tracing-core", ] -[[package]] -name = "tracing-opentelemetry" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75327c6b667828ddc28f5e3f169036cb793c3f588d83bf0f262a7f062ffed3c8" -dependencies = [ - "once_cell", - "opentelemetry", - "opentelemetry_sdk", - "smallvec", - "tracing", - "tracing-core", - "tracing-log 0.1.3", - "tracing-subscriber", -] - [[package]] name = "tracing-serde" version = "0.1.3" @@ -5556,7 +5530,7 @@ dependencies = [ "thread_local", "tracing", "tracing-core", - "tracing-log 0.2.0", + "tracing-log", "tracing-serde", ]