diff --git a/Cargo.lock b/Cargo.lock index a00c37d60..db958a745 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -215,13 +215,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.89" +version = "0.1.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" +checksum = "82f6aeea286b8eb4dd3431a1be1b59d290ace00f5bfd8e2a159bc2a05e2c1667" dependencies = [ "proc-macro2", "quote", - "syn 2.0.119", + "syn 3.0.6", ] [[package]] @@ -3317,9 +3317,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.45" +version = "0.23.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d41d731c7d2f962d1ccc364cec258de3c0e93b38c2fb3ba97ac74513048d634" +checksum = "48e13bd8c0e9365c43cfa5c9e8f9ad49d3c8444926c9aac819e0e4dc503c8fdf" dependencies = [ "aws-lc-rs", "log", diff --git a/renovate.json b/renovate.json index dfc882cb0..929bde110 100644 --- a/renovate.json +++ b/renovate.json @@ -21,7 +21,12 @@ "opentelemetry-stdout" ], "allowedVersions": "<0.33.0", - "description": "Hold the opentelemetry monorepo below 0.33.0 until tracing-opentelemetry ships a release built against opentelemetry 0.33. tracing-opentelemetry 0.33.0 is the newest release and requires opentelemetry ^0.32.0, so bumping the monorepo to 0.33.0 splits the dependency graph and breaks the vx-metrics build. See: https://github.com/vx-org/vx/pull/1127" + "description": "Hold the opentelemetry monorepo below 0.33.0 in step with the tracing-opentelemetry cap below. Bumping the monorepo to 0.33.0 on its own splits the dependency graph and breaks the vx-metrics build. See: https://github.com/vx-org/vx/pull/1127" + }, + { + "matchPackageNames": ["tracing-opentelemetry"], + "allowedVersions": "<0.34.0", + "description": "Hold tracing-opentelemetry below 0.34.0 while the monorepo stays on 0.32.x. tracing-opentelemetry 0.34.0 is built against opentelemetry 0.33.0, so taking it on its own leaves vx-metrics matching an opentelemetry 0.32 SdkTracer against the opentelemetry 0.33 Tracer bound in OpenTelemetryLayer::with_tracer (E0277, then E0599 on with_filter). Lift both caps together when the monorepo is ready to move to 0.33. See: https://github.com/vx-org/vx/pull/1158" } ] }