Skip to content

fix: enable TLS for HTTPS OpenTelemetry gRPC endpoints #6170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

fix: enable TLS for HTTPS OpenTelemetry gRPC endpoints #6170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions codex-rs/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions codex-rs/otel/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ opentelemetry-otlp = { workspace = true, features = [
"http-json",
"reqwest",
"reqwest-rustls",
"tls",
"tls-roots",
], optional = true }
opentelemetry-semantic-conventions = { workspace = true }
opentelemetry_sdk = { workspace = true, features = [
Expand Down
23 changes: 20 additions & 3 deletions codex-rs/otel/src/otel_provider.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ use reqwest::header::HeaderName;
use reqwest::header::HeaderValue;
use std::error::Error;
use tonic::metadata::MetadataMap;
use tonic::transport::ClientTlsConfig;
use tonic::transport::Endpoint;
use tracing::debug;

const ENV_ATTRIBUTE: &str = "env";
Expand Down Expand Up @@ -59,12 +61,27 @@ impl OtelProvider {
}
}

let exporter = LogExporter::builder()
let mut exporter_builder = LogExporter::builder()
.with_tonic()
.with_endpoint(endpoint)
.with_metadata(MetadataMap::from_headers(header_map))
.build()?;
.with_metadata(MetadataMap::from_headers(header_map));

// 🔒 SECURITY FIX: Enable TLS for HTTPS endpoints
if endpoint.starts_with("https://") {
let mut tls_config = ClientTlsConfig::new().with_native_roots();

// Robust domain extraction using tonic's Endpoint parser
if let Ok(parsed_endpoint) = Endpoint::from_shared(endpoint.clone()) {
if let Some(uri) = parsed_endpoint.uri().host() {
tls_config = tls_config.domain_name(uri);
}
}

exporter_builder = exporter_builder.with_tls_config(tls_config);
debug!("TLS enabled for HTTPS endpoint: {}", endpoint);
}

let exporter = exporter_builder.build()?;
builder = builder.with_batch_exporter(exporter);
}
OtelExporter::OtlpHttp {
Expand Down