Address review comments

This commit is contained in:
Vishnu Chopra
2025-09-19 14:43:25 -07:00
committed by Anton Panasenko
parent b58de1494c
commit 2d200792d3
4 changed files with 6 additions and 15 deletions
+2 -9
View File
@@ -32,7 +32,6 @@ mod imp {
pub enum TelemetryExporter {
None,
OtlpFile {
path: PathBuf,
rotate_mb: Option<u64>,
},
OtlpGrpc {
@@ -112,10 +111,7 @@ mod imp {
global::set_tracer_provider(provider.clone());
return Some(TelemetryGuard { provider });
}
TelemetryExporter::OtlpFile {
path: _ignored,
rotate_mb,
} => {
TelemetryExporter::OtlpFile { rotate_mb } => {
let final_path = determine_traces_file_path(settings.codex_home.as_ref());
if debug_enabled() {
eprintln!(
@@ -245,10 +241,7 @@ mod imp {
let tracer = provider.tracer(settings.service_name.clone());
return Some((TelemetryGuard { provider }, tracer));
}
TelemetryExporter::OtlpFile {
path: _ignored,
rotate_mb,
} => {
TelemetryExporter::OtlpFile { rotate_mb } => {
let final_path = determine_traces_file_path(settings.codex_home.as_ref());
if debug_enabled() {
eprintln!(
@@ -31,7 +31,6 @@ async fn file_exporter_writes_span_json() {
let (guard, tracer) = telemetry::build_layer(&telemetry::Settings {
enabled: true,
exporter: telemetry::Exporter::OtlpFile {
path: PathBuf::new(),
rotate_mb: Some(100),
},
service_name: "codex-test".to_string(),
@@ -80,7 +79,6 @@ async fn session_span_flushes_on_shutdown() {
let (guard, tracer) = telemetry::build_layer(&telemetry::Settings {
enabled: true,
exporter: telemetry::Exporter::OtlpFile {
path: PathBuf::new(),
rotate_mb: Some(100),
},
service_name: "codex-test".to_string(),
+4 -1
View File
@@ -48,6 +48,9 @@ pub(crate) const PROJECT_DOC_MAX_BYTES: usize = 32 * 1024; // 32 KiB
pub(crate) const CONFIG_TOML_FILE: &str = "config.toml";
/// Default rotation size for telemetry file exporter, in MiB.
pub(crate) const DEFAULT_TELEMETRY_ROTATE_MB: u64 = 100;
/// Application configuration loaded from disk and merged with overrides.
#[derive(Debug, Clone, PartialEq)]
pub struct Config {
@@ -1068,7 +1071,7 @@ impl Config {
let exporter = t.exporter.unwrap_or(TelemetryExporterKind::OtlpFile);
let endpoint = t.endpoint;
let headers = t.headers.unwrap_or_default();
let rotate_mb = t.rotate_mb.or(Some(100));
let rotate_mb = t.rotate_mb.or(Some(DEFAULT_TELEMETRY_ROTATE_MB));
TelemetryConfig {
enabled,
exporter,
-3
View File
@@ -1,5 +1,3 @@
use std::path::PathBuf;
use opentelemetry_sdk::trace::Tracer;
use crate::config::Config;
@@ -17,7 +15,6 @@ pub fn build_otel_layer_from_config(
let exporter = match config.telemetry.exporter {
Kind::None => telemetry::Exporter::None,
Kind::OtlpFile => telemetry::Exporter::OtlpFile {
path: PathBuf::new(),
rotate_mb: config.telemetry.rotate_mb,
},
Kind::OtlpHttp => telemetry::Exporter::OtlpHttp {