refactor: remove the closure argument to poll in favor of polling options

Author: GuillaumeLagrange

src/cli/exec/mod.rs

@@ -7,8 +7,7 @@ use crate::instruments::Instruments;
 use crate::prelude::*;
 use crate::project_config::ProjectConfig;
 use crate::project_config::merger::ConfigMerger;
-use crate::upload::UploadResult;
-use crate::upload::poll_results::{PollResultsOptions, poll_results};
+use crate::upload::poll_results::PollResultsOptions;
 use clap::Args;
 use std::path::Path;
 use url::Url;
@@ -89,6 +88,7 @@ fn build_orchestrator_config(
         skip_setup: args.shared.skip_setup,
         allow_empty: args.shared.allow_empty,
         go_runner_version: args.shared.go_runner_version,
+        poll_results_options: PollResultsOptions::for_exec(),
     })
 }
 
@@ -128,14 +128,7 @@ pub async fn execute_config(
 
     debug!("config: {:#?}", orchestrator.config);
 
-    let poll_opts = PollResultsOptions::for_exec();
-    let poll_results_fn = async |upload_result: &UploadResult| {
-        poll_results(api_client, upload_result, &poll_opts).await
-    };
-
-    orchestrator
-        .execute(setup_cache_dir, poll_results_fn)
-        .await?;
+    orchestrator.execute(setup_cache_dir, api_client).await?;
 
     Ok(())
 }

src/cli/run/mod.rs

@@ -8,8 +8,7 @@ use crate::prelude::*;
 use crate::project_config::ProjectConfig;
 use crate::project_config::merger::ConfigMerger;
 use crate::run_environment::interfaces::RepositoryProvider;
-use crate::upload::UploadResult;
-use crate::upload::poll_results::{PollResultsOptions, poll_results};
+use crate::upload::poll_results::PollResultsOptions;
 use clap::{Args, ValueEnum};
 use std::path::Path;
 use url::Url;
@@ -96,6 +95,7 @@ impl RunArgs {
 fn build_orchestrator_config(
     args: RunArgs,
     targets: Vec<executor::BenchmarkTarget>,
+    poll_results_options: PollResultsOptions,
 ) -> Result<OrchestratorConfig> {
     let instruments = Instruments::try_from(&args)?;
     let modes = args.shared.resolve_modes()?;
@@ -127,6 +127,7 @@ fn build_orchestrator_config(
         skip_setup: args.shared.skip_setup,
         allow_empty: args.shared.allow_empty,
         go_runner_version: args.shared.go_runner_version,
+        poll_results_options,
     })
 }
 
@@ -185,6 +186,7 @@ pub async fn run(
                     command,
                     name: None,
                 }],
+                PollResultsOptions::for_run(output_json),
             )?;
             let orchestrator =
                 executor::Orchestrator::new(config, codspeed_config, api_client).await?;
@@ -194,13 +196,7 @@ pub async fn run(
             }
             debug!("config: {:?}", orchestrator.config);
 
-            let poll_opts = PollResultsOptions::for_run(output_json);
-            let poll_results_fn = async |upload_result: &UploadResult| {
-                poll_results(api_client, upload_result, &poll_opts).await
-            };
-            orchestrator
-                .execute(setup_cache_dir, poll_results_fn)
-                .await?;
+            orchestrator.execute(setup_cache_dir, api_client).await?;
         }
 
         RunTarget::ConfigTargets {
@@ -210,7 +206,8 @@ pub async fn run(
         } => {
             let benchmark_targets =
                 super::exec::multi_targets::build_benchmark_targets(targets, default_walltime)?;
-            let config = build_orchestrator_config(args, benchmark_targets)?;
+            let config =
+                build_orchestrator_config(args, benchmark_targets, PollResultsOptions::for_exec())?;
             super::exec::execute_config(config, api_client, codspeed_config, setup_cache_dir)
                 .await?;
         }

src/executor/config.rs

@@ -3,6 +3,7 @@ use crate::instruments::Instruments;
 use crate::prelude::*;
 use crate::run_environment::RepositoryProvider;
 use crate::runner_mode::RunnerMode;
+use crate::upload::poll_results::PollResultsOptions;
 use clap::ValueEnum;
 use semver::Version;
 use std::path::PathBuf;
@@ -71,6 +72,8 @@ pub struct OrchestratorConfig {
     pub allow_empty: bool,
     /// The version of go-runner to install (if None, installs latest)
     pub go_runner_version: Option<Version>,
+    /// Options controlling post-upload result polling and display
+    pub poll_results_options: PollResultsOptions,
 }
 
 /// Per-execution configuration passed to executors.
@@ -198,6 +201,7 @@ impl OrchestratorConfig {
             skip_setup: false,
             allow_empty: false,
             go_runner_version: None,
+            poll_results_options: PollResultsOptions::for_exec(),
         }
     }
 }

src/executor/orchestrator.rs

@@ -12,6 +12,7 @@ use crate::prelude::*;
 use crate::run_environment::{self, RunEnvironment, RunEnvironmentProvider};
 use crate::runner_mode::RunnerMode;
 use crate::system::{self, SystemInfo};
+use crate::upload::poll_results::poll_results;
 use crate::upload::{UploadResult, upload};
 use serde_json::Value;
 use std::collections::BTreeMap;
@@ -79,10 +80,11 @@ impl Orchestrator {
     /// Each `(command, mode)` pair gets its own profile folder. When the user
     /// specifies `--profile-folder` and there are multiple pairs, deterministic
     /// subdirectories (`<mode>-<index>`) are created under that folder.
-    pub async fn execute<F>(&self, setup_cache_dir: Option<&Path>, poll_results: F) -> Result<()>
-    where
-        F: AsyncFn(&UploadResult) -> Result<()>,
-    {
+    pub async fn execute(
+        &self,
+        setup_cache_dir: Option<&Path>,
+        api_client: &CodSpeedAPIClient,
+    ) -> Result<()> {
         // Build (command, label) pairs while we still know the target type
         let mut command_labels: Vec<(String, String)> = vec![];
 
@@ -170,8 +172,7 @@ impl Orchestrator {
             end_group!();
         }
 
-        self.upload_and_poll(all_completed_runs, &poll_results)
-            .await?;
+        self.upload_and_poll(all_completed_runs, api_client).await?;
 
         Ok(())
     }
@@ -204,14 +205,11 @@ impl Orchestrator {
     }
 
     /// Upload completed runs and poll results.
-    async fn upload_and_poll<F>(
+    async fn upload_and_poll(
         &self,
         mut completed_runs: Vec<(ExecutionContext, ExecutorName)>,
-        poll_results: F,
-    ) -> Result<()>
-    where
-        F: AsyncFn(&UploadResult) -> Result<()>,
-    {
+        api_client: &CodSpeedAPIClient,
+    ) -> Result<()> {
         let skip_upload = self.config.skip_upload;
 
         if !skip_upload {
@@ -220,7 +218,12 @@ impl Orchestrator {
             end_group!();
 
             if self.is_local() {
-                poll_results(&last_upload_result).await?;
+                poll_results(
+                    api_client,
+                    &last_upload_result,
+                    &self.config.poll_results_options,
+                )
+                .await?;
             }
         } else {
             debug!("Skipping upload of performance data");

src/upload/poll_results.rs

@@ -7,6 +7,7 @@ use crate::prelude::*;
 use super::{UploadResult, poll_run_report};
 
 /// Options controlling poll_results display behavior.
+#[derive(Debug, Clone)]
 pub struct PollResultsOptions {
     /// If true, show impact percentage (used by `codspeed run`)
     pub show_impact: bool,