--wip-- [skip ci]

Author: art049

src/app.rs

@@ -1,5 +1,6 @@
 use crate::{
     api_client::CodSpeedAPIClient, auth, local_logger::CODSPEED_U8_COLOR_CODE, prelude::*, run,
+    setup,
 };
 use clap::{
     builder::{styling, Styles},
@@ -37,8 +38,10 @@ pub struct Cli {
 enum Commands {
     /// Run the bench command and upload the results to CodSpeed
     Run(run::RunArgs),
-    /// Commands related to authentication with CodSpeed
+    /// Manage the CLI authentication state
     Auth(auth::AuthArgs),
+    /// Setup the CLI environment
+    Setup(setup::SetupArgs),
 }
 
 pub async fn run() -> Result<()> {
@@ -48,6 +51,7 @@ pub async fn run() -> Result<()> {
     match cli.command {
         Commands::Run(args) => run::run(args, &api_client).await?,
         Commands::Auth(args) => auth::run(args, &api_client).await?,
+        Commands::Setup(args) => setup::setup(args).await?,
     }
     Ok(())
 }

src/main.rs

@@ -7,6 +7,7 @@ mod logger;
 mod prelude;
 mod request_client;
 mod run;
+mod setup;
 
 use console::style;
 use lazy_static::lazy_static;

src/run/instruments/mod.rs

@@ -78,6 +78,10 @@ impl Instruments {
     }
 }
 
+trait Instrument {
+    async fn setup(&self) -> Result<()>;
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;

src/run/instruments/mongo_tracer.rs

@@ -1,4 +1,5 @@
 use std::{
+    env::temp_dir,
     io::Read,
     path::{Path, PathBuf},
     process::{Child, Command, Stdio},
@@ -13,7 +14,7 @@ use url::Url;
 use crate::prelude::*;
 use crate::run::helpers::get_env_variable;
 
-use super::MongoDBConfig;
+use super::{Instrument, MongoDBConfig};
 
 #[derive(Debug, PartialEq, Eq)]
 pub struct UserInput {
@@ -30,6 +31,39 @@ pub struct MongoTracer {
     user_input: Option<UserInput>,
 }
 
+impl Instrument for MongoTracer {
+    async fn setup(&self) -> Result<()> {
+        install_mongodb_tracer().await
+    }
+}
+
+async fn install_mongodb_tracer() -> Result<()> {
+    debug!("Installing mongodb-tracer");
+    // TODO: release the tracer and update this url
+    let installer_url = format!("https://codspeed-public-assets.s3.eu-west-1.amazonaws.com/mongo-tracer/{MONGODB_TRACER_VERSION}/cs-mongo-tracer-installer.sh");
+    let installer_path = temp_dir().join("cs-mongo-tracer-installer.sh");
+    download_file(
+        &Url::parse(installer_url.as_str()).unwrap(),
+        &installer_path,
+    )
+    .await?;
+
+    let output = Command::new("bash")
+        .arg(installer_path.to_str().unwrap())
+        .stdout(Stdio::piped())
+        .stderr(Stdio::piped())
+        .output()
+        .map_err(|_| anyhow!("Failed to install mongo-tracer"))?;
+
+    if !output.status.success() {
+        info!("stdout: {}", String::from_utf8_lossy(&output.stdout));
+        error!("stderr: {}", String::from_utf8_lossy(&output.stderr));
+        bail!("Failed to install mongo-tracer");
+    }
+
+    Ok(())
+}
+
 /// TODO: This implementation is not optimal: full lines might get split in multiple chunks.
 /// This is not a problem for the current use case, as the tracer will be directly invoked as a .so library in the future,
 /// inheriting the current process' stdout/stderr.
@@ -44,7 +78,6 @@ fn dump_tracer_log(mut stream: impl Read) -> Result<()> {
         let buf = &buf[..num_read];
         debug!("[MONGO TRACER LOGS] {}", String::from_utf8_lossy(buf));
     }
-
     Ok(())
 }
 

src/run/mod.rs

@@ -10,7 +10,7 @@ use run_environment::interfaces::RunEnvironment;
 use runner::get_run_data;
 
 mod check_system;
-mod helpers;
+pub mod helpers;
 mod instruments;
 mod poll_results;
 pub mod run_environment;
@@ -120,14 +120,15 @@ pub async fn run(args: RunArgs, api_client: &CodSpeedAPIClient) -> Result<()> {
     let mode = runner::get_mode()?;
     let executor = runner::get_executor_from_mode(mode);
 
-    let run_data = get_run_data()?;
-
     if !config.skip_setup {
         start_group!("Preparing the environment");
-        executor.setup(&config, &system_info, &run_data).await?;
+        executor.setup(&system_info).await?;
+        info!("Environment ready");
         end_group!();
     }
 
+    let run_data = get_run_data()?;
+
     start_opened_group!("Running the benchmarks");
 
     // TODO: refactor and move directly in the Instruments struct as a `start` method

src/run/runner/executor.rs

@@ -8,12 +8,9 @@ use async_trait::async_trait;
 pub trait Executor {
     fn name(&self) -> ExecutorName;
 
-    async fn setup(
-        &self,
-        config: &Config,
-        system_info: &SystemInfo,
-        run_data: &RunData,
-    ) -> Result<()>;
+    async fn setup(&self, _system_info: &SystemInfo) -> Result<()> {
+        Ok(())
+    }
 
     /// Runs the executor
     async fn run(

src/run/runner/mod.rs

@@ -60,6 +60,10 @@ pub fn get_executor_from_mode(mode: RunnerMode) -> Box<dyn Executor> {
     }
 }
 
+pub fn get_all_executors() -> Vec<Box<dyn Executor>> {
+    vec![Box::new(ValgrindExecutor), Box::new(WallTimeExecutor)]
+}
+
 pub fn get_run_data() -> Result<RunData> {
     let profile_folder = create_profile_folder()?;
     Ok(RunData { profile_folder })

src/run/runner/valgrind/executor.rs

@@ -6,7 +6,8 @@ use crate::run::runner::executor::Executor;
 use crate::run::runner::{ExecutorName, RunData};
 use crate::run::{check_system::SystemInfo, config::Config};
 
-use super::{helpers::perf_maps::harvest_perf_maps, measure, setup::setup};
+use super::setup::install_valgrind;
+use super::{helpers::perf_maps::harvest_perf_maps, measure};
 
 pub struct ValgrindExecutor;
 
@@ -16,14 +17,8 @@ impl Executor for ValgrindExecutor {
         ExecutorName::Valgrind
     }
 
-    async fn setup(
-        &self,
-        config: &Config,
-        system_info: &SystemInfo,
-        _run_data: &RunData,
-    ) -> Result<()> {
-        setup(system_info, config).await?;
-
+    async fn setup(&self, system_info: &SystemInfo) -> Result<()> {
+        install_valgrind(system_info).await?;
         Ok(())
     }
 

src/run/runner/valgrind/mod.rs

@@ -1,4 +1,4 @@
 pub mod executor;
-mod helpers;
+pub mod helpers;
 mod measure;
 mod setup;

src/run/runner/valgrind/setup.rs

@@ -83,7 +83,7 @@ fn is_valgrind_installed() -> bool {
     }
 }
 
-async fn install_valgrind(system_info: &SystemInfo) -> Result<()> {
+pub async fn install_valgrind(system_info: &SystemInfo) -> Result<()> {
     if is_valgrind_installed() {
         debug!("Valgrind is already installed with the correct version, skipping installation");
         return Ok(());
@@ -109,44 +109,6 @@ async fn install_valgrind(system_info: &SystemInfo) -> Result<()> {
     Ok(())
 }
 
-async fn install_mongodb_tracer() -> Result<()> {
-    debug!("Installing mongodb-tracer");
-    // TODO: release the tracer and update this url
-    let installer_url = format!("https://codspeed-public-assets.s3.eu-west-1.amazonaws.com/mongo-tracer/{MONGODB_TRACER_VERSION}/cs-mongo-tracer-installer.sh");
-    let installer_path = env::temp_dir().join("cs-mongo-tracer-installer.sh");
-    download_file(
-        &Url::parse(installer_url.as_str()).unwrap(),
-        &installer_path,
-    )
-    .await?;
-
-    let output = Command::new("bash")
-        .arg(installer_path.to_str().unwrap())
-        .stdout(Stdio::piped())
-        .output()
-        .map_err(|_| anyhow!("Failed to install mongo-tracer"))?;
-
-    if !output.status.success() {
-        info!("stdout: {}", String::from_utf8_lossy(&output.stdout));
-        error!("stderr: {}", String::from_utf8_lossy(&output.stderr));
-        bail!("Failed to install mongo-tracer");
-    }
-
-    Ok(())
-}
-
-pub async fn setup(system_info: &SystemInfo, config: &Config) -> Result<()> {
-    install_valgrind(system_info).await?;
-
-    // TODO: move into setup of the Instruments struct
-    if config.instruments.is_mongodb_enabled() {
-        install_mongodb_tracer().await?;
-    }
-
-    info!("Environment ready");
-    Ok(())
-}
-
 #[cfg(test)]
 mod tests {
     use insta::assert_snapshot;