fixup! feat(walltime): add Profiler trait abstraction

Author: not-matthias

src/executor/wall_time/executor.rs

@@ -214,7 +214,9 @@ async fn run_with_profiler(
     config: &ExecutorConfig,
     profile_folder: &Path,
 ) -> Result<std::process::ExitStatus> {
-    let wrapped = profiler.wrap(cmd_builder, config, profile_folder).await?;
+    let wrapped = profiler
+        .wrap_command(cmd_builder, config, profile_folder)
+        .await?;
     let cmd = wrapped.build();
     debug!("cmd: {cmd:?}");
 

src/executor/wall_time/profiler/mod.rs

@@ -38,7 +38,7 @@ pub trait Profiler {
     /// `CommandBuilder` is what gets spawned. Profilers stash any live state
     /// they need for the duration of the run (control fifos, output paths)
     /// on `self`.
-    async fn wrap(
+    async fn wrap_command(
         &mut self,
         cmd: CommandBuilder,
         config: &ExecutorConfig,

src/executor/wall_time/profiler/perf/mod.rs

@@ -45,12 +45,12 @@ pub mod perf_executable;
 const PERF_PIPEDATA_FILE_NAME: &str = "perf.pipedata";
 
 pub struct PerfProfiler {
-    /// Set by [`Profiler::wrap`]; used by the FIFO hooks to control event
+    /// Set by [`Profiler::wrap_command`]; used by the FIFO hooks to control event
     /// recording on the live `perf record` process.
     perf_fifo: Option<PerfFifo>,
 
     /// Path to the file that the wrapped command pipes `perf record`'s
-    /// stdout into. Set by [`Profiler::wrap`]; consumed by [`Profiler::finalize`].
+    /// stdout into. Set by [`Profiler::wrap_command`]; consumed by [`Profiler::finalize`].
     perf_file_path: Option<PathBuf>,
 }
 
@@ -65,7 +65,7 @@ impl PerfProfiler {
     fn perf_fifo_mut(&mut self) -> anyhow::Result<&mut PerfFifo> {
         self.perf_fifo
             .as_mut()
-            .context("PerfProfiler::wrap must be called before FIFO hooks")
+            .context("PerfProfiler::wrap_command must be called before FIFO hooks")
     }
 }
 
@@ -84,7 +84,7 @@ impl Profiler for PerfProfiler {
         ensure_linux_profiling_sysctls()
     }
 
-    async fn wrap(
+    async fn wrap_command(
         &mut self,
         mut cmd_builder: CommandBuilder,
         config: &ExecutorConfig,
@@ -208,7 +208,7 @@ impl Profiler for PerfProfiler {
         let perf_file_path = self
             .perf_file_path
             .as_ref()
-            .context("PerfProfiler::wrap must be called before finalize")?;
+            .context("PerfProfiler::wrap_command must be called before finalize")?;
 
         let bench_data = BenchmarkData {
             fifo_data,

src/executor/wall_time/profiler/samply/mod.rs

@@ -20,8 +20,8 @@ const SAMPLY_OUTPUT_FILE_NAME: &str = "samply-profile.json.gz";
 const SAMPLY_RATE_HZ: &str = "997";
 
 pub struct SamplyProfiler {
-    /// Set by [`Profiler::wrap`]. Currently unused after `wrap` returns —
-    /// samply writes the file itself — but we hold onto it so future
+    /// Set by [`Profiler::wrap_command`]. Currently unused after `wrap_command`
+    /// returns — samply writes the file itself — but we hold onto it so future
     /// `finalize` work (e.g. validation, conversion) has the path on hand.
     output_path: Option<PathBuf>,
 }
@@ -42,7 +42,7 @@ impl Profiler for SamplyProfiler {
         ensure_linux_profiling_sysctls()
     }
 
-    async fn wrap(
+    async fn wrap_command(
         &mut self,
         mut cmd_builder: CommandBuilder,
         _config: &ExecutorConfig,