295 lines
7.9 KiB
Rust
295 lines
7.9 KiB
Rust
use std::collections::VecDeque;
|
|
use std::fs;
|
|
use std::io::Write;
|
|
use std::io::{self};
|
|
use std::path::PathBuf;
|
|
use std::sync::Arc;
|
|
use std::sync::Mutex;
|
|
use std::time::Duration;
|
|
|
|
use anyhow::Result;
|
|
use anyhow::anyhow;
|
|
use codex_protocol::ConversationId;
|
|
use tracing_subscriber::fmt::writer::MakeWriter;
|
|
|
|
const DEFAULT_MAX_BYTES: usize = 4 * 1024 * 1024; // 4 MiB
|
|
const SENTRY_DSN: &str =
|
|
"https://ae32ed50620d7a7792c1ce5df38b3e3e@o33249.ingest.us.sentry.io/4510195390611458";
|
|
const UPLOAD_TIMEOUT_SECS: u64 = 10;
|
|
|
|
#[derive(Clone)]
|
|
pub struct CodexFeedback {
|
|
inner: Arc<FeedbackInner>,
|
|
}
|
|
|
|
impl Default for CodexFeedback {
|
|
fn default() -> Self {
|
|
Self::new()
|
|
}
|
|
}
|
|
|
|
impl CodexFeedback {
|
|
pub fn new() -> Self {
|
|
Self::with_capacity(DEFAULT_MAX_BYTES)
|
|
}
|
|
|
|
pub(crate) fn with_capacity(max_bytes: usize) -> Self {
|
|
Self {
|
|
inner: Arc::new(FeedbackInner::new(max_bytes)),
|
|
}
|
|
}
|
|
|
|
pub fn make_writer(&self) -> FeedbackMakeWriter {
|
|
FeedbackMakeWriter {
|
|
inner: self.inner.clone(),
|
|
}
|
|
}
|
|
|
|
pub fn snapshot(&self, session_id: Option<ConversationId>) -> CodexLogSnapshot {
|
|
let bytes = {
|
|
let guard = self.inner.ring.lock().expect("mutex poisoned");
|
|
guard.snapshot_bytes()
|
|
};
|
|
CodexLogSnapshot {
|
|
bytes,
|
|
thread_id: session_id
|
|
.map(|id| id.to_string())
|
|
.unwrap_or("no-active-thread-".to_string() + &ConversationId::new().to_string()),
|
|
}
|
|
}
|
|
}
|
|
|
|
struct FeedbackInner {
|
|
ring: Mutex<RingBuffer>,
|
|
}
|
|
|
|
impl FeedbackInner {
|
|
fn new(max_bytes: usize) -> Self {
|
|
Self {
|
|
ring: Mutex::new(RingBuffer::new(max_bytes)),
|
|
}
|
|
}
|
|
}
|
|
|
|
#[derive(Clone)]
|
|
pub struct FeedbackMakeWriter {
|
|
inner: Arc<FeedbackInner>,
|
|
}
|
|
|
|
impl<'a> MakeWriter<'a> for FeedbackMakeWriter {
|
|
type Writer = FeedbackWriter;
|
|
|
|
fn make_writer(&'a self) -> Self::Writer {
|
|
FeedbackWriter {
|
|
inner: self.inner.clone(),
|
|
}
|
|
}
|
|
}
|
|
|
|
pub struct FeedbackWriter {
|
|
inner: Arc<FeedbackInner>,
|
|
}
|
|
|
|
impl Write for FeedbackWriter {
|
|
fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
|
|
let mut guard = self.inner.ring.lock().map_err(|_| io::ErrorKind::Other)?;
|
|
guard.push_bytes(buf);
|
|
Ok(buf.len())
|
|
}
|
|
|
|
fn flush(&mut self) -> io::Result<()> {
|
|
Ok(())
|
|
}
|
|
}
|
|
|
|
struct RingBuffer {
|
|
max: usize,
|
|
buf: VecDeque<u8>,
|
|
}
|
|
|
|
impl RingBuffer {
|
|
fn new(capacity: usize) -> Self {
|
|
Self {
|
|
max: capacity,
|
|
buf: VecDeque::with_capacity(capacity),
|
|
}
|
|
}
|
|
|
|
fn len(&self) -> usize {
|
|
self.buf.len()
|
|
}
|
|
|
|
fn push_bytes(&mut self, data: &[u8]) {
|
|
if data.is_empty() {
|
|
return;
|
|
}
|
|
|
|
// If the incoming chunk is larger than capacity, keep only the trailing bytes.
|
|
if data.len() >= self.max {
|
|
self.buf.clear();
|
|
let start = data.len() - self.max;
|
|
self.buf.extend(data[start..].iter().copied());
|
|
return;
|
|
}
|
|
|
|
// Evict from the front if we would exceed capacity.
|
|
let needed = self.len() + data.len();
|
|
if needed > self.max {
|
|
let to_drop = needed - self.max;
|
|
for _ in 0..to_drop {
|
|
let _ = self.buf.pop_front();
|
|
}
|
|
}
|
|
|
|
self.buf.extend(data.iter().copied());
|
|
}
|
|
|
|
fn snapshot_bytes(&self) -> Vec<u8> {
|
|
self.buf.iter().copied().collect()
|
|
}
|
|
}
|
|
|
|
pub struct CodexLogSnapshot {
|
|
bytes: Vec<u8>,
|
|
pub thread_id: String,
|
|
}
|
|
|
|
impl CodexLogSnapshot {
|
|
pub(crate) fn as_bytes(&self) -> &[u8] {
|
|
&self.bytes
|
|
}
|
|
|
|
pub fn save_to_temp_file(&self) -> io::Result<PathBuf> {
|
|
let dir = std::env::temp_dir();
|
|
let filename = format!("codex-feedback-{}.log", self.thread_id);
|
|
let path = dir.join(filename);
|
|
fs::write(&path, self.as_bytes())?;
|
|
Ok(path)
|
|
}
|
|
|
|
/// Upload feedback to Sentry with optional attachments.
|
|
pub fn upload_feedback(
|
|
&self,
|
|
classification: &str,
|
|
reason: Option<&str>,
|
|
include_logs: bool,
|
|
rollout_path: Option<&std::path::Path>,
|
|
) -> Result<()> {
|
|
use std::collections::BTreeMap;
|
|
use std::fs;
|
|
use std::str::FromStr;
|
|
use std::sync::Arc;
|
|
|
|
use sentry::Client;
|
|
use sentry::ClientOptions;
|
|
use sentry::protocol::Attachment;
|
|
use sentry::protocol::Envelope;
|
|
use sentry::protocol::EnvelopeItem;
|
|
use sentry::protocol::Event;
|
|
use sentry::protocol::Level;
|
|
use sentry::transports::DefaultTransportFactory;
|
|
use sentry::types::Dsn;
|
|
|
|
// Build Sentry client
|
|
let client = Client::from_config(ClientOptions {
|
|
dsn: Some(Dsn::from_str(SENTRY_DSN).map_err(|e| anyhow!("invalid DSN: {e}"))?),
|
|
transport: Some(Arc::new(DefaultTransportFactory {})),
|
|
..Default::default()
|
|
});
|
|
|
|
let cli_version = env!("CARGO_PKG_VERSION");
|
|
let mut tags = BTreeMap::from([
|
|
(String::from("thread_id"), self.thread_id.to_string()),
|
|
(String::from("classification"), classification.to_string()),
|
|
(String::from("cli_version"), cli_version.to_string()),
|
|
]);
|
|
if let Some(r) = reason {
|
|
tags.insert(String::from("reason"), r.to_string());
|
|
}
|
|
|
|
let level = match classification {
|
|
"bug" | "bad_result" => Level::Error,
|
|
_ => Level::Info,
|
|
};
|
|
|
|
let mut envelope = Envelope::new();
|
|
let title = format!(
|
|
"[{}]: Codex session {}",
|
|
display_classification(classification),
|
|
self.thread_id
|
|
);
|
|
|
|
let mut event = Event {
|
|
level,
|
|
message: Some(title.clone()),
|
|
tags,
|
|
..Default::default()
|
|
};
|
|
if let Some(r) = reason {
|
|
use sentry::protocol::Exception;
|
|
use sentry::protocol::Values;
|
|
|
|
event.exception = Values::from(vec![Exception {
|
|
ty: title.clone(),
|
|
value: Some(r.to_string()),
|
|
..Default::default()
|
|
}]);
|
|
}
|
|
envelope.add_item(EnvelopeItem::Event(event));
|
|
|
|
if include_logs {
|
|
envelope.add_item(EnvelopeItem::Attachment(Attachment {
|
|
buffer: self.bytes.clone(),
|
|
filename: String::from("codex-logs.log"),
|
|
content_type: Some("text/plain".to_string()),
|
|
ty: None,
|
|
}));
|
|
}
|
|
|
|
if let Some((path, data)) = rollout_path.and_then(|p| fs::read(p).ok().map(|d| (p, d))) {
|
|
let fname = path
|
|
.file_name()
|
|
.map(|s| s.to_string_lossy().to_string())
|
|
.unwrap_or_else(|| "rollout.jsonl".to_string());
|
|
let content_type = "text/plain".to_string();
|
|
envelope.add_item(EnvelopeItem::Attachment(Attachment {
|
|
buffer: data,
|
|
filename: fname,
|
|
content_type: Some(content_type),
|
|
ty: None,
|
|
}));
|
|
}
|
|
|
|
client.send_envelope(envelope);
|
|
client.flush(Some(Duration::from_secs(UPLOAD_TIMEOUT_SECS)));
|
|
Ok(())
|
|
}
|
|
}
|
|
|
|
fn display_classification(classification: &str) -> String {
|
|
match classification {
|
|
"bug" => "Bug".to_string(),
|
|
"bad_result" => "Bad result".to_string(),
|
|
"good_result" => "Good result".to_string(),
|
|
_ => "Other".to_string(),
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn ring_buffer_drops_front_when_full() {
|
|
let fb = CodexFeedback::with_capacity(8);
|
|
{
|
|
let mut w = fb.make_writer().make_writer();
|
|
w.write_all(b"abcdefgh").unwrap();
|
|
w.write_all(b"ij").unwrap();
|
|
}
|
|
let snap = fb.snapshot(None);
|
|
// Capacity 8: after writing 10 bytes, we should keep the last 8.
|
|
pretty_assertions::assert_eq!(std::str::from_utf8(snap.as_bytes()).unwrap(), "cdefghij");
|
|
}
|
|
}
|