Merge branch 'feature/support_startup_grace'

Author: ohuu

Cargo.toml

@@ -43,6 +43,7 @@ clap = { version = "4.4.10", features = ["derive"] }
 colored = "2.1.0"
 ctrlc = "3.4.5"
 dotenvy = "0.15.7"
+duration-str = "0.13.0"
 futures-util = "0.3.30"
 http = "1.1.0"
 itertools = "0.13.0"

cardamon.toml

@@ -48,6 +48,13 @@ curve = [7.627190097500079,0.07551567953624883,20.45110313049153,-1.526142275974
 #     default: "file"
 #     required - false
 #
+#   startup_grace:
+#     type - integer
+#     desc - the number of milliseconds Cardamon will wait before running
+#            scenarios
+#     default - 2000 ms
+#     required - false
+#
 # EXAMPLE
 # -------
 # [[process]]
@@ -57,6 +64,7 @@ curve = [7.627190097500079,0.07551567953624883,20.45110313049153,-1.526142275974
 # redirect.to = "file"
 # process.type = "docker"
 # process.containers = ["postgres"]
+# startup_grace = 4000
 
 [[process]]
 name = "test_proc"
@@ -135,4 +143,4 @@ processes = ["test_proc"]
 #
 [[observation]]
 name = "test_obs"
-scenarios = ["sleep"]
+scenarios = ["sleep"]

src/config.rs

@@ -4,8 +4,9 @@ use serde::{Deserialize, Serialize};
 use std::{
     collections::HashSet,
     fs::{self, File},
-    io::{Read, Write},
+    io::{Read, Write}, time::Duration,
 };
+use duration_str::deserialize_option_duration;
 
 #[cfg(not(windows))]
 static EXAMPLE_CONFIG: &str = include_str!("templates/cardamon.unix.toml");
@@ -215,6 +216,9 @@ pub struct Process {
     pub redirect: Option<Redirect>,
     #[serde(rename = "process")]
     pub process_type: ProcessType,
+    #[serde(deserialize_with = "deserialize_option_duration")]
+    #[serde(default)]
+    pub startup_grace: Option<Duration>,
 }
 
 #[derive(Debug, Deserialize, PartialEq, Serialize)]

src/lib.rs

@@ -567,10 +567,18 @@ pub async fn run<'a>(
 ) -> anyhow::Result<DatasetRows> {
     let mut processes_to_observe = exec_plan.external_processes_to_observe.unwrap_or(vec![]); // external procs to observe are cloned here.
 
+    // Set as minimum grace period, keeping it to stay backwards compatibile
+    let mut max_grace_millis = 2000_u64;
     // run the application if there is anything to run
     if !exec_plan.processes_to_execute.is_empty() {
         for proc in exec_plan.processes_to_execute {
             print!("> starting process {}", proc.name.green());
+            if let Some(startup_grace) = proc.startup_grace {
+                let millis = startup_grace.as_millis() as u64;
+                if millis > max_grace_millis {
+                    max_grace_millis = millis;
+                }
+            }
 
             let process_to_observe = run_process(proc)?;
 
@@ -581,9 +589,9 @@ pub async fn run<'a>(
         }
     }
 
-    print!("> waiting for application to settle");
+    print!("> waiting for application to settle: {}ms",max_grace_millis);
     std::io::stdout().flush()?;
-    tokio::time::sleep(tokio::time::Duration::from_millis(2000)).await;
+    tokio::time::sleep(tokio::time::Duration::from_millis(max_grace_millis)).await;
     println!(" {}", "\t✓".green());
 
     let start_time = Utc::now().timestamp_millis();
@@ -810,6 +818,7 @@ pub mod tests {
                 down: None,
                 redirect: Some(Redirect::Null),
                 process_type: ProcessType::BareMetal,
+                startup_grace: None,
             };
             let proc_to_observe = run_process(&proc)?;
 
@@ -843,6 +852,7 @@ pub mod tests {
                 down: None,
                 redirect: Some(Redirect::Null),
                 process_type: ProcessType::BareMetal,
+                startup_grace: None,
             };
             let procs_to_observe = run_process(&proc)?;
             let stop_handle = metrics_logger::start_logging(vec![procs_to_observe])?;

src/templates/cardamon.unix.toml

@@ -44,6 +44,13 @@
 #     default: "file"
 #     required - false
 #
+#   startup_grace:
+#     type - integer
+#     desc - the number of milliseconds Cardamon will wait before running
+#            scenarios
+#     default - 2000 ms
+#     required - false
+#
 # EXAMPLE
 # -------
 # [[process]]

src/templates/cardamon.win.toml

@@ -44,6 +44,13 @@
 #     default: "file"
 #     required - false
 #
+#   startup_grace:
+#     type - integer
+#     desc - the number of milliseconds Cardamon will wait before running
+#            scenarios
+#     default - 2000 ms
+#     required - false
+#
 # EXAMPLE
 # -------
 # [[process]]