Skip to content

Commit c003ce9

Browse files
update deps
1 parent bc13f93 commit c003ce9

File tree

5 files changed

+100
-83
lines changed

5 files changed

+100
-83
lines changed

codex-rs/Cargo.lock

Lines changed: 89 additions & 67 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

codex-rs/Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -160,11 +160,11 @@ notify = "8.2.0"
160160
nucleo-matcher = "0.3.1"
161161
once_cell = "1.20.2"
162162
openssl-sys = "*"
163-
opentelemetry = "0.30.0"
164-
opentelemetry-appender-tracing = "0.30.0"
165-
opentelemetry-otlp = "0.30.0"
166-
opentelemetry-semantic-conventions = "0.30.0"
167-
opentelemetry_sdk = "0.30.0"
163+
opentelemetry = "0.31.0"
164+
opentelemetry-appender-tracing = "0.31.0"
165+
opentelemetry-otlp = "0.31.0"
166+
opentelemetry-semantic-conventions = "0.31.0"
167+
opentelemetry_sdk = "0.31.0"
168168
tracing-opentelemetry = "0.32.0"
169169
os_info = "3.12.0"
170170
owo-colors = "4.2.0"

codex-rs/otel/Cargo.toml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,6 @@ serde = { workspace = true, features = ["derive"] }
4444
serde_json = { workspace = true }
4545
strum_macros = { workspace = true }
4646
tokio = { workspace = true }
47-
tonic = { workspace = true, features = [
48-
"transport",
49-
"tls-native-roots",
50-
"tls-ring",
51-
] }
5247
tracing = { workspace = true }
5348
tracing-opentelemetry = { workspace = true }
5449
tracing-subscriber = { workspace = true }

codex-rs/otel/src/otel_manager.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ impl OtelManager {
7070
let session_span = trace_span!("new_session", conversation_id = %conversation_id, session_source = %session_source);
7171

7272
if let Some(context) = traceparent_context_from_env() {
73-
session_span.set_parent(context);
73+
let _ = session_span.set_parent(context);
7474
}
7575

7676
Self {

codex-rs/otel/src/otel_provider.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ use opentelemetry_otlp::SpanExporter;
2222
use opentelemetry_otlp::WithExportConfig;
2323
use opentelemetry_otlp::WithHttpConfig;
2424
use opentelemetry_otlp::WithTonicConfig;
25+
use opentelemetry_otlp::tonic_types::metadata::MetadataMap;
26+
use opentelemetry_otlp::tonic_types::transport::Certificate as TonicCertificate;
27+
use opentelemetry_otlp::tonic_types::transport::ClientTlsConfig;
28+
use opentelemetry_otlp::tonic_types::transport::Identity as TonicIdentity;
2529
use opentelemetry_sdk::Resource;
2630
use opentelemetry_sdk::logs::SdkLoggerProvider;
2731
use opentelemetry_sdk::propagation::TraceContextPropagator;
@@ -44,10 +48,6 @@ use std::io::{self};
4448
use std::path::PathBuf;
4549
use std::sync::OnceLock;
4650
use std::time::Duration;
47-
use tonic::metadata::MetadataMap;
48-
use tonic::transport::Certificate as TonicCertificate;
49-
use tonic::transport::ClientTlsConfig;
50-
use tonic::transport::Identity as TonicIdentity;
5151
use tracing::debug;
5252
use tracing::level_filters::LevelFilter;
5353
use tracing::warn;
@@ -102,7 +102,7 @@ impl OtelProvider {
102102
.map(|provider| provider.tracer(settings.service_name.clone()));
103103

104104
if let Some(provider) = tracer_provider.clone() {
105-
let _ = global::set_tracer_provider(provider);
105+
global::set_tracer_provider(provider);
106106
global::set_text_map_propagator(TraceContextPropagator::new());
107107
}
108108
if tracer.is_some() {

0 commit comments

Comments
 (0)