Skip to content

trace: Improve sync progress and resilience #206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
davidabram merged 2 commits into from
Aug 14, 2026
Merged

trace: Improve sync progress and resilience #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa1d1ea
trace: Improve sync progress and resilience
davidabram Aug 13, 2026
6c286c0
trace: Run Agent Trace sync streams concurrently
davidabram Aug 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ reqwest = { version = "0.13", default-features = false, features = ["json", "for
serde = { version = "1", features = ["derive"] }
serde_json = "1"
sha2 = "0.11"
tokio = { version = "1", default-features = false, features = ["rt", "io-util", "time"] }
tokio = { version = "1", default-features = false, features = ["rt", "io-util", "sync", "time"] }
tracing = "0.1"

uuid = { version = "1", features = ["v4", "v7"] }
Expand Down
17 changes: 12 additions & 5 deletions cli/src/app.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,26 +269,28 @@ where
StderrW: Write,
{
app_support::render_run_outcome(
try_run_with_dependency_check(args, dependency_check),
try_run_with_dependency_check(args, dependency_check, stderr),
stdout,
stderr,
)
}

fn try_run_with_dependency_check<I, F>(
fn try_run_with_dependency_check<I, F, StderrW>(
args: I,
dependency_check: F,
stderr: &mut StderrW,
) -> RunOutcome<services::observability::Logger>
where
I: IntoIterator<Item = String>,
F: FnOnce() -> anyhow::Result<()>,
StderrW: Write,
{
let result = perform_dependency_check(dependency_check)
.and_then(|()| build_startup_context())
.and_then(initialize_runtime)
.map(|runtime| {
let startup_diagnostic = runtime.startup_diagnostic.clone();
let result = run_command_lifecycle(args, &runtime);
let result = run_command_lifecycle(args, &runtime, stderr);
RunOutcome {
logger: Some(runtime.logger),
startup_diagnostic,
Expand Down Expand Up @@ -345,9 +347,14 @@ fn initialize_runtime(startup: StartupContext) -> Result<AppRuntime, ClassifiedE
})
}

fn run_command_lifecycle<I>(args: I, runtime: &AppRuntime) -> Result<String, ClassifiedError>
fn run_command_lifecycle<I, StderrW>(
args: I,
runtime: &AppRuntime,
stderr: &mut StderrW,
) -> Result<String, ClassifiedError>
where
I: IntoIterator<Item = String>,
StderrW: Write,
{
let context = runtime.context();
let mut args = Some(args.into_iter().collect::<Vec<_>>());
Expand All @@ -362,7 +369,7 @@ where
return Err(ClassifiedError::runtime(REPEATED_COMMAND_DISPATCH_ERROR));
};
let command = parse_command_phase(command_args, &runtime.registry, &context)?;
app_support::execute_command_phase(&command, &context)
app_support::execute_command_phase(&command, &context, stderr)
})
}

Expand Down
62 changes: 31 additions & 31 deletions cli/src/services/agent_trace_export/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use serde::Serialize;
use crate::services::agent_trace_db::{repository::RepositoryAgentTraceDb, MessageRole};

/// Maximum number of rows a single export reader call may return.
pub const AGENT_TRACE_EXPORT_BATCH_SIZE: usize = 500;
pub const AGENT_TRACE_EXPORT_BATCH_SIZE: usize = 100;

/// Largest integer value that round-trips exactly through an IEEE-754 double
/// (`Number.MAX_SAFE_INTEGER`).
Expand Down Expand Up @@ -667,7 +667,7 @@ mod tests {

let reader = AgentTraceExportReader::new(&db);
let rows = reader
.read_messages_after(1, 500)
.read_messages_after(1, AGENT_TRACE_EXPORT_BATCH_SIZE)
.expect("read after cursor should succeed");

assert_eq!(
Expand Down Expand Up @@ -696,7 +696,7 @@ mod tests {

let reader = AgentTraceExportReader::new(&db);
let rows = reader
.read_messages_after(10, 500)
.read_messages_after(10, AGENT_TRACE_EXPORT_BATCH_SIZE)
.expect("read after cursor should succeed");

assert_eq!(
Expand Down Expand Up @@ -759,11 +759,11 @@ mod tests {

let reader = AgentTraceExportReader::new(&db);
assert!(reader
.read_messages_after(1, 500)
.read_messages_after(1, AGENT_TRACE_EXPORT_BATCH_SIZE)
.expect("read at max id should succeed")
.is_empty());
assert!(reader
.read_messages_after(100, 500)
.read_messages_after(100, AGENT_TRACE_EXPORT_BATCH_SIZE)
.expect("read beyond max id should succeed")
.is_empty());

Expand All @@ -777,7 +777,7 @@ mod tests {
let reader = AgentTraceExportReader::new(&db);

let cursor_error = reader
.read_messages_after(-1, 500)
.read_messages_after(-1, AGENT_TRACE_EXPORT_BATCH_SIZE)
.expect_err("negative cursor should error");
assert!(cursor_error.to_string().contains("cursor"));

Expand Down Expand Up @@ -806,7 +806,7 @@ mod tests {

let reader = AgentTraceExportReader::new(&db);
let error = reader
.read_messages_after(0, 500)
.read_messages_after(0, AGENT_TRACE_EXPORT_BATCH_SIZE)
.expect_err("row above safe-integer bound should error");
assert!(error.to_string().contains("JS-safe-integer"));

Expand All @@ -825,7 +825,7 @@ mod tests {

let reader = AgentTraceExportReader::new(&db);
reader
.read_messages_after(0, 500)
.read_messages_after(0, AGENT_TRACE_EXPORT_BATCH_SIZE)
.expect("read should succeed");

assert_eq!(row_count(&db, "messages"), messages_before);
Expand Down Expand Up @@ -858,7 +858,7 @@ mod tests {

let reader = AgentTraceExportReader::new(&db);
let rows = reader
.read_parts_after(0, 500)
.read_parts_after(0, AGENT_TRACE_EXPORT_BATCH_SIZE)
.expect("read after cursor should succeed");

assert_eq!(
Expand Down Expand Up @@ -888,7 +888,7 @@ mod tests {

let reader = AgentTraceExportReader::new(&db);
let rows = reader
.read_parts_after(10, 500)
.read_parts_after(10, AGENT_TRACE_EXPORT_BATCH_SIZE)
.expect("read after cursor should succeed");

assert_eq!(
Expand Down Expand Up @@ -945,11 +945,11 @@ mod tests {

let reader = AgentTraceExportReader::new(&db);
assert!(reader
.read_parts_after(1, 500)
.read_parts_after(1, AGENT_TRACE_EXPORT_BATCH_SIZE)
.expect("read at max id should succeed")
.is_empty());
assert!(reader
.read_parts_after(100, 500)
.read_parts_after(100, AGENT_TRACE_EXPORT_BATCH_SIZE)
.expect("read beyond max id should succeed")
.is_empty());

Expand All @@ -963,7 +963,7 @@ mod tests {
let reader = AgentTraceExportReader::new(&db);

let cursor_error = reader
.read_parts_after(-1, 500)
.read_parts_after(-1, AGENT_TRACE_EXPORT_BATCH_SIZE)
.expect_err("negative cursor should error");
assert!(cursor_error.to_string().contains("cursor"));

Expand Down Expand Up @@ -992,7 +992,7 @@ mod tests {

let reader = AgentTraceExportReader::new(&db);
let error = reader
.read_parts_after(0, 500)
.read_parts_after(0, AGENT_TRACE_EXPORT_BATCH_SIZE)
.expect_err("row above safe-integer bound should error");
assert!(error.to_string().contains("JS-safe-integer"));

Expand All @@ -1011,7 +1011,7 @@ mod tests {

let reader = AgentTraceExportReader::new(&db);
reader
.read_parts_after(0, 500)
.read_parts_after(0, AGENT_TRACE_EXPORT_BATCH_SIZE)
.expect("read should succeed");

assert_eq!(row_count(&db, "parts"), parts_before);
Expand Down Expand Up @@ -1047,7 +1047,7 @@ mod tests {

let reader = AgentTraceExportReader::new(&db);
let rows = reader
.read_diff_traces_after(1, 500)
.read_diff_traces_after(1, AGENT_TRACE_EXPORT_BATCH_SIZE)
.expect("read after cursor should succeed");

assert_eq!(
Expand Down Expand Up @@ -1081,7 +1081,7 @@ mod tests {

let reader = AgentTraceExportReader::new(&db);
let rows = reader
.read_diff_traces_after(0, 500)
.read_diff_traces_after(0, AGENT_TRACE_EXPORT_BATCH_SIZE)
.expect("read after cursor should succeed");

assert_eq!(rows.len(), 1);
Expand Down Expand Up @@ -1111,7 +1111,7 @@ mod tests {

let reader = AgentTraceExportReader::new(&db);
let rows = reader
.read_diff_traces_after(10, 500)
.read_diff_traces_after(10, AGENT_TRACE_EXPORT_BATCH_SIZE)
.expect("read after cursor should succeed");

assert_eq!(
Expand Down Expand Up @@ -1168,11 +1168,11 @@ mod tests {

let reader = AgentTraceExportReader::new(&db);
assert!(reader
.read_diff_traces_after(1, 500)
.read_diff_traces_after(1, AGENT_TRACE_EXPORT_BATCH_SIZE)
.expect("read at max id should succeed")
.is_empty());
assert!(reader
.read_diff_traces_after(100, 500)
.read_diff_traces_after(100, AGENT_TRACE_EXPORT_BATCH_SIZE)
.expect("read beyond max id should succeed")
.is_empty());

Expand All @@ -1186,7 +1186,7 @@ mod tests {
let reader = AgentTraceExportReader::new(&db);

let cursor_error = reader
.read_diff_traces_after(-1, 500)
.read_diff_traces_after(-1, AGENT_TRACE_EXPORT_BATCH_SIZE)
.expect_err("negative cursor should error");
assert!(cursor_error.to_string().contains("cursor"));

Expand Down Expand Up @@ -1224,7 +1224,7 @@ mod tests {

let reader = AgentTraceExportReader::new(&db);
let error = reader
.read_diff_traces_after(0, 500)
.read_diff_traces_after(0, AGENT_TRACE_EXPORT_BATCH_SIZE)
.expect_err("row above safe-integer bound should error");
assert!(error.to_string().contains("JS-safe-integer"));

Expand All @@ -1243,7 +1243,7 @@ mod tests {

let reader = AgentTraceExportReader::new(&db);
reader
.read_diff_traces_after(0, 500)
.read_diff_traces_after(0, AGENT_TRACE_EXPORT_BATCH_SIZE)
.expect("read should succeed");

assert_eq!(row_count(&db, "diff_traces"), diff_traces_before);
Expand Down Expand Up @@ -1277,7 +1277,7 @@ mod tests {

let reader = AgentTraceExportReader::new(&db);
let rows = reader
.read_agent_traces_after(1, 500)
.read_agent_traces_after(1, AGENT_TRACE_EXPORT_BATCH_SIZE)
.expect("read after cursor should succeed");

assert_eq!(
Expand Down Expand Up @@ -1305,7 +1305,7 @@ mod tests {

let reader = AgentTraceExportReader::new(&db);
let rows = reader
.read_agent_traces_after(0, 500)
.read_agent_traces_after(0, AGENT_TRACE_EXPORT_BATCH_SIZE)
.expect("read after cursor should succeed");

assert_eq!(rows.len(), 1);
Expand All @@ -1329,7 +1329,7 @@ mod tests {

let reader = AgentTraceExportReader::new(&db);
let rows = reader
.read_agent_traces_after(10, 500)
.read_agent_traces_after(10, AGENT_TRACE_EXPORT_BATCH_SIZE)
.expect("read after cursor should succeed");

assert_eq!(
Expand Down Expand Up @@ -1386,11 +1386,11 @@ mod tests {

let reader = AgentTraceExportReader::new(&db);
assert!(reader
.read_agent_traces_after(1, 500)
.read_agent_traces_after(1, AGENT_TRACE_EXPORT_BATCH_SIZE)
.expect("read at max id should succeed")
.is_empty());
assert!(reader
.read_agent_traces_after(100, 500)
.read_agent_traces_after(100, AGENT_TRACE_EXPORT_BATCH_SIZE)
.expect("read beyond max id should succeed")
.is_empty());

Expand All @@ -1404,7 +1404,7 @@ mod tests {
let reader = AgentTraceExportReader::new(&db);

let cursor_error = reader
.read_agent_traces_after(-1, 500)
.read_agent_traces_after(-1, AGENT_TRACE_EXPORT_BATCH_SIZE)
.expect_err("negative cursor should error");
assert!(cursor_error.to_string().contains("cursor"));

Expand Down Expand Up @@ -1441,7 +1441,7 @@ mod tests {

let reader = AgentTraceExportReader::new(&db);
let error = reader
.read_agent_traces_after(0, 500)
.read_agent_traces_after(0, AGENT_TRACE_EXPORT_BATCH_SIZE)
.expect_err("row above safe-integer bound should error");
assert!(error.to_string().contains("JS-safe-integer"));

Expand All @@ -1460,7 +1460,7 @@ mod tests {

let reader = AgentTraceExportReader::new(&db);
reader
.read_agent_traces_after(0, 500)
.read_agent_traces_after(0, AGENT_TRACE_EXPORT_BATCH_SIZE)
.expect("read should succeed");

assert_eq!(row_count(&db, "agent_traces"), agent_traces_before);
Expand Down
Loading
Loading