From 7c36bd54f5931944e63c6d202e6832c4ea559947 Mon Sep 17 00:00:00 2001 From: Jade Date: Sun, 17 May 2026 08:35:25 +0000 Subject: [PATCH] chore: Revert 8e9c7c1a3b7ad3877c96aa2f8da7865265e65af2 revert chore(deps): update opentelemetry-rust monorepo to 0.32.0 - multiple otel sdk versions --- Cargo.lock | 61 +++++++++++++++++------------------------------------- Cargo.toml | 6 +++--- 2 files changed, 22 insertions(+), 45 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 849fa44e5..0180722cc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -823,7 +823,7 @@ dependencies = [ "dtor", "hardened_malloc-rs", "log", - "opentelemetry 0.32.0", + "opentelemetry", "opentelemetry-otlp", "opentelemetry_sdk", "parking_lot", @@ -3431,19 +3431,6 @@ 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", -] - -[[package]] -name = "opentelemetry" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0142c63252a9e054e68a4c61a5778f7b14f576274d593f8ce883d191a099682" dependencies = [ "futures-core", "futures-sink", @@ -3455,43 +3442,43 @@ dependencies = [ [[package]] name = "opentelemetry-http" -version = "0.32.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5683015d09e2df236ef005b17f6f196f0d5f6313c4fa43a7b6a53b52776e4331" +checksum = "d7a6d09a73194e6b66df7c8f1b680f156d916a1a942abf2de06823dd02b7855d" dependencies = [ "async-trait", "bytes", "http", - "opentelemetry 0.32.0", - "reqwest 0.13.3", + "opentelemetry", + "reqwest 0.12.28", ] [[package]] name = "opentelemetry-otlp" -version = "0.32.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9966929966d17620d7c316c643ba62631826e10021409357772d5eea84f62c35" +checksum = "1f69cd6acbb9af919df949cd1ec9e5e7fdc2ef15d234b6b795aaa525cc02f71f" dependencies = [ "http", - "opentelemetry 0.32.0", + "opentelemetry", "opentelemetry-http", "opentelemetry-proto", "opentelemetry_sdk", "prost", - "reqwest 0.13.3", + "reqwest 0.12.28", "thiserror", "tokio", "tonic", - "tonic-types", + "tracing", ] [[package]] name = "opentelemetry-proto" -version = "0.32.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56d658ba1faf63f7b9c492cfbe6e0ec365440a16132d3270c1065f7b33f1b638" +checksum = "a7175df06de5eaee9909d4805a3d07e28bb752c34cab57fa9cff549da596b30f" dependencies = [ - "opentelemetry 0.32.0", + "opentelemetry", "opentelemetry_sdk", "prost", "tonic", @@ -3500,16 +3487,15 @@ dependencies = [ [[package]] name = "opentelemetry_sdk" -version = "0.32.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368afaed344110f40b179bb8fbe54bc52d98f9bd2b281799ef32487c2650c956" +checksum = "e14ae4f5991976fd48df6d843de219ca6d31b01daaab2dad5af2badeded372bd" dependencies = [ "futures-channel", "futures-executor", "futures-util", - "opentelemetry 0.32.0", + "opentelemetry", "percent-encoding", - "portable-atomic", "rand 0.9.4", "thiserror", "tokio", @@ -4078,7 +4064,9 @@ checksum = "eddd3ca559203180a307f12d114c268abf583f59b03cb906fd0b3ff8646c1147" dependencies = [ "base64 0.22.1", "bytes", + "futures-channel", "futures-core", + "futures-util", "http", "http-body", "http-body-util", @@ -5538,17 +5526,6 @@ dependencies = [ "tonic", ] -[[package]] -name = "tonic-types" -version = "0.14.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73ab1b02061f83d519bba3caa167f88f261ef05720ab8ebc954ade70de3348e8" -dependencies = [ - "prost", - "prost-types", - "tonic", -] - [[package]] name = "tower" version = "0.5.3" @@ -5689,7 +5666,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ac28f2d093c6c477eaa76b23525478f38de514fa9aeb1285738d4b97a9552fc" dependencies = [ "js-sys", - "opentelemetry 0.31.0", + "opentelemetry", "smallvec", "tracing", "tracing-core", diff --git a/Cargo.toml b/Cargo.toml index 557a5d73a..b7dbb3441 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -404,7 +404,7 @@ default-features = false # optional opentelemetry, performance measurements, flamegraphs, etc for performance measurements and monitoring [workspace.dependencies.opentelemetry] -version = "0.32.0" +version = "0.31.0" [workspace.dependencies.tracing-flame] version = "0.2.0" @@ -413,11 +413,11 @@ version = "0.2.0" version = "0.32.0" [workspace.dependencies.opentelemetry_sdk] -version = "0.32.0" +version = "0.31.0" features = ["rt-tokio"] [workspace.dependencies.opentelemetry-otlp] -version = "0.32.0" +version = "0.31.0" features = ["http", "grpc-tonic", "trace", "logs", "metrics"]