mirror of
https://github.com/pchuan98/codex.git
synced 2026-07-01 00:31:56 +08:00
jif-oaiandGitHub
08504e86fb
## Why `core/src/goals.rs` already emits OTEL metrics for goal creation, resume, terminal transitions, token counts, and duration. As `/goal` moves into `ext/goal`, the extension needs to preserve that telemetry contract instead of only emitting app-visible `ThreadGoalUpdated` events. This keeps the existing `codex.goal.*` metric surface intact while goal lifecycle ownership shifts toward the extension. ## What changed - Added an extension-local `GoalMetrics` helper that records the existing `codex.goal.*` counters and histograms through `codex-otel`. - Threaded an optional `MetricsClient` through `install_with_backend`, `GoalExtension`, `GoalRuntimeHandle`, and `GoalToolExecutor`. - Emitted created, resumed, and terminal goal metrics from the extension paths that create goals, restore active goals on thread resume, account budget limits, complete or block goals, and handle external goal mutations. - Updated existing goal extension test setup callsites to pass `None` for metrics when instrumentation is not under test. ## Verification Not run locally.
85 lines
2.9 KiB
Rust
85 lines
2.9 KiB
Rust
use codex_otel::GOAL_BLOCKED_METRIC;
|
|
use codex_otel::GOAL_BUDGET_LIMITED_METRIC;
|
|
use codex_otel::GOAL_COMPLETED_METRIC;
|
|
use codex_otel::GOAL_CREATED_METRIC;
|
|
use codex_otel::GOAL_DURATION_SECONDS_METRIC;
|
|
use codex_otel::GOAL_RESUMED_METRIC;
|
|
use codex_otel::GOAL_TOKEN_COUNT_METRIC;
|
|
use codex_otel::GOAL_USAGE_LIMITED_METRIC;
|
|
use codex_otel::MetricsClient;
|
|
|
|
#[derive(Clone, Default)]
|
|
pub(crate) struct GoalMetrics {
|
|
metrics_client: Option<MetricsClient>,
|
|
}
|
|
|
|
impl GoalMetrics {
|
|
pub(crate) fn new(metrics_client: Option<MetricsClient>) -> Self {
|
|
Self { metrics_client }
|
|
}
|
|
|
|
pub(crate) fn record_created(&self) {
|
|
let Some(metrics_client) = self.metrics_client.as_ref() else {
|
|
return;
|
|
};
|
|
let _ = metrics_client.counter(GOAL_CREATED_METRIC, /*inc*/ 1, &[]);
|
|
}
|
|
|
|
pub(crate) fn record_resumed(&self) {
|
|
let Some(metrics_client) = self.metrics_client.as_ref() else {
|
|
return;
|
|
};
|
|
let _ = metrics_client.counter(GOAL_RESUMED_METRIC, /*inc*/ 1, &[]);
|
|
}
|
|
|
|
pub(crate) fn record_resumed_if_status_changed(
|
|
&self,
|
|
previous_status: Option<codex_state::ThreadGoalStatus>,
|
|
goal_status: codex_state::ThreadGoalStatus,
|
|
) {
|
|
if goal_status == codex_state::ThreadGoalStatus::Active
|
|
&& matches!(
|
|
previous_status,
|
|
Some(
|
|
codex_state::ThreadGoalStatus::Paused
|
|
| codex_state::ThreadGoalStatus::Blocked
|
|
| codex_state::ThreadGoalStatus::UsageLimited
|
|
)
|
|
)
|
|
{
|
|
self.record_resumed();
|
|
}
|
|
}
|
|
|
|
pub(crate) fn record_terminal_if_status_changed(
|
|
&self,
|
|
previous_status: Option<codex_state::ThreadGoalStatus>,
|
|
goal: &codex_state::ThreadGoal,
|
|
) {
|
|
if previous_status == Some(goal.status) {
|
|
return;
|
|
}
|
|
|
|
let counter = match goal.status {
|
|
codex_state::ThreadGoalStatus::Blocked => GOAL_BLOCKED_METRIC,
|
|
codex_state::ThreadGoalStatus::UsageLimited => GOAL_USAGE_LIMITED_METRIC,
|
|
codex_state::ThreadGoalStatus::BudgetLimited => GOAL_BUDGET_LIMITED_METRIC,
|
|
codex_state::ThreadGoalStatus::Complete => GOAL_COMPLETED_METRIC,
|
|
codex_state::ThreadGoalStatus::Active | codex_state::ThreadGoalStatus::Paused => {
|
|
return;
|
|
}
|
|
};
|
|
let Some(metrics_client) = self.metrics_client.as_ref() else {
|
|
return;
|
|
};
|
|
let status_tag = [("status", goal.status.as_str())];
|
|
let _ = metrics_client.counter(counter, /*inc*/ 1, &[]);
|
|
let _ = metrics_client.histogram(GOAL_TOKEN_COUNT_METRIC, goal.tokens_used, &status_tag);
|
|
let _ = metrics_client.histogram(
|
|
GOAL_DURATION_SECONDS_METRIC,
|
|
goal.time_used_seconds,
|
|
&status_tag,
|
|
);
|
|
}
|
|
}
|