Lightweight coding agent that runs in your terminal
Rust
Limit app-server storage metrics to session directories (#43790)
jifdf522cae16b4
diff --git a/codex-rs/app-server/src/codex_home_metrics.rs b/codex-rs/app-server/src/codex_home_metrics.rsindex 5657e016a7..9bc90050ad 100644--- a/codex-rs/app-server/src/codex_home_metrics.rs+++ b/codex-rs/app-server/src/codex_home_metrics.rs@@ -1,7 +1,8 @@-//! Measures local CODEX_HOME storage once at standalone app-server startup.+//! Measures local session storage once at standalone app-server startup.//!-//! The background scan sums regular-file lengths, without reading file contents or-//! following symlinks. Incomplete scans emit no samples, and shutdown cancels the scan.+//! The background scan only visits sessions and archived_sessions under CODEX_HOME.+//! It sums regular-file lengths without reading file contents or following symlinks.+//! Incomplete scans emit no samples, and shutdown cancels the scan.//! The compression tag reflects the effective startup config, not compression completion.use codex_core::config::Config;@@ -15,7 +16,7 @@ use tokio::task::JoinHandle;use tokio_util::sync::CancellationToken;const SIZE_BYTES_METRIC: &str = "codex.app_server.codex_home.size_bytes";-// Bucket sizes range from 1 MiB through 1 TiB; larger homes use the overflow bucket.+// Bucket sizes range from 1 MiB through 1 TiB; larger directories use the overflow bucket.const SIZE_BYTES_BOUNDARIES: &[f64] = &[1_048_576.0,10_485_760.0,@@ -45,7 +46,6 @@ pub(crate) fn spawn(}};for (directory, bytes) in [- ("codex_home", sizes.codex_home),(SESSIONS_SUBDIR, sizes.sessions),(ARCHIVED_SESSIONS_SUBDIR, sizes.archived_sessions),] {@@ -64,7 +64,6 @@ pub(crate) fn spawn(#[derive(Debug, Default, PartialEq, Eq)]struct DirectorySizes {- codex_home: u64,sessions: u64,archived_sessions: u64,}@@ -73,7 +72,21 @@ fn directory_sizes(codex_home: &Path, shutdown: &CancellationToken) -> io::Resullet sessions = codex_home.join(SESSIONS_SUBDIR);let archived_sessions = codex_home.join(ARCHIVED_SESSIONS_SUBDIR);let mut sizes = DirectorySizes::default();- let mut pending = vec![codex_home.to_path_buf()];+ let mut pending = Vec::new();+ for directory in [&sessions, &archived_sessions] {+ if shutdown.is_cancelled() {+ return Err(io::ErrorKind::Interrupted.into());+ }+ // Inspect the roots without following symlinks, just like entries below them.+ let metadata = match std::fs::symlink_metadata(directory) {+ Ok(metadata) => metadata,+ Err(error) if error.kind() == io::ErrorKind::NotFound => continue,+ Err(error) => return Err(error),+ };+ if metadata.is_dir() {+ pending.push(directory.to_path_buf());+ }+ }while let Some(directory) = pending.pop() {if shutdown.is_cancelled() {return Err(io::ErrorKind::Interrupted.into());@@ -90,7 +103,6 @@ fn directory_sizes(codex_home: &Path, shutdown: &CancellationToken) -> io::Resulpending.push(path);} else if metadata.is_file() {let bytes = metadata.len();- sizes.codex_home = sizes.codex_home.saturating_add(bytes);if path.starts_with(&sessions) {sizes.sessions = sizes.sessions.saturating_add(bytes);} else if path.starts_with(&archived_sessions) {