diff --git a/crates/dump/src/lib.rs b/crates/dump/src/lib.rs index 70213ce69..e7fd22333 100644 --- a/crates/dump/src/lib.rs +++ b/crates/dump/src/lib.rs @@ -321,7 +321,7 @@ pub(crate) mod test { status: maplit::btreemap! { Status::Succeeded => 1 }, types: maplit::btreemap! { Kind::DocumentAdditionOrUpdate => 1 }, index_uids: maplit::btreemap! { "doggo".to_string() => 1 }, - call_trace: Default::default(), + progress_trace: Default::default(), write_channel_congestion: None, }, enqueued_at: Some(BatchEnqueuedAt { diff --git a/crates/index-scheduler/src/insta_snapshot.rs b/crates/index-scheduler/src/insta_snapshot.rs index 7b667c67b..6f1863876 100644 --- a/crates/index-scheduler/src/insta_snapshot.rs +++ b/crates/index-scheduler/src/insta_snapshot.rs @@ -343,7 +343,7 @@ pub fn snapshot_batch(batch: &Batch) -> String { let mut snap = String::new(); let Batch { uid, details, stats, started_at, finished_at, progress: _, enqueued_at } = batch; let stats = BatchStats { - call_trace: Default::default(), + progress_trace: Default::default(), write_channel_congestion: None, ..stats.clone() }; diff --git a/crates/index-scheduler/src/scheduler/mod.rs b/crates/index-scheduler/src/scheduler/mod.rs index 42ed92839..41ff7f809 100644 --- a/crates/index-scheduler/src/scheduler/mod.rs +++ b/crates/index-scheduler/src/scheduler/mod.rs @@ -342,7 +342,7 @@ impl IndexScheduler { // We must re-add the canceled task so they're part of the same batch. ids |= canceled; - processing_batch.stats.call_trace = + processing_batch.stats.progress_trace = progress.accumulated_durations().into_iter().map(|(k, v)| (k, v.into())).collect(); processing_batch.stats.write_channel_congestion = congestion.map(|congestion| { let mut congestion_info = serde_json::Map::new(); diff --git a/crates/meilisearch-types/src/batches.rs b/crates/meilisearch-types/src/batches.rs index 5ec9cbd41..904682585 100644 --- a/crates/meilisearch-types/src/batches.rs +++ b/crates/meilisearch-types/src/batches.rs @@ -61,7 +61,7 @@ pub struct BatchStats { pub types: BTreeMap, pub index_uids: BTreeMap, #[serde(default, skip_serializing_if = "serde_json::Map::is_empty")] - pub call_trace: serde_json::Map, + pub progress_trace: serde_json::Map, #[serde(default, skip_serializing_if = "Option::is_none")] pub write_channel_congestion: Option>, } diff --git a/crates/meilisearch/tests/batches/mod.rs b/crates/meilisearch/tests/batches/mod.rs index 2f9fbbca7..468963631 100644 --- a/crates/meilisearch/tests/batches/mod.rs +++ b/crates/meilisearch/tests/batches/mod.rs @@ -280,7 +280,7 @@ async fn test_summarized_document_addition_or_update() { ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]", - ".stats.callTrace" => "[callTrace]", + ".stats.progressTrace" => "[progressTrace]", ".stats.writeChannelCongestion" => "[writeChannelCongestion]" }, @r###" @@ -302,7 +302,7 @@ async fn test_summarized_document_addition_or_update() { "indexUids": { "test": 1 }, - "callTrace": "[callTrace]", + "progressTrace": "[progressTrace]", "writeChannelCongestion": "[writeChannelCongestion]" }, "duration": "[duration]", @@ -321,7 +321,7 @@ async fn test_summarized_document_addition_or_update() { ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]", - ".stats.callTrace" => "[callTrace]", + ".stats.progressTrace" => "[progressTrace]", ".stats.writeChannelCongestion" => "[writeChannelCongestion]" }, @r###" @@ -343,7 +343,7 @@ async fn test_summarized_document_addition_or_update() { "indexUids": { "test": 1 }, - "callTrace": "[callTrace]", + "progressTrace": "[progressTrace]", "writeChannelCongestion": "[writeChannelCongestion]" }, "duration": "[duration]", @@ -366,7 +366,7 @@ async fn test_summarized_delete_documents_by_batch() { ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]", - ".stats.callTrace" => "[callTrace]", + ".stats.progressTrace" => "[progressTrace]", ".stats.writeChannelCongestion" => "[writeChannelCongestion]" }, @r###" @@ -388,7 +388,7 @@ async fn test_summarized_delete_documents_by_batch() { "indexUids": { "test": 1 }, - "callTrace": "[callTrace]" + "progressTrace": "[progressTrace]" }, "duration": "[duration]", "startedAt": "[date]", @@ -406,7 +406,7 @@ async fn test_summarized_delete_documents_by_batch() { ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]", - ".stats.callTrace" => "[callTrace]", + ".stats.progressTrace" => "[progressTrace]", ".stats.writeChannelCongestion" => "[writeChannelCongestion]" }, @r###" @@ -428,7 +428,7 @@ async fn test_summarized_delete_documents_by_batch() { "indexUids": { "test": 1 }, - "callTrace": "[callTrace]" + "progressTrace": "[progressTrace]" }, "duration": "[duration]", "startedAt": "[date]", @@ -452,7 +452,7 @@ async fn test_summarized_delete_documents_by_filter() { ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]", - ".stats.callTrace" => "[callTrace]", + ".stats.progressTrace" => "[progressTrace]", ".stats.writeChannelCongestion" => "[writeChannelCongestion]" }, @r###" @@ -475,7 +475,7 @@ async fn test_summarized_delete_documents_by_filter() { "indexUids": { "test": 1 }, - "callTrace": "[callTrace]" + "progressTrace": "[progressTrace]" }, "duration": "[duration]", "startedAt": "[date]", @@ -494,7 +494,7 @@ async fn test_summarized_delete_documents_by_filter() { ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]", - ".stats.callTrace" => "[callTrace]", + ".stats.progressTrace" => "[progressTrace]", ".stats.writeChannelCongestion" => "[writeChannelCongestion]" }, @r###" @@ -517,7 +517,7 @@ async fn test_summarized_delete_documents_by_filter() { "indexUids": { "test": 1 }, - "callTrace": "[callTrace]" + "progressTrace": "[progressTrace]" }, "duration": "[duration]", "startedAt": "[date]", @@ -536,7 +536,7 @@ async fn test_summarized_delete_documents_by_filter() { ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]", - ".stats.callTrace" => "[callTrace]", + ".stats.progressTrace" => "[progressTrace]", ".stats.writeChannelCongestion" => "[writeChannelCongestion]" }, @r#" @@ -559,7 +559,7 @@ async fn test_summarized_delete_documents_by_filter() { "indexUids": { "test": 1 }, - "callTrace": "[callTrace]" + "progressTrace": "[progressTrace]" }, "duration": "[duration]", "startedAt": "[date]", @@ -582,7 +582,7 @@ async fn test_summarized_delete_document_by_id() { ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]", - ".stats.callTrace" => "[callTrace]", + ".stats.progressTrace" => "[progressTrace]", ".stats.writeChannelCongestion" => "[writeChannelCongestion]" }, @r#" @@ -604,7 +604,7 @@ async fn test_summarized_delete_document_by_id() { "indexUids": { "test": 1 }, - "callTrace": "[callTrace]" + "progressTrace": "[progressTrace]" }, "duration": "[duration]", "startedAt": "[date]", @@ -622,7 +622,7 @@ async fn test_summarized_delete_document_by_id() { ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]", - ".stats.callTrace" => "[callTrace]", + ".stats.progressTrace" => "[progressTrace]", ".stats.writeChannelCongestion" => "[writeChannelCongestion]" }, @r#" @@ -644,7 +644,7 @@ async fn test_summarized_delete_document_by_id() { "indexUids": { "test": 1 }, - "callTrace": "[callTrace]" + "progressTrace": "[progressTrace]" }, "duration": "[duration]", "startedAt": "[date]", @@ -678,7 +678,7 @@ async fn test_summarized_settings_update() { ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]", - ".stats.callTrace" => "[callTrace]", + ".stats.progressTrace" => "[progressTrace]", ".stats.writeChannelCongestion" => "[writeChannelCongestion]" }, @r###" @@ -709,7 +709,7 @@ async fn test_summarized_settings_update() { "indexUids": { "test": 1 }, - "callTrace": "[callTrace]" + "progressTrace": "[progressTrace]" }, "duration": "[duration]", "startedAt": "[date]", @@ -731,7 +731,7 @@ async fn test_summarized_index_creation() { ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]", - ".stats.callTrace" => "[callTrace]", + ".stats.progressTrace" => "[progressTrace]", ".stats.writeChannelCongestion" => "[writeChannelCongestion]" }, @r###" @@ -750,7 +750,7 @@ async fn test_summarized_index_creation() { "indexUids": { "test": 1 }, - "callTrace": "[callTrace]" + "progressTrace": "[progressTrace]" }, "duration": "[duration]", "startedAt": "[date]", @@ -767,7 +767,7 @@ async fn test_summarized_index_creation() { ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]", - ".stats.callTrace" => "[callTrace]", + ".stats.progressTrace" => "[progressTrace]", ".stats.writeChannelCongestion" => "[writeChannelCongestion]" }, @r###" @@ -788,7 +788,7 @@ async fn test_summarized_index_creation() { "indexUids": { "test": 1 }, - "callTrace": "[callTrace]" + "progressTrace": "[progressTrace]" }, "duration": "[duration]", "startedAt": "[date]", @@ -920,7 +920,7 @@ async fn test_summarized_index_update() { ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]", - ".stats.callTrace" => "[callTrace]", + ".stats.progressTrace" => "[progressTrace]", ".stats.writeChannelCongestion" => "[writeChannelCongestion]" }, @r###" @@ -939,7 +939,7 @@ async fn test_summarized_index_update() { "indexUids": { "test": 1 }, - "callTrace": "[callTrace]" + "progressTrace": "[progressTrace]" }, "duration": "[duration]", "startedAt": "[date]", @@ -956,7 +956,7 @@ async fn test_summarized_index_update() { ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]", - ".stats.callTrace" => "[callTrace]", + ".stats.progressTrace" => "[progressTrace]", ".stats.writeChannelCongestion" => "[writeChannelCongestion]" }, @r###" @@ -977,7 +977,7 @@ async fn test_summarized_index_update() { "indexUids": { "test": 1 }, - "callTrace": "[callTrace]" + "progressTrace": "[progressTrace]" }, "duration": "[duration]", "startedAt": "[date]", @@ -997,7 +997,7 @@ async fn test_summarized_index_update() { ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]", - ".stats.callTrace" => "[callTrace]", + ".stats.progressTrace" => "[progressTrace]", ".stats.writeChannelCongestion" => "[writeChannelCongestion]" }, @r#" @@ -1016,7 +1016,7 @@ async fn test_summarized_index_update() { "indexUids": { "test": 1 }, - "callTrace": "[callTrace]" + "progressTrace": "[progressTrace]" }, "duration": "[duration]", "startedAt": "[date]", @@ -1033,7 +1033,7 @@ async fn test_summarized_index_update() { ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]", - ".stats.callTrace" => "[callTrace]", + ".stats.progressTrace" => "[progressTrace]", ".stats.writeChannelCongestion" => "[writeChannelCongestion]" }, @r###" @@ -1054,7 +1054,7 @@ async fn test_summarized_index_update() { "indexUids": { "test": 1 }, - "callTrace": "[callTrace]" + "progressTrace": "[progressTrace]" }, "duration": "[duration]", "startedAt": "[date]", @@ -1079,7 +1079,7 @@ async fn test_summarized_index_swap() { ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]", - ".stats.callTrace" => "[callTrace]", + ".stats.progressTrace" => "[progressTrace]", ".stats.writeChannelCongestion" => "[writeChannelCongestion]" }, @r###" @@ -1105,7 +1105,7 @@ async fn test_summarized_index_swap() { "indexSwap": 1 }, "indexUids": {}, - "callTrace": "[callTrace]" + "progressTrace": "[progressTrace]" }, "duration": "[duration]", "startedAt": "[date]", @@ -1128,7 +1128,7 @@ async fn test_summarized_index_swap() { ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]", - ".stats.callTrace" => "[callTrace]", + ".stats.progressTrace" => "[progressTrace]", ".stats.writeChannelCongestion" => "[writeChannelCongestion]" }, @r###" @@ -1147,7 +1147,7 @@ async fn test_summarized_index_swap() { "indexUids": { "doggos": 1 }, - "callTrace": "[callTrace]" + "progressTrace": "[progressTrace]" }, "duration": "[duration]", "startedAt": "[date]", @@ -1172,7 +1172,7 @@ async fn test_summarized_batch_cancelation() { ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]", - ".stats.callTrace" => "[callTrace]", + ".stats.progressTrace" => "[progressTrace]", ".stats.writeChannelCongestion" => "[writeChannelCongestion]" }, @r###" @@ -1193,7 +1193,7 @@ async fn test_summarized_batch_cancelation() { "taskCancelation": 1 }, "indexUids": {}, - "callTrace": "[callTrace]" + "progressTrace": "[progressTrace]" }, "duration": "[duration]", "startedAt": "[date]", @@ -1218,7 +1218,7 @@ async fn test_summarized_batch_deletion() { ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]", - ".stats.callTrace" => "[callTrace]", + ".stats.progressTrace" => "[progressTrace]", ".stats.writeChannelCongestion" => "[writeChannelCongestion]" }, @r###" @@ -1239,7 +1239,7 @@ async fn test_summarized_batch_deletion() { "taskDeletion": 1 }, "indexUids": {}, - "callTrace": "[callTrace]" + "progressTrace": "[progressTrace]" }, "duration": "[duration]", "startedAt": "[date]", @@ -1261,7 +1261,7 @@ async fn test_summarized_dump_creation() { ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]", - ".stats.callTrace" => "[callTrace]", + ".stats.progressTrace" => "[progressTrace]", ".stats.writeChannelCongestion" => "[writeChannelCongestion]" }, @r###" @@ -1280,7 +1280,7 @@ async fn test_summarized_dump_creation() { "dumpCreation": 1 }, "indexUids": {}, - "callTrace": "[callTrace]" + "progressTrace": "[progressTrace]" }, "duration": "[duration]", "startedAt": "[date]", diff --git a/crates/meilisearch/tests/dumps/mod.rs b/crates/meilisearch/tests/dumps/mod.rs index 6d83c9be5..55ee9dc93 100644 --- a/crates/meilisearch/tests/dumps/mod.rs +++ b/crates/meilisearch/tests/dumps/mod.rs @@ -2206,7 +2206,7 @@ async fn import_dump_v6_containing_batches_and_enqueued_tasks() { ".results[0].startedAt" => "[date]", ".results[0].finishedAt" => "[date]", ".results[0].duration" => "[date]", - ".results[0].stats.callTrace" => "[callTrace]", + ".results[0].stats.progressTrace" => "[progressTrace]", ".results[0].stats.writeChannelCongestion" => "[writeChannelCongestion]", }), name: "batches"); diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v6_containing_batches_and_enqueued_tasks/batches.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v6_containing_batches_and_enqueued_tasks/batches.snap index 8d28aa706..b38340ef6 100644 --- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v6_containing_batches_and_enqueued_tasks/batches.snap +++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v6_containing_batches_and_enqueued_tasks/batches.snap @@ -21,7 +21,7 @@ source: crates/meilisearch/tests/dumps/mod.rs "indexUids": { "kefir": 1 }, - "callTrace": "[callTrace]", + "progressTrace": "[progressTrace]", "writeChannelCongestion": "[writeChannelCongestion]" }, "duration": "[date]", diff --git a/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/batches_filter_afterEnqueuedAt_equal_2025-01-16T16_47_41.snap b/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/batches_filter_afterEnqueuedAt_equal_2025-01-16T16_47_41.snap index 21fcdaffb..fcae53dba 100644 --- a/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/batches_filter_afterEnqueuedAt_equal_2025-01-16T16_47_41.snap +++ b/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/batches_filter_afterEnqueuedAt_equal_2025-01-16T16_47_41.snap @@ -19,7 +19,7 @@ source: crates/meilisearch/tests/upgrade/v1_12/v1_12_0.rs "upgradeDatabase": 1 }, "indexUids": {}, - "callTrace": "[callTrace]" + "progressTrace": "[progressTrace]" }, "duration": "[duration]", "startedAt": "[date]", diff --git a/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/batches_filter_afterFinishedAt_equal_2025-01-16T16_47_41.snap b/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/batches_filter_afterFinishedAt_equal_2025-01-16T16_47_41.snap index 21fcdaffb..fcae53dba 100644 --- a/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/batches_filter_afterFinishedAt_equal_2025-01-16T16_47_41.snap +++ b/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/batches_filter_afterFinishedAt_equal_2025-01-16T16_47_41.snap @@ -19,7 +19,7 @@ source: crates/meilisearch/tests/upgrade/v1_12/v1_12_0.rs "upgradeDatabase": 1 }, "indexUids": {}, - "callTrace": "[callTrace]" + "progressTrace": "[progressTrace]" }, "duration": "[duration]", "startedAt": "[date]", diff --git a/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/batches_filter_afterStartedAt_equal_2025-01-16T16_47_41.snap b/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/batches_filter_afterStartedAt_equal_2025-01-16T16_47_41.snap index 21fcdaffb..fcae53dba 100644 --- a/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/batches_filter_afterStartedAt_equal_2025-01-16T16_47_41.snap +++ b/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/batches_filter_afterStartedAt_equal_2025-01-16T16_47_41.snap @@ -19,7 +19,7 @@ source: crates/meilisearch/tests/upgrade/v1_12/v1_12_0.rs "upgradeDatabase": 1 }, "indexUids": {}, - "callTrace": "[callTrace]" + "progressTrace": "[progressTrace]" }, "duration": "[duration]", "startedAt": "[date]", diff --git a/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/the_whole_batch_queue_once_everything_has_been_processed.snap b/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/the_whole_batch_queue_once_everything_has_been_processed.snap index 4ed0abe17..b5ff80f3c 100644 --- a/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/the_whole_batch_queue_once_everything_has_been_processed.snap +++ b/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/the_whole_batch_queue_once_everything_has_been_processed.snap @@ -19,7 +19,7 @@ source: crates/meilisearch/tests/upgrade/v1_12/v1_12_0.rs "upgradeDatabase": 1 }, "indexUids": {}, - "callTrace": "[callTrace]" + "progressTrace": "[progressTrace]" }, "duration": "[duration]", "startedAt": "[date]", diff --git a/crates/meilisearch/tests/upgrade/v1_12/v1_12_0.rs b/crates/meilisearch/tests/upgrade/v1_12/v1_12_0.rs index 224f53ab0..b7ea669a0 100644 --- a/crates/meilisearch/tests/upgrade/v1_12/v1_12_0.rs +++ b/crates/meilisearch/tests/upgrade/v1_12/v1_12_0.rs @@ -164,7 +164,7 @@ async fn check_the_index_scheduler(server: &Server) { let (tasks, _) = server.tasks_filter("limit=1000").await; snapshot!(json_string!(tasks, { ".results[0].duration" => "[duration]", ".results[0].enqueuedAt" => "[date]", ".results[0].startedAt" => "[date]", ".results[0].finishedAt" => "[date]" }), name: "the_whole_task_queue_once_everything_has_been_processed"); let (batches, _) = server.batches_filter("limit=1000").await; - snapshot!(json_string!(batches, { ".results[0].duration" => "[duration]", ".results[0].enqueuedAt" => "[date]", ".results[0].startedAt" => "[date]", ".results[0].finishedAt" => "[date]", ".results[0].stats.callTrace" => "[callTrace]", ".results[0].stats.writeChannelCongestion" => "[writeChannelCongestion]" }), name: "the_whole_batch_queue_once_everything_has_been_processed"); + snapshot!(json_string!(batches, { ".results[0].duration" => "[duration]", ".results[0].enqueuedAt" => "[date]", ".results[0].startedAt" => "[date]", ".results[0].finishedAt" => "[date]", ".results[0].stats.progressTrace" => "[progressTrace]", ".results[0].stats.writeChannelCongestion" => "[writeChannelCongestion]" }), name: "the_whole_batch_queue_once_everything_has_been_processed"); // Tests all the tasks query parameters let (tasks, _) = server.tasks_filter("uids=10").await; @@ -191,26 +191,26 @@ async fn check_the_index_scheduler(server: &Server) { // Tests all the batches query parameters let (batches, _) = server.batches_filter("uids=10").await; - snapshot!(json_string!(batches, { ".results[0].duration" => "[duration]", ".results[0].enqueuedAt" => "[date]", ".results[0].startedAt" => "[date]", ".results[0].finishedAt" => "[date]", ".results[0].stats.callTrace" => "[callTrace]", ".results[0].stats.writeChannelCongestion" => "[writeChannelCongestion]" }), name: "batches_filter_uids_equal_10"); + snapshot!(json_string!(batches, { ".results[0].duration" => "[duration]", ".results[0].enqueuedAt" => "[date]", ".results[0].startedAt" => "[date]", ".results[0].finishedAt" => "[date]", ".results[0].stats.progressTrace" => "[progressTrace]", ".results[0].stats.writeChannelCongestion" => "[writeChannelCongestion]" }), name: "batches_filter_uids_equal_10"); let (batches, _) = server.batches_filter("batchUids=10").await; - snapshot!(json_string!(batches, { ".results[0].duration" => "[duration]", ".results[0].enqueuedAt" => "[date]", ".results[0].startedAt" => "[date]", ".results[0].finishedAt" => "[date]", ".results[0].stats.callTrace" => "[callTrace]", ".results[0].stats.writeChannelCongestion" => "[writeChannelCongestion]" }), name: "batches_filter_batchUids_equal_10"); + snapshot!(json_string!(batches, { ".results[0].duration" => "[duration]", ".results[0].enqueuedAt" => "[date]", ".results[0].startedAt" => "[date]", ".results[0].finishedAt" => "[date]", ".results[0].stats.progressTrace" => "[progressTrace]", ".results[0].stats.writeChannelCongestion" => "[writeChannelCongestion]" }), name: "batches_filter_batchUids_equal_10"); let (batches, _) = server.batches_filter("statuses=canceled").await; - snapshot!(json_string!(batches, { ".results[0].duration" => "[duration]", ".results[0].enqueuedAt" => "[date]", ".results[0].startedAt" => "[date]", ".results[0].finishedAt" => "[date]", ".results[0].stats.callTrace" => "[callTrace]", ".results[0].stats.writeChannelCongestion" => "[writeChannelCongestion]" }), name: "batches_filter_statuses_equal_canceled"); + snapshot!(json_string!(batches, { ".results[0].duration" => "[duration]", ".results[0].enqueuedAt" => "[date]", ".results[0].startedAt" => "[date]", ".results[0].finishedAt" => "[date]", ".results[0].stats.progressTrace" => "[progressTrace]", ".results[0].stats.writeChannelCongestion" => "[writeChannelCongestion]" }), name: "batches_filter_statuses_equal_canceled"); // types has already been tested above to retrieve the upgrade database let (batches, _) = server.batches_filter("canceledBy=19").await; - snapshot!(json_string!(batches, { ".results[0].duration" => "[duration]", ".results[0].enqueuedAt" => "[date]", ".results[0].startedAt" => "[date]", ".results[0].finishedAt" => "[date]", ".results[0].stats.callTrace" => "[callTrace]", ".results[0].stats.writeChannelCongestion" => "[writeChannelCongestion]" }), name: "batches_filter_canceledBy_equal_19"); + snapshot!(json_string!(batches, { ".results[0].duration" => "[duration]", ".results[0].enqueuedAt" => "[date]", ".results[0].startedAt" => "[date]", ".results[0].finishedAt" => "[date]", ".results[0].stats.progressTrace" => "[progressTrace]", ".results[0].stats.writeChannelCongestion" => "[writeChannelCongestion]" }), name: "batches_filter_canceledBy_equal_19"); let (batches, _) = server.batches_filter("beforeEnqueuedAt=2025-01-16T16:47:41Z").await; - snapshot!(json_string!(batches, { ".results[0].duration" => "[duration]", ".results[0].enqueuedAt" => "[date]", ".results[0].startedAt" => "[date]", ".results[0].finishedAt" => "[date]", ".results[0].stats.callTrace" => "[callTrace]", ".results[0].stats.writeChannelCongestion" => "[writeChannelCongestion]" }), name: "batches_filter_beforeEnqueuedAt_equal_2025-01-16T16_47_41"); + snapshot!(json_string!(batches, { ".results[0].duration" => "[duration]", ".results[0].enqueuedAt" => "[date]", ".results[0].startedAt" => "[date]", ".results[0].finishedAt" => "[date]", ".results[0].stats.progressTrace" => "[progressTrace]", ".results[0].stats.writeChannelCongestion" => "[writeChannelCongestion]" }), name: "batches_filter_beforeEnqueuedAt_equal_2025-01-16T16_47_41"); let (batches, _) = server.batches_filter("afterEnqueuedAt=2025-01-16T16:47:41Z").await; - snapshot!(json_string!(batches, { ".results[0].duration" => "[duration]", ".results[0].enqueuedAt" => "[date]", ".results[0].startedAt" => "[date]", ".results[0].finishedAt" => "[date]", ".results[0].stats.callTrace" => "[callTrace]", ".results[0].stats.writeChannelCongestion" => "[writeChannelCongestion]" }), name: "batches_filter_afterEnqueuedAt_equal_2025-01-16T16_47_41"); + snapshot!(json_string!(batches, { ".results[0].duration" => "[duration]", ".results[0].enqueuedAt" => "[date]", ".results[0].startedAt" => "[date]", ".results[0].finishedAt" => "[date]", ".results[0].stats.progressTrace" => "[progressTrace]", ".results[0].stats.writeChannelCongestion" => "[writeChannelCongestion]" }), name: "batches_filter_afterEnqueuedAt_equal_2025-01-16T16_47_41"); let (batches, _) = server.batches_filter("beforeStartedAt=2025-01-16T16:47:41Z").await; - snapshot!(json_string!(batches, { ".results[0].duration" => "[duration]", ".results[0].enqueuedAt" => "[date]", ".results[0].startedAt" => "[date]", ".results[0].finishedAt" => "[date]", ".results[0].stats.callTrace" => "[callTrace]", ".results[0].stats.writeChannelCongestion" => "[writeChannelCongestion]" }), name: "batches_filter_beforeStartedAt_equal_2025-01-16T16_47_41"); + snapshot!(json_string!(batches, { ".results[0].duration" => "[duration]", ".results[0].enqueuedAt" => "[date]", ".results[0].startedAt" => "[date]", ".results[0].finishedAt" => "[date]", ".results[0].stats.progressTrace" => "[progressTrace]", ".results[0].stats.writeChannelCongestion" => "[writeChannelCongestion]" }), name: "batches_filter_beforeStartedAt_equal_2025-01-16T16_47_41"); let (batches, _) = server.batches_filter("afterStartedAt=2025-01-16T16:47:41Z").await; - snapshot!(json_string!(batches, { ".results[0].duration" => "[duration]", ".results[0].enqueuedAt" => "[date]", ".results[0].startedAt" => "[date]", ".results[0].finishedAt" => "[date]", ".results[0].stats.callTrace" => "[callTrace]", ".results[0].stats.writeChannelCongestion" => "[writeChannelCongestion]" }), name: "batches_filter_afterStartedAt_equal_2025-01-16T16_47_41"); + snapshot!(json_string!(batches, { ".results[0].duration" => "[duration]", ".results[0].enqueuedAt" => "[date]", ".results[0].startedAt" => "[date]", ".results[0].finishedAt" => "[date]", ".results[0].stats.progressTrace" => "[progressTrace]", ".results[0].stats.writeChannelCongestion" => "[writeChannelCongestion]" }), name: "batches_filter_afterStartedAt_equal_2025-01-16T16_47_41"); let (batches, _) = server.batches_filter("beforeFinishedAt=2025-01-16T16:47:41Z").await; - snapshot!(json_string!(batches, { ".results[0].duration" => "[duration]", ".results[0].enqueuedAt" => "[date]", ".results[0].startedAt" => "[date]", ".results[0].finishedAt" => "[date]", ".results[0].stats.callTrace" => "[callTrace]", ".results[0].stats.writeChannelCongestion" => "[writeChannelCongestion]" }), name: "batches_filter_beforeFinishedAt_equal_2025-01-16T16_47_41"); + snapshot!(json_string!(batches, { ".results[0].duration" => "[duration]", ".results[0].enqueuedAt" => "[date]", ".results[0].startedAt" => "[date]", ".results[0].finishedAt" => "[date]", ".results[0].stats.progressTrace" => "[progressTrace]", ".results[0].stats.writeChannelCongestion" => "[writeChannelCongestion]" }), name: "batches_filter_beforeFinishedAt_equal_2025-01-16T16_47_41"); let (batches, _) = server.batches_filter("afterFinishedAt=2025-01-16T16:47:41Z").await; - snapshot!(json_string!(batches, { ".results[0].duration" => "[duration]", ".results[0].enqueuedAt" => "[date]", ".results[0].startedAt" => "[date]", ".results[0].finishedAt" => "[date]", ".results[0].stats.callTrace" => "[callTrace]", ".results[0].stats.writeChannelCongestion" => "[writeChannelCongestion]" }), name: "batches_filter_afterFinishedAt_equal_2025-01-16T16_47_41"); + snapshot!(json_string!(batches, { ".results[0].duration" => "[duration]", ".results[0].enqueuedAt" => "[date]", ".results[0].startedAt" => "[date]", ".results[0].finishedAt" => "[date]", ".results[0].stats.progressTrace" => "[progressTrace]", ".results[0].stats.writeChannelCongestion" => "[writeChannelCongestion]" }), name: "batches_filter_afterFinishedAt_equal_2025-01-16T16_47_41"); let (stats, _) = server.stats().await; assert_json_snapshot!(stats, {