feat: automatically install exec-harness for exec subcommand

Author: GuillaumeLagrange

crates/exec-harness/src/main.rs

@@ -12,7 +12,10 @@ mod walltime;
 
 #[derive(Parser, Debug)]
 #[command(name = "exec-harness")]
-#[command(about = "CodSpeed exec harness - wraps commands with performance instrumentation")]
+#[command(
+    version,
+    about = "CodSpeed exec harness - wraps commands with performance instrumentation"
+)]
 struct Args {
     /// Optional benchmark name (defaults to command filename)
     #[arg(long)]

src/exec/mod.rs

@@ -1,4 +1,5 @@
 use crate::api_client::CodSpeedAPIClient;
+use crate::binary_installer::ensure_binary_installed;
 use crate::config::CodSpeedConfig;
 use crate::executor;
 use crate::prelude::*;
@@ -10,6 +11,9 @@ mod poll_results;
 /// We temporarily force this name for all exec runs
 pub const DEFAULT_REPOSITORY_NAME: &str = "local-runs";
 
+pub const EXEC_HARNESS_COMMAND: &str = "exec-harness";
+const EXEC_HARNESS_VERSION: &str = env!("CARGO_PKG_VERSION");
+
 #[derive(Args, Debug)]
 pub struct ExecArgs {
     #[command(flatten)]
@@ -31,11 +35,15 @@ pub async fn run(
 ) -> Result<()> {
     let config = crate::executor::Config::try_from(args)?;
     let mut execution_context = executor::ExecutionContext::try_from((config, codspeed_config))?;
+    debug!("config: {:#?}", execution_context.config);
     let executor = executor::get_executor_from_mode(
         &execution_context.config.mode,
         executor::ExecutorCommand::Exec,
     );
 
+    // Ensure the exec-harness is installed
+    ensure_binary_installed(EXEC_HARNESS_COMMAND, EXEC_HARNESS_VERSION, None).await?;
+
     let poll_results_fn = |run_id: String| poll_results::poll_results(api_client, run_id);
 
     executor::execute_benchmarks(

src/executor/config.rs

@@ -1,4 +1,4 @@
-use crate::exec::DEFAULT_REPOSITORY_NAME;
+use crate::exec::{DEFAULT_REPOSITORY_NAME, EXEC_HARNESS_COMMAND};
 use crate::instruments::Instruments;
 use crate::prelude::*;
 use crate::run::{RunArgs, UnwindingMode};
@@ -141,7 +141,7 @@ impl TryFrom<crate::exec::ExecArgs> for Config {
             .map_err(|_| anyhow!("Cannot append to upload URL"))?
             .push("project");
 
-        let wrapped_command = std::iter::once("exec-harness".to_string())
+        let wrapped_command = std::iter::once(EXEC_HARNESS_COMMAND.to_owned())
             .chain(args.command)
             .collect::<Vec<String>>()
             .join(" ");

src/executor/memory/executor.rs

@@ -30,11 +30,7 @@ impl MemoryExecutor {
     ) -> Result<(MemtrackIpcServer, CommandBuilder)> {
         // FIXME: We only support native languages for now
 
-        // Find memtrack binary - check env variable or use default command name
-        let memtrack_path = std::env::var("CODSPEED_MEMTRACK_BINARY")
-            .unwrap_or_else(|_| "codspeed-memtrack".to_string());
-
-        let mut cmd_builder = CommandBuilder::new(memtrack_path);
+        let mut cmd_builder = CommandBuilder::new(MEMTRACK_COMMAND);
         cmd_builder.arg("track");
         cmd_builder.arg(get_bench_command(&execution_context.config)?);
         cmd_builder.arg("--output");