fixup! feat(walltime): bundle samply via library crate

Author: not-matthias

src/executor/wall_time/profiler/mod.rs

@@ -10,6 +10,14 @@ pub mod samply;
 
 const WALLTIME_METADATA_CURRENT_VERSION: u64 = 1;
 
+/// Sampling rate (Hz) shared by all walltime profilers. A prime number to
+/// avoid synchronization with periodic tasks.
+pub(super) const SAMPLING_RATE_HZ: u32 = 997;
+
+/// Warning shown when walltime profiling ran but no benchmarks were detected.
+pub(super) const NO_BENCHMARKS_DETECTED_WARNING: &str = "Walltime profiling is enabled, but failed to detect benchmarks. \
+     If you wish to disable this warning, set CODSPEED_PROFILER_ENABLED=false";
+
 use crate::executor::ExecutorConfig;
 use crate::executor::ToolStatus;
 use crate::executor::helpers::command::CommandBuilder;

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

@@ -10,7 +10,9 @@ use crate::executor::helpers::env::suppress_go_perf_unwinding_warning;
 use crate::executor::helpers::harvest_perf_maps_for_pids::harvest_perf_maps_for_pids;
 use crate::executor::helpers::run_with_sudo::wrap_with_sudo;
 use crate::executor::shared::fifo::FifoBenchmarkData;
+use crate::executor::wall_time::profiler::NO_BENCHMARKS_DETECTED_WARNING;
 use crate::executor::wall_time::profiler::Profiler;
+use crate::executor::wall_time::profiler::SAMPLING_RATE_HZ;
 use crate::executor::wall_time::profiler::WALLTIME_METADATA_CURRENT_VERSION;
 use crate::executor::wall_time::profiler::linux_sysctl::ensure_linux_profiling_sysctls;
 use crate::executor::wall_time::profiler::perf::perf_executable::get_working_perf_executable;
@@ -146,7 +148,7 @@ impl Profiler for PerfProfiler {
             // Required for matching the markers and URIs to the samples.
             "-k",
             "CLOCK_MONOTONIC",
-            "--freq=997", // Use a prime number to avoid synchronization with periodic tasks
+            &format!("--freq={SAMPLING_RATE_HZ}"),
             "--delay=-1",
             "-g",
             "--user-callchains",
@@ -219,9 +221,7 @@ impl Profiler for PerfProfiler {
         if let Err(BenchmarkDataSaveError::MissingIntegration) =
             bench_data.save_to(profile_folder, perf_file_path).await
         {
-            warn!(
-                "Perf is enabled, but failed to detect benchmarks. If you wish to disable this warning, set CODSPEED_PROFILER_ENABLED=false"
-            );
+            warn!("{NO_BENCHMARKS_DETECTED_WARNING}");
             return Ok(());
         }
 

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

@@ -14,10 +14,11 @@ use runner_shared::metadata::WalltimeMetadata;
 use std::path::Path;
 use std::path::PathBuf;
 
+use super::NO_BENCHMARKS_DETECTED_WARNING;
+use super::SAMPLING_RATE_HZ;
 use super::WALLTIME_METADATA_CURRENT_VERSION;
 
 const SAMPLY_OUTPUT_FILE_NAME: &str = "samply-profile.json.gz";
-const SAMPLY_RATE_HZ: &str = "997";
 
 pub struct SamplyProfiler {
     /// Set by [`Profiler::wrap_command`]. Currently unused after `wrap_command`
@@ -62,7 +63,7 @@ impl Profiler for SamplyProfiler {
             "--no-open",
             "--save-only",
             "--rate",
-            SAMPLY_RATE_HZ,
+            &SAMPLING_RATE_HZ.to_string(),
         ]);
         samply_builder.arg("-o");
         samply_builder.arg(&output_path);
@@ -80,9 +81,7 @@ impl Profiler for SamplyProfiler {
         profile_folder: &Path,
     ) -> anyhow::Result<()> {
         let Some(integration) = fifo_data.integration.clone() else {
-            warn!(
-                "Walltime profiling is enabled, but failed to detect benchmarks. If you wish to disable this warning, set CODSPEED_PROFILER_ENABLED=false"
-            );
+            warn!("{NO_BENCHMARKS_DETECTED_WARNING}");
             return Ok(());
         };