From bc13f939e241f1ff7feab6d9b12868c68574dbe9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Dec 2025 03:24:22 +0000 Subject: [PATCH 1/2] chore(deps): bump tracing-opentelemetry in /codex-rs Bumps [tracing-opentelemetry](https://github.com/tokio-rs/tracing-opentelemetry) from 0.31.0 to 0.32.0. - [Release notes](https://github.com/tokio-rs/tracing-opentelemetry/releases) - [Changelog](https://github.com/tokio-rs/tracing-opentelemetry/blob/v0.1.x/CHANGELOG.md) - [Commits](https://github.com/tokio-rs/tracing-opentelemetry/compare/v0.31.0...v0.32.0) --- updated-dependencies: - dependency-name: tracing-opentelemetry dependency-version: 0.32.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- codex-rs/Cargo.lock | 61 +++++++++++++++++++++++++++++++++------------ codex-rs/Cargo.toml | 2 +- 2 files changed, 46 insertions(+), 17 deletions(-) diff --git a/codex-rs/Cargo.lock b/codex-rs/Cargo.lock index d8b99165e97..d52247a9482 100644 --- a/codex-rs/Cargo.lock +++ b/codex-rs/Cargo.lock @@ -1186,8 +1186,8 @@ dependencies = [ "eventsource-stream", "futures", "http 1.3.1", - "opentelemetry", - "opentelemetry_sdk", + "opentelemetry 0.30.0", + "opentelemetry_sdk 0.30.0", "rand 0.9.2", "reqwest", "serde", @@ -1599,11 +1599,11 @@ dependencies = [ "codex-utils-absolute-path", "eventsource-stream", "http 1.3.1", - "opentelemetry", + "opentelemetry 0.30.0", "opentelemetry-appender-tracing", "opentelemetry-otlp", "opentelemetry-semantic-conventions", - "opentelemetry_sdk", + "opentelemetry_sdk 0.30.0", "reqwest", "serde", "serde_json", @@ -4673,13 +4673,26 @@ dependencies = [ "tracing", ] +[[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", +] + [[package]] name = "opentelemetry-appender-tracing" version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e68f63eca5fad47e570e00e893094fc17be959c80c79a7d6ec1abdd5ae6ffc16" dependencies = [ - "opentelemetry", + "opentelemetry 0.30.0", "tracing", "tracing-core", "tracing-subscriber", @@ -4694,7 +4707,7 @@ dependencies = [ "async-trait", "bytes", "http 1.3.1", - "opentelemetry", + "opentelemetry 0.30.0", "reqwest", ] @@ -4705,10 +4718,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dbee664a43e07615731afc539ca60c6d9f1a9425e25ca09c57bc36c87c55852b" dependencies = [ "http 1.3.1", - "opentelemetry", + "opentelemetry 0.30.0", "opentelemetry-http", "opentelemetry-proto", - "opentelemetry_sdk", + "opentelemetry_sdk 0.30.0", "prost", "reqwest", "serde_json", @@ -4726,8 +4739,8 @@ checksum = "2e046fd7660710fe5a05e8748e70d9058dc15c94ba914e7c4faa7c728f0e8ddc" dependencies = [ "base64", "hex", - "opentelemetry", - "opentelemetry_sdk", + "opentelemetry 0.30.0", + "opentelemetry_sdk 0.30.0", "prost", "serde", "tonic", @@ -4748,7 +4761,7 @@ dependencies = [ "futures-channel", "futures-executor", "futures-util", - "opentelemetry", + "opentelemetry 0.30.0", "percent-encoding", "rand 0.9.2", "serde_json", @@ -4757,6 +4770,21 @@ dependencies = [ "tokio-stream", ] +[[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", +] + [[package]] name = "option-ext" version = "0.2.0" @@ -7228,15 +7256,16 @@ dependencies = [ [[package]] name = "tracing-opentelemetry" -version = "0.31.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddcf5959f39507d0d04d6413119c04f33b623f4f951ebcbdddddfad2d0623a9c" +checksum = "1e6e5658463dd88089aba75c7791e1d3120633b1bfde22478b28f625a9bb1b8e" dependencies = [ "js-sys", - "once_cell", - "opentelemetry", - "opentelemetry_sdk", + "opentelemetry 0.31.0", + "opentelemetry_sdk 0.31.0", + "rustversion", "smallvec", + "thiserror 2.0.17", "tracing", "tracing-core", "tracing-log", diff --git a/codex-rs/Cargo.toml b/codex-rs/Cargo.toml index 20fd10ee9d3..cb979ba22f8 100644 --- a/codex-rs/Cargo.toml +++ b/codex-rs/Cargo.toml @@ -165,7 +165,7 @@ opentelemetry-appender-tracing = "0.30.0" opentelemetry-otlp = "0.30.0" opentelemetry-semantic-conventions = "0.30.0" opentelemetry_sdk = "0.30.0" -tracing-opentelemetry = "0.31.0" +tracing-opentelemetry = "0.32.0" os_info = "3.12.0" owo-colors = "4.2.0" path-absolutize = "3.1.1" From f61a50635404a294355f07b766f065711c40e222 Mon Sep 17 00:00:00 2001 From: Anton Panasenko Date: Fri, 2 Jan 2026 16:10:52 -0800 Subject: [PATCH 2/2] update deps --- codex-rs/Cargo.lock | 156 ++++++++++++++++------------- codex-rs/Cargo.toml | 11 +- codex-rs/otel/Cargo.toml | 5 - codex-rs/otel/src/otel_manager.rs | 2 +- codex-rs/otel/src/otel_provider.rs | 10 +- 5 files changed, 100 insertions(+), 84 deletions(-) diff --git a/codex-rs/Cargo.lock b/codex-rs/Cargo.lock index d52247a9482..01fa48012f3 100644 --- a/codex-rs/Cargo.lock +++ b/codex-rs/Cargo.lock @@ -1186,8 +1186,8 @@ dependencies = [ "eventsource-stream", "futures", "http 1.3.1", - "opentelemetry 0.30.0", - "opentelemetry_sdk 0.30.0", + "opentelemetry", + "opentelemetry_sdk", "rand 0.9.2", "reqwest", "serde", @@ -1599,17 +1599,16 @@ dependencies = [ "codex-utils-absolute-path", "eventsource-stream", "http 1.3.1", - "opentelemetry 0.30.0", + "opentelemetry", "opentelemetry-appender-tracing", "opentelemetry-otlp", "opentelemetry-semantic-conventions", - "opentelemetry_sdk 0.30.0", + "opentelemetry_sdk", "reqwest", "serde", "serde_json", "strum_macros 0.27.2", "tokio", - "tonic", "tracing", "tracing-opentelemetry", "tracing-subscriber", @@ -2026,6 +2025,18 @@ dependencies = [ "windows-sys 0.59.0", ] +[[package]] +name = "const-hex" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bb320cac8a0750d7f25280aa97b09c26edfe161164238ecbbb31092b079e735" +dependencies = [ + "cfg-if", + "cpufeatures", + "proptest", + "serde_core", +] + [[package]] name = "convert_case" version = "0.6.0" @@ -4659,20 +4670,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "opentelemetry" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaf416e4cb72756655126f7dd7bb0af49c674f4c1b9903e80c009e0c37e552e6" -dependencies = [ - "futures-core", - "futures-sink", - "js-sys", - "pin-project-lite", - "thiserror 2.0.17", - "tracing", -] - [[package]] name = "opentelemetry" version = "0.31.0" @@ -4684,15 +4681,16 @@ dependencies = [ "js-sys", "pin-project-lite", "thiserror 2.0.17", + "tracing", ] [[package]] name = "opentelemetry-appender-tracing" -version = "0.30.1" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e68f63eca5fad47e570e00e893094fc17be959c80c79a7d6ec1abdd5ae6ffc16" +checksum = "ef6a1ac5ca3accf562b8c306fa8483c85f4390f768185ab775f242f7fe8fdcc2" dependencies = [ - "opentelemetry 0.30.0", + "opentelemetry", "tracing", "tracing-core", "tracing-subscriber", @@ -4700,28 +4698,28 @@ dependencies = [ [[package]] name = "opentelemetry-http" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f6639e842a97dbea8886e3439710ae463120091e2e064518ba8e716e6ac36d" +checksum = "d7a6d09a73194e6b66df7c8f1b680f156d916a1a942abf2de06823dd02b7855d" dependencies = [ "async-trait", "bytes", "http 1.3.1", - "opentelemetry 0.30.0", + "opentelemetry", "reqwest", ] [[package]] name = "opentelemetry-otlp" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbee664a43e07615731afc539ca60c6d9f1a9425e25ca09c57bc36c87c55852b" +checksum = "7a2366db2dca4d2ad033cad11e6ee42844fd727007af5ad04a1730f4cb8163bf" dependencies = [ "http 1.3.1", - "opentelemetry 0.30.0", + "opentelemetry", "opentelemetry-http", "opentelemetry-proto", - "opentelemetry_sdk 0.30.0", + "opentelemetry_sdk", "prost", "reqwest", "serde_json", @@ -4733,42 +4731,26 @@ dependencies = [ [[package]] name = "opentelemetry-proto" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e046fd7660710fe5a05e8748e70d9058dc15c94ba914e7c4faa7c728f0e8ddc" +checksum = "a7175df06de5eaee9909d4805a3d07e28bb752c34cab57fa9cff549da596b30f" dependencies = [ "base64", - "hex", - "opentelemetry 0.30.0", - "opentelemetry_sdk 0.30.0", + "const-hex", + "opentelemetry", + "opentelemetry_sdk", "prost", "serde", + "serde_json", "tonic", + "tonic-prost", ] [[package]] name = "opentelemetry-semantic-conventions" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83d059a296a47436748557a353c5e6c5705b9470ef6c95cfc52c21a8814ddac2" - -[[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 0.30.0", - "percent-encoding", - "rand 0.9.2", - "serde_json", - "thiserror 2.0.17", - "tokio", - "tokio-stream", -] +checksum = "e62e29dfe041afb8ed2a6c9737ab57db4907285d999ef8ad3a59092a36bdc846" [[package]] name = "opentelemetry_sdk" @@ -4779,10 +4761,12 @@ dependencies = [ "futures-channel", "futures-executor", "futures-util", - "opentelemetry 0.31.0", + "opentelemetry", "percent-encoding", "rand 0.9.2", "thiserror 2.0.17", + "tokio", + "tokio-stream", ] [[package]] @@ -5161,11 +5145,26 @@ dependencies = [ "windows 0.61.3", ] +[[package]] +name = "proptest" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bee689443a2bd0a16ab0348b52ee43e3b2d1b1f931c8aa5c9f8de4c86fbe8c40" +dependencies = [ + "bitflags 2.10.0", + "num-traits", + "rand 0.9.2", + "rand_chacha 0.9.0", + "rand_xorshift", + "regex-syntax 0.8.5", + "unarray", +] + [[package]] name = "prost" -version = "0.13.5" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2796faa41db3ec313a31f7624d9286acf277b52de526150b7e69f3debf891ee5" +checksum = "7231bd9b3d3d33c86b58adbac74b5ec0ad9f496b19d22801d773636feaa95f3d" dependencies = [ "bytes", "prost-derive", @@ -5173,9 +5172,9 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.13.5" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d" +checksum = "9120690fafc389a67ba3803df527d0ec9cbbc9cc45e4cc20b332996dfb672425" dependencies = [ "anyhow", "itertools 0.14.0", @@ -5375,6 +5374,15 @@ dependencies = [ "getrandom 0.3.3", ] +[[package]] +name = "rand_xorshift" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "513962919efc330f829edb2535844d1b912b0fbe2ca165d613e4e8788bb05a5a" +dependencies = [ + "rand_core 0.9.3", +] + [[package]] name = "ratatui" version = "0.29.0" @@ -7110,15 +7118,13 @@ checksum = "ab16f14aed21ee8bfd8ec22513f7287cd4a91aa92e44edfe2c17ddd004e92607" [[package]] name = "tonic" -version = "0.13.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e581ba15a835f4d9ea06c55ab1bd4dce26fc53752c69a04aac00703bfb49ba9" +checksum = "eb7613188ce9f7df5bfe185db26c5814347d110db17920415cf2fbcad85e7203" dependencies = [ "async-trait", - "axum", "base64", "bytes", - "h2", "http 1.3.1", "http-body", "http-body-util", @@ -7127,9 +7133,8 @@ dependencies = [ "hyper-util", "percent-encoding", "pin-project", - "prost", "rustls-native-certs", - "socket2 0.5.10", + "sync_wrapper", "tokio", "tokio-rustls", "tokio-stream", @@ -7139,6 +7144,17 @@ dependencies = [ "tracing", ] +[[package]] +name = "tonic-prost" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66bd50ad6ce1252d87ef024b3d64fe4c3cf54a86fb9ef4c631fdd0ded7aeaa67" +dependencies = [ + "bytes", + "prost", + "tonic", +] + [[package]] name = "tower" version = "0.5.2" @@ -7261,8 +7277,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e6e5658463dd88089aba75c7791e1d3120633b1bfde22478b28f625a9bb1b8e" dependencies = [ "js-sys", - "opentelemetry 0.31.0", - "opentelemetry_sdk 0.31.0", + "opentelemetry", + "opentelemetry_sdk", "rustversion", "smallvec", "thiserror 2.0.17", @@ -7422,6 +7438,12 @@ dependencies = [ "libc", ] +[[package]] +name = "unarray" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" + [[package]] name = "unicase" version = "2.8.1" diff --git a/codex-rs/Cargo.toml b/codex-rs/Cargo.toml index cb979ba22f8..7aca509cc85 100644 --- a/codex-rs/Cargo.toml +++ b/codex-rs/Cargo.toml @@ -160,11 +160,11 @@ notify = "8.2.0" nucleo-matcher = "0.3.1" once_cell = "1.20.2" openssl-sys = "*" -opentelemetry = "0.30.0" -opentelemetry-appender-tracing = "0.30.0" -opentelemetry-otlp = "0.30.0" -opentelemetry-semantic-conventions = "0.30.0" -opentelemetry_sdk = "0.30.0" +opentelemetry = "0.31.0" +opentelemetry-appender-tracing = "0.31.0" +opentelemetry-otlp = "0.31.0" +opentelemetry-semantic-conventions = "0.31.0" +opentelemetry_sdk = "0.31.0" tracing-opentelemetry = "0.32.0" os_info = "3.12.0" owo-colors = "4.2.0" @@ -211,7 +211,6 @@ tokio-test = "0.4" tokio-util = "0.7.16" toml = "0.9.5" toml_edit = "0.24.0" -tonic = "0.13.1" tracing = "0.1.43" tracing-appender = "0.2.3" tracing-subscriber = "0.3.22" diff --git a/codex-rs/otel/Cargo.toml b/codex-rs/otel/Cargo.toml index 8c99326a4c7..a703808e80b 100644 --- a/codex-rs/otel/Cargo.toml +++ b/codex-rs/otel/Cargo.toml @@ -44,11 +44,6 @@ serde = { workspace = true, features = ["derive"] } serde_json = { workspace = true } strum_macros = { workspace = true } tokio = { workspace = true } -tonic = { workspace = true, features = [ - "transport", - "tls-native-roots", - "tls-ring", -] } tracing = { workspace = true } tracing-opentelemetry = { workspace = true } tracing-subscriber = { workspace = true } diff --git a/codex-rs/otel/src/otel_manager.rs b/codex-rs/otel/src/otel_manager.rs index 38d69001cdc..fbdd3227222 100644 --- a/codex-rs/otel/src/otel_manager.rs +++ b/codex-rs/otel/src/otel_manager.rs @@ -70,7 +70,7 @@ impl OtelManager { let session_span = trace_span!("new_session", conversation_id = %conversation_id, session_source = %session_source); if let Some(context) = traceparent_context_from_env() { - session_span.set_parent(context); + let _ = session_span.set_parent(context); } Self { diff --git a/codex-rs/otel/src/otel_provider.rs b/codex-rs/otel/src/otel_provider.rs index b9d95593255..8a777e7fdd8 100644 --- a/codex-rs/otel/src/otel_provider.rs +++ b/codex-rs/otel/src/otel_provider.rs @@ -22,6 +22,10 @@ use opentelemetry_otlp::SpanExporter; use opentelemetry_otlp::WithExportConfig; use opentelemetry_otlp::WithHttpConfig; use opentelemetry_otlp::WithTonicConfig; +use opentelemetry_otlp::tonic_types::metadata::MetadataMap; +use opentelemetry_otlp::tonic_types::transport::Certificate as TonicCertificate; +use opentelemetry_otlp::tonic_types::transport::ClientTlsConfig; +use opentelemetry_otlp::tonic_types::transport::Identity as TonicIdentity; use opentelemetry_sdk::Resource; use opentelemetry_sdk::logs::SdkLoggerProvider; use opentelemetry_sdk::propagation::TraceContextPropagator; @@ -44,10 +48,6 @@ use std::io::{self}; use std::path::PathBuf; use std::sync::OnceLock; use std::time::Duration; -use tonic::metadata::MetadataMap; -use tonic::transport::Certificate as TonicCertificate; -use tonic::transport::ClientTlsConfig; -use tonic::transport::Identity as TonicIdentity; use tracing::debug; use tracing::level_filters::LevelFilter; use tracing::warn; @@ -102,7 +102,7 @@ impl OtelProvider { .map(|provider| provider.tracer(settings.service_name.clone())); if let Some(provider) = tracer_provider.clone() { - let _ = global::set_tracer_provider(provider); + global::set_tracer_provider(provider); global::set_text_map_propagator(TraceContextPropagator::new()); } if tracer.is_some() {