openai/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-10-21 17:48:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(deps): address downgrade follow-ups

Browse Source
This commit is contained in:
Anton Panasenko
2026-06-19 07:03:55 +00:00
parent 6ea5291083
commit fdda9aec8c
5 changed files with 57 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
codex-rs/core/src/guardian/metrics.rs
+32 -36
View File
@@ -241,10 +241,10 @@ mod tests {
use codex_protocol::protocol::SessionSource;
use opentelemetry::KeyValue;
use opentelemetry_sdk::metrics::InMemoryMetricExporter;
use opentelemetry_sdk::metrics::data::AggregatedMetrics;
use opentelemetry_sdk::metrics::data::Histogram;
use opentelemetry_sdk::metrics::data::Metric;
use opentelemetry_sdk::metrics::data::MetricData;
use opentelemetry_sdk::metrics::data::ResourceMetrics;
use opentelemetry_sdk::metrics::data::Sum;
use pretty_assertions::assert_eq;
use std::collections::BTreeMap;
@@ -271,9 +271,9 @@ mod tests {
}
fn find_metric<'a>(resource_metrics: &'a ResourceMetrics, name: &str) -> &'a Metric {
for scope_metrics in resource_metrics.scope_metrics() {
for metric in scope_metrics.metrics() {
if metric.name() == name {
for scope_metrics in &resource_metrics.scope_metrics {
for metric in &scope_metrics.metrics {
if metric.name == name {
return metric;
}
}
@@ -294,41 +294,37 @@ mod tests {
name: &str,
) -> (BTreeMap<String, String>, u64) {
let metric = find_metric(resource_metrics, name);
match metric.data() {
AggregatedMetrics::U64(data) => match data {
MetricData::Sum(sum) => {
let points: Vec<_> = sum.data_points().collect();
assert_eq!(points.len(), 1);
let point = points[0];
(attributes_to_map(point.attributes()), point.value())
}
_ => panic!("unexpected counter aggregation"),
},
_ => panic!("unexpected counter data type"),
}
let sum = metric
.data
.as_any()
.downcast_ref::<Sum<u64>>()
.expect("metric should contain a u64 sum");
assert_eq!(sum.data_points.len(), 1);
let point = &sum.data_points[0];
(attributes_to_map(point.attributes.iter()), point.value)
}
fn histogram_sums(resource_metrics: &ResourceMetrics, name: &str) -> BTreeMap<String, u64> {
let metric = find_metric(resource_metrics, name);
match metric.data() {
AggregatedMetrics::F64(data) => match data {
MetricData::Histogram(histogram) => histogram
.data_points()
.map(|point| {
let attrs = attributes_to_map(point.attributes());
(
attrs
.get("token_type")
.cloned()
.unwrap_or_else(|| "sample".to_string()),
point.sum() as u64,
)
})
.collect(),
_ => panic!("unexpected histogram aggregation"),
},
_ => panic!("unexpected histogram data type"),
}
let histogram = metric
.data
.as_any()
.downcast_ref::<Histogram<f64>>()
.expect("metric should contain an f64 histogram");
histogram
.data_points
.iter()
.map(|point| {
let attrs = attributes_to_map(point.attributes.iter());
(
attrs
.get("token_type")
.cloned()
.unwrap_or_else(|| "sample".to_string()),
point.sum as u64,
)
})
.collect()
}
#[test]
codex-rs/core/src/session/tests.rs
+11 -16
View File
@@ -159,9 +159,8 @@ use core_test_support::wait_for_event;
use opentelemetry::trace::TraceContextExt;
use opentelemetry::trace::TraceId;
use opentelemetry_sdk::metrics::InMemoryMetricExporter;
use opentelemetry_sdk::metrics::data::AggregatedMetrics;
use opentelemetry_sdk::metrics::data::Histogram;
use opentelemetry_sdk::metrics::data::Metric;
use opentelemetry_sdk::metrics::data::MetricData;
use opentelemetry_sdk::metrics::data::ResourceMetrics;
use std::path::Path;
use std::time::Duration;
@@ -255,9 +254,9 @@ fn test_session_telemetry_without_metadata() -> SessionTelemetry {
}
fn find_metric<'a>(resource_metrics: &'a ResourceMetrics, name: &str) -> &'a Metric {
for scope_metrics in resource_metrics.scope_metrics() {
for metric in scope_metrics.metrics() {
if metric.name() == name {
for scope_metrics in &resource_metrics.scope_metrics {
for metric in &scope_metrics.metrics {
if metric.name == name {
return metric;
}
}
@@ -267,17 +266,13 @@ fn find_metric<'a>(resource_metrics: &'a ResourceMetrics, name: &str) -> &'a Met
fn histogram_sum(resource_metrics: &ResourceMetrics, name: &str) -> u64 {
let metric = find_metric(resource_metrics, name);
match metric.data() {
AggregatedMetrics::F64(data) => match data {
MetricData::Histogram(histogram) => {
let points: Vec<_> = histogram.data_points().collect();
assert_eq!(points.len(), 1);
points[0].sum().round() as u64
}
_ => panic!("unexpected histogram aggregation"),
},
_ => panic!("unexpected metric data type"),
}
let histogram = metric
.data
.as_any()
.downcast_ref::<Histogram<f64>>()
.expect("metric should contain an f64 histogram");
assert_eq!(histogram.data_points.len(), 1);
histogram.data_points[0].sum.round() as u64
}
fn skill_message(text: &str) -> ResponseItem {
codex-rs/core/src/tasks/mod_tests.rs
+12 -17
View File
@@ -11,10 +11,9 @@ use codex_protocol::ThreadId;
use codex_protocol::protocol::SessionSource;
use opentelemetry::KeyValue;
use opentelemetry_sdk::metrics::InMemoryMetricExporter;
use opentelemetry_sdk::metrics::data::AggregatedMetrics;
use opentelemetry_sdk::metrics::data::Metric;
use opentelemetry_sdk::metrics::data::MetricData;
use opentelemetry_sdk::metrics::data::ResourceMetrics;
use opentelemetry_sdk::metrics::data::Sum;
use pretty_assertions::assert_eq;
use std::collections::BTreeMap;
@@ -41,9 +40,9 @@ fn test_session_telemetry() -> SessionTelemetry {
}
fn find_metric<'a>(resource_metrics: &'a ResourceMetrics, name: &str) -> &'a Metric {
for scope_metrics in resource_metrics.scope_metrics() {
for metric in scope_metrics.metrics() {
if metric.name() == name {
for scope_metrics in &resource_metrics.scope_metrics {
for metric in &scope_metrics.metrics {
if metric.name == name {
return metric;
}
}
@@ -61,18 +60,14 @@ fn attributes_to_map<'a>(
fn metric_point(resource_metrics: &ResourceMetrics, name: &str) -> (BTreeMap<String, String>, u64) {
let metric = find_metric(resource_metrics, name);
match metric.data() {
AggregatedMetrics::U64(data) => match data {
MetricData::Sum(sum) => {
let points: Vec<_> = sum.data_points().collect();
assert_eq!(points.len(), 1);
let point = points[0];
(attributes_to_map(point.attributes()), point.value())
}
_ => panic!("unexpected counter aggregation"),
},
_ => panic!("unexpected counter data type"),
}
let sum = metric
.data
.as_any()
.downcast_ref::<Sum<u64>>()
.expect("metric should contain a u64 sum");
assert_eq!(sum.data_points.len(), 1);
let point = &sum.data_points[0];
(attributes_to_map(point.attributes.iter()), point.value)
}
#[test]
codex-rs/deny.toml
+1
View File
@@ -72,6 +72,7 @@ feature-depth = 1
ignore = [
# Reviewed 2026-06-07. Keep this list in sync with .cargo/audit.toml.
# Each exception must identify the dependency path and removal condition.
{ id = "RUSTSEC-2025-0134", reason = "rustls-pemfile is unmaintained; pulled in by tonic v0.12.3, required to match the monorepo Tonic version; remove when the shared Tonic version no longer depends on rustls-pemfile" },
{ id = "RUSTSEC-2024-0388", reason = "derivative is unmaintained; pulled in via starlark/starlark_syntax v0.14.2 used by execpolicy/cli/core; no fixed starlark release yet" },
{ id = "RUSTSEC-2025-0057", reason = "fxhash is unmaintained; pulled in via starlark_map under starlark v0.14.2 used by execpolicy/cli/core and bm25 used by core; remove when upstream dependencies drop fxhash" },
{ id = "RUSTSEC-2024-0436", reason = "paste is unmaintained; pulled in via ratatui/rmcp/starlark used by tui/execpolicy; no fixed release yet" },
codex-rs/otel/src/trace_context.rs
+1 -1
View File
@@ -85,7 +85,7 @@ pub fn set_parent_from_w3c_trace_context(span: &Span, trace: &W3cTraceContext) -
}
pub fn set_parent_from_context(span: &Span, context: Context) {
let _ = span.set_parent(context);
span.set_parent(context);
}
pub fn traceparent_context_from_env() -> Option<Context> {