refactor(runner): pass extra env via config instead of unsafe set_var

Replace the `unsafe { std::env::set_var }` call for CODSPEED_MEMTRACK_BINARIES
with a generic `extra_env` HashMap on OrchestratorConfig/ExecutorConfig that
gets forwarded to executor subprocesses through the existing env file mechanism.

Author: not-matthias

src/cli/exec/mod.rs

@@ -9,6 +9,7 @@ use crate::project_config::ProjectConfig;
 use crate::project_config::merger::ConfigMerger;
 use crate::upload::poll_results::PollResultsOptions;
 use clap::Args;
+use std::collections::HashMap;
 use std::path::Path;
 use url::Url;
 
@@ -90,6 +91,7 @@ fn build_orchestrator_config(
         go_runner_version: args.shared.go_runner_version,
         show_full_output: args.shared.show_full_output,
         poll_results_options: PollResultsOptions::for_exec(),
+        extra_env: HashMap::new(),
     })
 }
 

src/cli/run/mod.rs

@@ -10,6 +10,7 @@ use crate::project_config::merger::ConfigMerger;
 use crate::run_environment::interfaces::RepositoryProvider;
 use crate::upload::poll_results::PollResultsOptions;
 use clap::{Args, ValueEnum};
+use std::collections::HashMap;
 use std::path::Path;
 use url::Url;
 
@@ -130,6 +131,7 @@ fn build_orchestrator_config(
         go_runner_version: args.shared.go_runner_version,
         show_full_output: args.shared.show_full_output,
         poll_results_options,
+        extra_env: HashMap::new(),
     })
 }
 

src/executor/config.rs

@@ -6,6 +6,7 @@ use crate::runner_mode::RunnerMode;
 use crate::upload::poll_results::PollResultsOptions;
 use clap::ValueEnum;
 use semver::Version;
+use std::collections::HashMap;
 use std::path::PathBuf;
 use url::Url;
 
@@ -76,6 +77,8 @@ pub struct OrchestratorConfig {
     pub show_full_output: bool,
     /// Options controlling post-upload result polling and display
     pub poll_results_options: PollResultsOptions,
+    /// Additional environment variables forwarded to executor subprocesses.
+    pub extra_env: HashMap<String, String>,
 }
 
 /// Per-execution configuration passed to executors.
@@ -103,6 +106,8 @@ pub struct ExecutorConfig {
     pub allow_empty: bool,
     /// The version of go-runner to install (if None, installs latest)
     pub go_runner_version: Option<Version>,
+    /// Additional environment variables forwarded to executor subprocesses.
+    pub extra_env: HashMap<String, String>,
 }
 
 #[derive(Debug, Clone, PartialEq)]
@@ -169,6 +174,7 @@ impl OrchestratorConfig {
             skip_setup: self.skip_setup,
             allow_empty: self.allow_empty,
             go_runner_version: self.go_runner_version.clone(),
+            extra_env: self.extra_env.clone(),
         }
     }
 }
@@ -205,6 +211,7 @@ impl OrchestratorConfig {
             go_runner_version: None,
             show_full_output: false,
             poll_results_options: PollResultsOptions::for_exec(),
+            extra_env: HashMap::new(),
         }
     }
 }

src/executor/helpers/env.rs

@@ -7,7 +7,7 @@ pub fn get_base_injected_env(
     mode: RunnerMode,
     profile_folder: &Path,
     config: &ExecutorConfig,
-) -> HashMap<&'static str, String> {
+) -> HashMap<String, String> {
     let runner_mode_internal_env_value = match mode {
         // While the runner now deprecates the usage of instrumentation with a message, we
         // internally still use instrumentation temporarily to give time to users to upgrade their
@@ -20,31 +20,33 @@ pub fn get_base_injected_env(
         RunnerMode::Memory => "memory",
     };
     let mut env = HashMap::from([
-        ("PYTHONHASHSEED", "0".into()),
+        ("PYTHONHASHSEED".into(), "0".into()),
         (
-            "PYTHON_PERF_JIT_SUPPORT",
+            "PYTHON_PERF_JIT_SUPPORT".into(),
             if mode == RunnerMode::Walltime {
                 "1".into()
             } else {
                 "0".into()
             },
         ),
-        ("ARCH", ARCH.into()),
-        ("CODSPEED_ENV", "runner".into()),
+        ("ARCH".into(), ARCH.into()),
+        ("CODSPEED_ENV".into(), "runner".into()),
         (
-            "CODSPEED_RUNNER_MODE",
+            "CODSPEED_RUNNER_MODE".into(),
             runner_mode_internal_env_value.into(),
         ),
         (
-            "CODSPEED_PROFILE_FOLDER",
+            "CODSPEED_PROFILE_FOLDER".into(),
             profile_folder.to_string_lossy().to_string(),
         ),
     ]);
 
     if let Some(version) = &config.go_runner_version {
-        env.insert("CODSPEED_GO_RUNNER_VERSION", version.to_string());
+        env.insert("CODSPEED_GO_RUNNER_VERSION".into(), version.to_string());
     }
 
+    env.extend(config.extra_env.clone());
+
     env
 }
 

src/executor/helpers/run_with_env.rs

@@ -34,7 +34,7 @@ fn get_exported_system_env() -> Result<String> {
 /// - NamedTempFile is the environment file that must be kept alive until command execution
 pub fn wrap_with_env(
     mut cmd_builder: CommandBuilder,
-    extra_env: &HashMap<&'static str, String>,
+    extra_env: &HashMap<String, String>,
 ) -> Result<(CommandBuilder, NamedTempFile)> {
     let env_file = create_env_file(extra_env)?;
 
@@ -50,7 +50,7 @@ pub fn wrap_with_env(
     Ok((cmd_builder, env_file))
 }
 
-fn create_env_file(extra_env: &HashMap<&'static str, String>) -> Result<NamedTempFile> {
+fn create_env_file(extra_env: &HashMap<String, String>) -> Result<NamedTempFile> {
     let system_env = get_exported_system_env()?;
     let base_injected_env = extra_env
         .iter()

src/executor/wall_time/executor.rs

@@ -104,7 +104,7 @@ impl WallTimeExecutor {
             &execution_context.profile_folder,
             &execution_context.config,
         );
-        extra_env.insert("PATH", path_value);
+        extra_env.insert("PATH".into(), path_value);
 
         // We have to write the benchmark command to a script, to ensure proper formatting
         // and to not have to manually escape everything.