From 8dcf6b6d6b821bc82ba825a7e0f2d49abf846371 Mon Sep 17 00:00:00 2001 From: Graeme Read Date: Fri, 26 Jun 2026 11:56:57 +0100 Subject: [PATCH] Track the consumer's `opentelemetry` major in `sqlcommenter` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit OpenTelemetry keeps its propagator and tracer-provider registries in version-specific statics, so a second copy of `opentelemetry` in the tree doesn't share that state — `sqlcommenter` silently stops injecting SQL comments while `db.query` spans still export, with no error or warning. Pinning the fork's `opentelemetry`/`tracing-opentelemetry` to the line the consumer uses keeps exactly one copy in their dependency graph. --- Cargo.lock | 110 +++++++++++-------------------------------- sqlx-core/Cargo.toml | 4 +- 2 files changed, 30 insertions(+), 84 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c96208fd7f..42f86a6fa2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -490,7 +490,7 @@ dependencies = [ "getrandom 0.2.17", "instant", "pin-project-lite", - "rand 0.8.5", + "rand", "tokio", ] @@ -2355,12 +2355,11 @@ checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" [[package]] name = "nu-ansi-term" -version = "0.46.0" +version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "overload", - "winapi", + "windows-sys 0.61.2", ] [[package]] @@ -2385,7 +2384,7 @@ dependencies = [ "num-integer", "num-iter", "num-traits", - "rand 0.8.5", + "rand", "smallvec", "zeroize", ] @@ -2519,39 +2518,17 @@ dependencies = [ [[package]] name = "opentelemetry" -version = "0.30.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaf416e4cb72756655126f7dd7bb0af49c674f4c1b9903e80c009e0c37e552e6" +checksum = "b0142c63252a9e054e68a4c61a5778f7b14f576274d593f8ce883d191a099682" dependencies = [ "futures-core", "futures-sink", "js-sys", "pin-project-lite", "thiserror 2.0.17", - "tracing", ] -[[package]] -name = "opentelemetry_sdk" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11f644aa9e5e31d11896e024305d7e3c98a88884d9f8919dbf37a9991bc47a4b" -dependencies = [ - "futures-channel", - "futures-executor", - "futures-util", - "opentelemetry", - "percent-encoding", - "rand 0.9.4", - "thiserror 2.0.17", -] - -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - [[package]] name = "owo-colors" version = "3.5.0" @@ -2594,7 +2571,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" dependencies = [ "base64ct", - "rand_core 0.6.4", + "rand_core", "subtle", ] @@ -2605,7 +2582,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" dependencies = [ "base64ct", - "rand_core 0.6.4", + "rand_core", "subtle", ] @@ -2901,18 +2878,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - -[[package]] -name = "rand" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c5af06bb1b7d3216d91932aed5265164bf384dc89cd6ba05cf59a35f5f76ea" -dependencies = [ - "rand_chacha 0.9.0", - "rand_core 0.9.5", + "rand_chacha", + "rand_core", ] [[package]] @@ -2922,17 +2889,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_chacha" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" -dependencies = [ - "ppv-lite86", - "rand_core 0.9.5", + "rand_core", ] [[package]] @@ -2944,22 +2901,13 @@ dependencies = [ "getrandom 0.2.17", ] -[[package]] -name = "rand_core" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c" -dependencies = [ - "getrandom 0.3.4", -] - [[package]] name = "rand_xoshiro" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa" dependencies = [ - "rand_core 0.6.4", + "rand_core", ] [[package]] @@ -3110,7 +3058,7 @@ dependencies = [ "num-traits", "pkcs1", "pkcs8", - "rand_core 0.6.4", + "rand_core", "signature", "subtle", "zeroize", @@ -3126,7 +3074,7 @@ dependencies = [ "borsh", "bytes", "num-traits", - "rand 0.8.5", + "rand", "rkyv", "serde", "serde_json", @@ -3474,7 +3422,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" dependencies = [ "digest", - "rand_core 0.6.4", + "rand_core", ] [[package]] @@ -3557,7 +3505,7 @@ dependencies = [ "hex", "libsqlite3-sys", "paste", - "rand 0.8.5", + "rand", "rand_xoshiro", "serde", "serde_json", @@ -3674,7 +3622,7 @@ dependencies = [ "axum", "dotenvy", "http-body-util", - "rand 0.8.5", + "rand", "regex", "serde", "serde_json", @@ -3751,7 +3699,7 @@ version = "0.9.0-alpha.1" dependencies = [ "color-eyre", "dotenvy", - "rand 0.8.5", + "rand", "rust_decimal", "sqlx", "sqlx-example-postgres-multi-database-accounts", @@ -3766,7 +3714,7 @@ version = "0.1.0" dependencies = [ "argon2 0.5.3", "password-hash 0.5.0", - "rand 0.8.5", + "rand", "serde", "sqlx", "thiserror 1.0.40", @@ -3792,7 +3740,7 @@ version = "0.9.0-alpha.1" dependencies = [ "color-eyre", "dotenvy", - "rand 0.8.5", + "rand", "rust_decimal", "sqlx", "sqlx-example-postgres-multi-tenant-accounts", @@ -3807,7 +3755,7 @@ version = "0.1.0" dependencies = [ "argon2 0.5.3", "password-hash 0.5.0", - "rand 0.8.5", + "rand", "serde", "sqlx", "thiserror 1.0.40", @@ -3965,7 +3913,7 @@ dependencies = [ "generic-array", "log", "percent-encoding", - "rand 0.8.5", + "rand", "rsa", "rust_decimal", "serde", @@ -4007,7 +3955,7 @@ dependencies = [ "md-5", "memchr", "num-bigint", - "rand 0.8.5", + "rand", "rust_decimal", "serde", "serde_json", @@ -4523,14 +4471,12 @@ dependencies = [ [[package]] name = "tracing-opentelemetry" -version = "0.31.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddcf5959f39507d0d04d6413119c04f33b623f4f951ebcbdddddfad2d0623a9c" +checksum = "adbc64cba7137545b8044cb1fe9814f7aacf3c6b5f9b45be8bb5db538befdb26" dependencies = [ "js-sys", - "once_cell", "opentelemetry", - "opentelemetry_sdk", "tracing", "tracing-core", "tracing-subscriber", @@ -4539,9 +4485,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.19" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008" +checksum = "cb7f578e5945fb242538965c2d0b04418d38ec25c79d160cd279bf0731c8d319" dependencies = [ "nu-ansi-term", "sharded-slab", diff --git a/sqlx-core/Cargo.toml b/sqlx-core/Cargo.toml index d6c5631d15..55168bfa23 100644 --- a/sqlx-core/Cargo.toml +++ b/sqlx-core/Cargo.toml @@ -109,8 +109,8 @@ sha2 = { version = "0.10.0", default-features = false, optional = true } #sqlformat = "0.2.0" tokio-stream = { version = "0.1.8", features = ["fs"], optional = true } tracing = { version = "0.1.37", features = ["log"] } -opentelemetry = { version = "0.30", default-features = false, features = ["trace"], optional = true } -tracing-opentelemetry = { version = "0.31", default-features = false, optional = true } +opentelemetry = { version = "0.32", default-features = false, features = ["trace"], optional = true } +tracing-opentelemetry = { version = "0.33", default-features = false, optional = true } smallvec = "1.13.1" url = { version = "2.2.2" } bstr = { version = "1.0.1", default-features = false, features = ["std"], optional = true }