fixup: use env file

Author: not-matthias

src/run/runner/helpers/env.rs

@@ -17,3 +17,12 @@ pub fn get_base_injected_env(
         ),
     ])
 }
+
+pub fn is_codspeed_debug_enabled() -> bool {
+    let log_level = std::env::var("CODSPEED_LOG")
+        .ok()
+        .and_then(|log_level| log_level.parse::<log::LevelFilter>().ok())
+        .unwrap_or(log::LevelFilter::Info);
+
+    log_level < log::LevelFilter::Debug
+}

src/run/runner/wall_time/executor.rs

@@ -3,14 +3,15 @@ use crate::prelude::*;
 use crate::run::RunnerMode;
 use crate::run::instruments::mongo_tracer::MongoTracer;
 use crate::run::runner::executor::Executor;
-use crate::run::runner::helpers::env::get_base_injected_env;
+use crate::run::runner::helpers::env::{get_base_injected_env, is_codspeed_debug_enabled};
 use crate::run::runner::helpers::get_bench_command::get_bench_command;
 use crate::run::runner::helpers::run_command_with_log_pipe::run_command_with_log_pipe;
 use crate::run::runner::{ExecutorName, RunData};
 use crate::run::{check_system::SystemInfo, config::Config};
 use async_trait::async_trait;
 use std::fs::canonicalize;
 use std::process::Command;
+use tempfile::NamedTempFile;
 
 pub struct WallTimeExecutor {
     perf: Option<PerfRunner>,
@@ -23,24 +24,37 @@ impl WallTimeExecutor {
         }
     }
 
-    fn walltime_bench_cmd(config: &Config, run_data: &RunData) -> Result<String> {
+    fn walltime_bench_cmd(config: &Config, run_data: &RunData) -> Result<(NamedTempFile, String)> {
         let bench_cmd = get_bench_command(config)?;
 
-        // We have to forward all the environment variables.
         let system_env = std::env::vars()
-            .map(|(env, value)| format!("--setenv={env}=\'{}\'", value.replace("'", "\"")))
-            .join(" ");
+            .map(|(env, value)| format!("{env}={value}"))
+            .join("\n");
 
-        let setenv = get_base_injected_env(RunnerMode::Walltime, &run_data.profile_folder)
+        let base_env = get_base_injected_env(RunnerMode::Walltime, &run_data.profile_folder)
             .into_iter()
-            .map(|(env, value)| format!("--setenv={env}={value}"))
-            .join(" ");
+            .map(|(env, value)| format!("{env}={value}"))
+            .join("\n");
+
+        // Store the environment variables in a file which we forward to the command.
+        let env_file = NamedTempFile::new()?;
+        std::fs::write(&env_file, format!("{system_env}\n{base_env}"))?;
+
         let uid = nix::unistd::Uid::current().as_raw();
         let gid = nix::unistd::Gid::current().as_raw();
-        Ok(format!(
-            "systemd-run --scope --slice=codspeed.slice --same-dir --uid={uid} --gid={gid} {system_env} {setenv} -- sh -c '{}'",
+
+        let quiet_flag = if is_codspeed_debug_enabled() {
+            "--quiet"
+        } else {
+            ""
+        };
+
+        let cmd = format!(
+            "systemd-run {quiet_flag} --pipe --collect --wait --slice=codspeed.slice --same-dir --uid={uid} --gid={gid} --property=EnvironmentFile={} -- sh -c '{}'",
+            env_file.path().display(),
             bench_cmd.replace("'", "\"")
-        ))
+        );
+        Ok((env_file, cmd))
     }
 }
 
@@ -72,7 +86,7 @@ impl Executor for WallTimeExecutor {
             cmd.current_dir(abs_cwd);
         }
 
-        let bench_cmd = Self::walltime_bench_cmd(config, run_data)?;
+        let (_env_file, bench_cmd) = Self::walltime_bench_cmd(config, run_data)?;
 
         let status = if let Some(perf) = &self.perf
             && config.enable_perf

src/run/runner/wall_time/perf/mod.rs

@@ -3,6 +3,7 @@
 use crate::prelude::*;
 use crate::run::UnwindingMode;
 use crate::run::config::Config;
+use crate::run::runner::helpers::env::is_codspeed_debug_enabled;
 use crate::run::runner::helpers::run_command_with_log_pipe::run_command_with_log_pipe_and_callback;
 use crate::run::runner::helpers::setup::run_with_sudo;
 use crate::run::runner::valgrind::helpers::ignored_objects_path::get_objects_path_to_ignore;
@@ -157,17 +158,10 @@ impl PerfRunner {
         };
         debug!("Using call graph mode: {cg_mode:?}");
 
-        let quiet_flag = {
-            let log_level = std::env::var("CODSPEED_LOG")
-                .ok()
-                .and_then(|log_level| log_level.parse::<log::LevelFilter>().ok())
-                .unwrap_or(log::LevelFilter::Info);
-
-            if log_level < log::LevelFilter::Debug {
-                "--quiet"
-            } else {
-                ""
-            }
+        let quiet_flag = if is_codspeed_debug_enabled() {
+            "--quiet"
+        } else {
+            ""
         };
 
         cmd.args([