mirror of
https://github.com/openai/codex.git
synced 2026-09-05 15:18:41 +00:00
## Summary - Record bounded connection, request, and process lifecycle metrics. - Report active gauges from callbacks on every collection, including delta exports. - Serialize active-count updates so concurrent starts and finishes cannot publish stale values. - Serialize process exit, explicit termination, and shutdown through the process registry so exactly one completion result wins. - Keep the implementation small with single-owner RAII guards and one real OTLP/HTTP integration test using the existing `wiremock` dependency. ## Root cause Process exit and session shutdown previously used cloned completion state. That avoided duplicate emission, but it duplicated lifecycle ownership and made the ordering harder to reason about. The process registry mutex already defines the lifecycle ordering, so the final implementation stores the metric guard and termination flag directly on the process entry. Whichever path claims the entry first owns the completion result. Production metric export uses delta temporality. Event-only synchronous gauge recordings disappear after the next collection when no count changes, so active counts now use observable callbacks that report current state on every collection. The cleanup also removes the constant `result="accepted"` connection tag, redundant route and response assertions, a custom HTTP collector, and fallback initialization machinery that did not add behavior. ## Stack Review and land this stack in order: 1. #27466 — trace exec-server JSON-RPC requests 2. #27467 — record bounded connection, request, and process lifecycle metrics **(this PR)** 3. #27470 — observe remote registration and Noise rendezvous lifecycle ## Validation - `just test -p codex-exec-server --lib` (158 passed) - `just test -p codex-cli --test exec_server` (3 passed) - `just test -p codex-otel observable_gauge_is_collected_on_every_delta_snapshot` (1 passed) - `CARGO_BUILD_JOBS=1 just fix -p codex-otel -p codex-exec-server` - `just fmt` - `git diff --check`
271 lines
8.5 KiB
Rust
271 lines
8.5 KiB
Rust
use std::collections::HashMap;
|
|
use std::sync::Arc;
|
|
use std::sync::Mutex as StdMutex;
|
|
use std::time::Duration;
|
|
|
|
use codex_exec_server_protocol::JSONRPCErrorError;
|
|
use tokio::sync::Mutex;
|
|
use uuid::Uuid;
|
|
|
|
use crate::ExecServerRuntimePaths;
|
|
use crate::rpc::RpcNotificationSender;
|
|
use crate::rpc::invalid_request;
|
|
use crate::rpc::session_already_attached;
|
|
use crate::server::process_handler::ProcessHandler;
|
|
use crate::telemetry::ExecServerTelemetry;
|
|
|
|
#[cfg(test)]
|
|
const DETACHED_SESSION_TTL: Duration = Duration::from_millis(200);
|
|
#[cfg(not(test))]
|
|
const DETACHED_SESSION_TTL: Duration = Duration::from_secs(30);
|
|
|
|
pub(crate) struct SessionRegistry {
|
|
sessions: Mutex<HashMap<String, Arc<SessionEntry>>>,
|
|
telemetry: ExecServerTelemetry,
|
|
}
|
|
|
|
struct SessionEntry {
|
|
session_id: String,
|
|
process: ProcessHandler,
|
|
attachment: StdMutex<AttachmentState>,
|
|
}
|
|
|
|
struct AttachmentState {
|
|
current_connection_id: Option<ConnectionId>,
|
|
detached_connection_id: Option<ConnectionId>,
|
|
detached_expires_at: Option<tokio::time::Instant>,
|
|
}
|
|
|
|
#[derive(Clone, Copy, Debug, Eq, PartialEq)]
|
|
struct ConnectionId(Uuid);
|
|
|
|
impl std::fmt::Display for ConnectionId {
|
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
|
self.0.fmt(f)
|
|
}
|
|
}
|
|
|
|
#[derive(Clone)]
|
|
pub(crate) struct SessionHandle {
|
|
registry: Arc<SessionRegistry>,
|
|
entry: Arc<SessionEntry>,
|
|
connection_id: ConnectionId,
|
|
}
|
|
|
|
impl SessionRegistry {
|
|
pub(crate) fn new(telemetry: ExecServerTelemetry) -> Arc<Self> {
|
|
Arc::new(Self {
|
|
sessions: Mutex::new(HashMap::new()),
|
|
telemetry,
|
|
})
|
|
}
|
|
|
|
pub(crate) async fn attach(
|
|
self: &Arc<Self>,
|
|
resume_session_id: Option<String>,
|
|
notifications: RpcNotificationSender,
|
|
runtime_paths: ExecServerRuntimePaths,
|
|
) -> Result<SessionHandle, JSONRPCErrorError> {
|
|
enum AttachOutcome {
|
|
Attached(Arc<SessionEntry>),
|
|
Expired {
|
|
session_id: String,
|
|
entry: Arc<SessionEntry>,
|
|
},
|
|
}
|
|
|
|
let connection_id = ConnectionId(Uuid::new_v4());
|
|
let outcome = {
|
|
let mut sessions = self.sessions.lock().await;
|
|
if let Some(session_id) = resume_session_id {
|
|
let entry = sessions
|
|
.get(&session_id)
|
|
.cloned()
|
|
.ok_or_else(|| invalid_request(format!("unknown session id {session_id}")))?;
|
|
if entry.is_expired(tokio::time::Instant::now()) {
|
|
let entry = sessions.remove(&session_id).ok_or_else(|| {
|
|
invalid_request(format!("unknown session id {session_id}"))
|
|
})?;
|
|
Ok(AttachOutcome::Expired { session_id, entry })
|
|
} else if entry.has_active_connection() {
|
|
Err(session_already_attached(format!(
|
|
"session {session_id} is already attached to another connection"
|
|
)))
|
|
} else {
|
|
entry.process.set_notification_sender(Some(notifications));
|
|
entry.attach(connection_id);
|
|
Ok(AttachOutcome::Attached(entry))
|
|
}
|
|
} else {
|
|
let session_id = Uuid::new_v4().to_string();
|
|
let entry = Arc::new(SessionEntry::new(
|
|
session_id.clone(),
|
|
ProcessHandler::new(notifications, self.telemetry.clone(), runtime_paths),
|
|
connection_id,
|
|
));
|
|
sessions.insert(session_id, Arc::clone(&entry));
|
|
Ok(AttachOutcome::Attached(entry))
|
|
}
|
|
};
|
|
let entry = match outcome? {
|
|
AttachOutcome::Attached(entry) => entry,
|
|
AttachOutcome::Expired { session_id, entry } => {
|
|
entry.process.shutdown().await;
|
|
return Err(invalid_request(format!("unknown session id {session_id}")));
|
|
}
|
|
};
|
|
|
|
Ok(SessionHandle {
|
|
registry: Arc::clone(self),
|
|
entry,
|
|
connection_id,
|
|
})
|
|
}
|
|
|
|
pub(crate) async fn shutdown(&self) {
|
|
let sessions = std::mem::take(&mut *self.sessions.lock().await);
|
|
for entry in sessions.into_values() {
|
|
entry.process.shutdown().await;
|
|
}
|
|
}
|
|
|
|
async fn expire_if_detached(&self, session_id: String, connection_id: ConnectionId) {
|
|
tokio::time::sleep(DETACHED_SESSION_TTL).await;
|
|
|
|
let removed = {
|
|
let mut sessions = self.sessions.lock().await;
|
|
let Some(entry) = sessions.get(&session_id) else {
|
|
return;
|
|
};
|
|
if !entry.is_detached_connection_expired(connection_id, tokio::time::Instant::now()) {
|
|
return;
|
|
}
|
|
sessions.remove(&session_id)
|
|
};
|
|
|
|
if let Some(entry) = removed {
|
|
entry.process.shutdown().await;
|
|
}
|
|
}
|
|
}
|
|
|
|
impl Default for SessionRegistry {
|
|
fn default() -> Self {
|
|
Self {
|
|
sessions: Mutex::new(HashMap::new()),
|
|
telemetry: ExecServerTelemetry::default(),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl SessionEntry {
|
|
fn new(session_id: String, process: ProcessHandler, connection_id: ConnectionId) -> Self {
|
|
Self {
|
|
session_id,
|
|
process,
|
|
attachment: StdMutex::new(AttachmentState {
|
|
current_connection_id: Some(connection_id),
|
|
detached_connection_id: None,
|
|
detached_expires_at: None,
|
|
}),
|
|
}
|
|
}
|
|
|
|
fn attach(&self, connection_id: ConnectionId) {
|
|
let mut attachment = self
|
|
.attachment
|
|
.lock()
|
|
.unwrap_or_else(std::sync::PoisonError::into_inner);
|
|
attachment.current_connection_id = Some(connection_id);
|
|
attachment.detached_connection_id = None;
|
|
attachment.detached_expires_at = None;
|
|
}
|
|
|
|
fn detach(&self, connection_id: ConnectionId) -> bool {
|
|
let mut attachment = self
|
|
.attachment
|
|
.lock()
|
|
.unwrap_or_else(std::sync::PoisonError::into_inner);
|
|
if attachment.current_connection_id != Some(connection_id) {
|
|
return false;
|
|
}
|
|
|
|
self.process.set_notification_sender(/*notifications*/ None);
|
|
attachment.current_connection_id = None;
|
|
attachment.detached_connection_id = Some(connection_id);
|
|
attachment.detached_expires_at = Some(tokio::time::Instant::now() + DETACHED_SESSION_TTL);
|
|
true
|
|
}
|
|
|
|
fn has_active_connection(&self) -> bool {
|
|
self.attachment
|
|
.lock()
|
|
.unwrap_or_else(std::sync::PoisonError::into_inner)
|
|
.current_connection_id
|
|
.is_some()
|
|
}
|
|
|
|
fn is_attached_to(&self, connection_id: ConnectionId) -> bool {
|
|
self.attachment
|
|
.lock()
|
|
.unwrap_or_else(std::sync::PoisonError::into_inner)
|
|
.current_connection_id
|
|
== Some(connection_id)
|
|
}
|
|
|
|
fn is_expired(&self, now: tokio::time::Instant) -> bool {
|
|
self.attachment
|
|
.lock()
|
|
.unwrap_or_else(std::sync::PoisonError::into_inner)
|
|
.detached_expires_at
|
|
.is_some_and(|deadline| now >= deadline)
|
|
}
|
|
|
|
fn is_detached_connection_expired(
|
|
&self,
|
|
connection_id: ConnectionId,
|
|
now: tokio::time::Instant,
|
|
) -> bool {
|
|
let attachment = self
|
|
.attachment
|
|
.lock()
|
|
.unwrap_or_else(std::sync::PoisonError::into_inner);
|
|
attachment.current_connection_id.is_none()
|
|
&& attachment.detached_connection_id == Some(connection_id)
|
|
&& attachment
|
|
.detached_expires_at
|
|
.is_some_and(|deadline| now >= deadline)
|
|
}
|
|
}
|
|
|
|
impl SessionHandle {
|
|
pub(crate) fn session_id(&self) -> &str {
|
|
&self.entry.session_id
|
|
}
|
|
|
|
pub(crate) fn connection_id(&self) -> String {
|
|
self.connection_id.to_string()
|
|
}
|
|
|
|
pub(crate) fn is_session_attached(&self) -> bool {
|
|
self.entry.is_attached_to(self.connection_id)
|
|
}
|
|
|
|
pub(crate) fn process(&self) -> &ProcessHandler {
|
|
&self.entry.process
|
|
}
|
|
|
|
pub(crate) async fn detach(&self) {
|
|
if !self.entry.detach(self.connection_id) {
|
|
return;
|
|
}
|
|
|
|
let registry = Arc::clone(&self.registry);
|
|
let session_id = self.entry.session_id.clone();
|
|
let connection_id = self.connection_id;
|
|
tokio::spawn(async move {
|
|
registry.expire_if_detached(session_id, connection_id).await;
|
|
});
|
|
}
|
|
}
|