diff --git a/Cargo.lock b/Cargo.lock index 75b48dbd9f608..96897ebab9563 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5277,7 +5277,7 @@ dependencies = [ "mz-tracing", "mz-transform", "openssl", - "opentelemetry", + "opentelemetry 0.24.0", "prometheus", "prost", "qcell", @@ -6152,8 +6152,8 @@ dependencies = [ "num_cpus", "openssl", "openssl-sys", - "opentelemetry", - "opentelemetry_sdk", + "opentelemetry 0.24.0", + "opentelemetry_sdk 0.31.0", "pin-project", "postgres", "postgres-openssl", @@ -6765,8 +6765,8 @@ dependencies = [ "mz-repr", "mz-service", "mz-tracing", - "opentelemetry", - "opentelemetry_sdk", + "opentelemetry 0.24.0", + "opentelemetry_sdk 0.31.0", "sentry-tracing", "tracing", "tracing-capture", @@ -6850,9 +6850,9 @@ dependencies = [ "num", "num-traits", "openssl", - "opentelemetry", + "opentelemetry 0.24.0", "opentelemetry-otlp", - "opentelemetry_sdk", + "opentelemetry_sdk 0.31.0", "parquet", "paste", "pin-project", @@ -8753,6 +8753,20 @@ dependencies = [ "thiserror 1.0.69", ] +[[package]] +name = "opentelemetry" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b84bcd6ae87133e903af7ef497404dda70c60d0ea14895fc8a5e6722754fc2a0" +dependencies = [ + "futures-core", + "futures-sink", + "js-sys", + "pin-project-lite", + "thiserror 2.0.17", + "tracing", +] + [[package]] name = "opentelemetry-otlp" version = "0.17.0" @@ -8762,9 +8776,9 @@ dependencies = [ "async-trait", "futures-core", "http 1.2.0", - "opentelemetry", + "opentelemetry 0.24.0", "opentelemetry-proto", - "opentelemetry_sdk", + "opentelemetry_sdk 0.24.1", "prost", "thiserror 1.0.69", "tokio", @@ -8777,8 +8791,8 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "30ee9f20bff9c984511a02f082dc8ede839e4a9bf15cc2487c8d6fea5ad850d9" dependencies = [ - "opentelemetry", - "opentelemetry_sdk", + "opentelemetry 0.24.0", + "opentelemetry_sdk 0.24.1", "prost", "tonic", ] @@ -8795,11 +8809,26 @@ dependencies = [ "futures-util", "glob", "once_cell", - "opentelemetry", + "opentelemetry 0.24.0", "percent-encoding", "rand 0.8.5", "serde_json", "thiserror 1.0.69", +] + +[[package]] +name = "opentelemetry_sdk" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14ae4f5991976fd48df6d843de219ca6d31b01daaab2dad5af2badeded372bd" +dependencies = [ + "futures-channel", + "futures-executor", + "futures-util", + "opentelemetry 0.31.0", + "percent-encoding", + "rand 0.9.2", + "thiserror 2.0.17", "tokio", "tokio-stream", ] @@ -12471,8 +12500,8 @@ source = "git+https://github.com/MaterializeInc/tracing-opentelemetry.git#09f0cc dependencies = [ "js-sys", "once_cell", - "opentelemetry", - "opentelemetry_sdk", + "opentelemetry 0.24.0", + "opentelemetry_sdk 0.24.1", "smallvec", "tracing", "tracing-core", diff --git a/src/environmentd/Cargo.toml b/src/environmentd/Cargo.toml index ba90f3f3f0563..a67657a81e780 100644 --- a/src/environmentd/Cargo.toml +++ b/src/environmentd/Cargo.toml @@ -83,7 +83,7 @@ num_cpus = "1.17.0" openssl = { version = "0.10.75", features = ["vendored"] } openssl-sys = { version = "0.9.108", features = ["vendored"] } opentelemetry = { version = "0.24.0", features = ["trace"] } -opentelemetry_sdk = { version = "0.24.1", features = ["rt-tokio"] } +opentelemetry_sdk = { version = "0.31.0", features = ["rt-tokio"] } pin-project = "1.1.10" postgres = { version = "0.19.5", optional = true } postgres-openssl = { version = "0.5.0", optional = true } diff --git a/src/orchestrator-tracing/Cargo.toml b/src/orchestrator-tracing/Cargo.toml index 129ad8fc38874..4cb1edaee6dd0 100644 --- a/src/orchestrator-tracing/Cargo.toml +++ b/src/orchestrator-tracing/Cargo.toml @@ -28,7 +28,7 @@ tracing = { version = "0.1.37" } tracing-capture = { version = "0.1.0", optional = true } tracing-subscriber = { version = "0.3.19", default-features = false } opentelemetry = { version = "0.24.0", features = ["trace"] } -opentelemetry_sdk = { version = "0.24.1", features = ["rt-tokio"] } +opentelemetry_sdk = { version = "0.31.0", features = ["rt-tokio"] } workspace-hack = { version = "0.0.0", path = "../workspace-hack", optional = true } [dev-dependencies] diff --git a/src/ore/Cargo.toml b/src/ore/Cargo.toml index d01d0a31f1a83..f939d961fee1a 100644 --- a/src/ore/Cargo.toml +++ b/src/ore/Cargo.toml @@ -89,7 +89,7 @@ hyper-tls = { version = "0.6.0", optional = true } hyper-util = { version = "0.1.18", optional = true } opentelemetry = { version = "0.24.0", features = ["trace"], optional = true } opentelemetry-otlp = { version = "0.17.0", optional = true } -opentelemetry_sdk = { version = "0.24.1", features = ["rt-tokio"], optional = true } +opentelemetry_sdk = { version = "0.31.0", features = ["rt-tokio"], optional = true } console-subscriber = { version = "0.4.1", optional = true } sentry-tracing = { version = "0.38.1", optional = true } turmoil = { version = "0.7.0", optional = true }