fix(go-runner): patch all imports

Author: not-matthias

go-runner/src/builder/patcher.rs

@@ -2,7 +2,7 @@
 
 use crate::prelude::*;
 use std::fs;
-use std::path::{Path, PathBuf};
+use std::path::Path;
 use std::process::Command;
 
 pub fn replace_pkg<P: AsRef<Path>>(folder: P) -> anyhow::Result<()> {
@@ -29,21 +29,19 @@ pub fn replace_pkg<P: AsRef<Path>>(folder: P) -> anyhow::Result<()> {
     Ok(())
 }
 
-pub fn patch_imports<P: AsRef<Path>>(
-    folder: P,
-    files_to_patch: Vec<PathBuf>,
-) -> anyhow::Result<()> {
+pub fn patch_imports<P: AsRef<Path>>(folder: P) -> anyhow::Result<()> {
     let folder = folder.as_ref();
     debug!("Patching imports in folder: {folder:?}");
 
     // 1. Find all imports that match "testing" and replace them with codspeed equivalent
     let mut patched_files = 0;
-    for go_file in files_to_patch {
+
+    let pattern = folder.join("**/*.go");
+    for go_file in glob::glob(pattern.to_str().unwrap())?.filter_map(Result::ok) {
         let content =
             fs::read_to_string(&go_file).context(format!("Failed to read Go file: {go_file:?}"))?;
 
         let patched_content = patch_go_source(&content)?;
-
         if patched_content != content {
             fs::write(&go_file, patched_content)
                 .context(format!("Failed to write patched Go file: {go_file:?}"))?;

go-runner/src/builder/templater.rs

@@ -68,13 +68,8 @@ pub fn run<P: AsRef<Path>>(
     ))?;
     debug!("Relative package path: {relative_package_path:?}");
 
-    // 2. Find benchmark files and patch their imports
-    let files_to_patch = package
-        .benchmarks
-        .iter()
-        .map(|bench| target_dir.path().join(&bench.file_path))
-        .collect::<Vec<_>>();
-    patcher::patch_imports(&target_dir, files_to_patch)?;
+    // 2. Patch the imports of all files with our own versions
+    patcher::patch_imports(&target_dir)?;
 
     // 3. Rename the _test.go files to _codspeed.go
     for file in files {

go-runner/src/integration_tests.rs

@@ -74,6 +74,7 @@ fn assert_results_snapshots(profile_dir: &Path, project_name: &str) {
 #[case::fuego("fuego")]
 #[case::cli_runtime("cli-runtime")]
 #[case::example("example")]
+#[case::example_with_helper("example-with-helper")]
 fn test_build_and_run(#[case] project_name: &str) {
     let project_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR"))
         .join("testdata/projects")

go-runner/src/snapshots/codspeed_go_runner__integration_tests__assert_results_snapshots@example-with-helper.snap

@@ -0,0 +1,29 @@
+---
+source: go-runner/src/integration_tests.rs
+expression: results
+---
+[
+  {
+    "creator": {
+      "name": "codspeed-go",
+      "version": "[version]",
+      "pid": "[pid]"
+    },
+    "instrument": {
+      "type": "walltime"
+    },
+    "benchmarks": [
+      {
+        "name": "BenchmarkFib",
+        "uri": "go-runner/testdata/projects/example-with-helper/fib_test.go::BenchmarkFib",
+        "config": {
+          "warmup_time_ns": null,
+          "min_round_time_ns": null,
+          "max_time_ns": null,
+          "max_rounds": null
+        },
+        "stats": "[stats]"
+      }
+    ]
+  }
+]