From c10bf76d70aed7af036a71a80797540d36dabf0d Mon Sep 17 00:00:00 2001 From: fargito Date: Mon, 19 Jan 2026 15:33:56 +0100 Subject: [PATCH] fix(upload): simplify `run_part_id` computation --- src/run/run_index_state.rs | 2 +- src/run_environment/provider.rs | 27 ++++++++++++--------------- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/src/run/run_index_state.rs b/src/run/run_index_state.rs index 64da373e..6e5884c5 100644 --- a/src/run/run_index_state.rs +++ b/src/run/run_index_state.rs @@ -36,7 +36,7 @@ impl RunIndexState { .join(".codspeed") .join("run-state") .join(run_id) - .join(format!("{}.json", &run_part_id_hash[..16])); + .join(format!("{run_part_id_hash}.json")); Self { state_file_path } } diff --git a/src/run_environment/provider.rs b/src/run_environment/provider.rs index f6b3075e..c9e47add 100644 --- a/src/run_environment/provider.rs +++ b/src/run_environment/provider.rs @@ -100,23 +100,20 @@ pub trait RunEnvironmentProvider { // Apply run index suffix to run_part if applicable. // This differentiates multiple uploads within the same CI job execution // (e.g., running both simulation and memory benchmarks in the same job). - let run_part = match self.get_run_provider_run_part() { - Some(run_part) => { - let run_index_state = RunIndexState::new( - &run_environment_metadata.repository_root_path, - &run_part.run_id, - &run_part.run_part_id, - ); - match run_index_state.get_and_increment() { - Ok(run_index) => Some(run_part.with_run_index(run_index)), - Err(e) => { - warn!("Failed to track run index: {e}. Continuing with index 0."); - Some(run_part.with_run_index(0)) - } + let run_part = self.get_run_provider_run_part().map(|run_part| { + let run_index_state = RunIndexState::new( + &run_environment_metadata.repository_root_path, + &run_part.run_id, + &run_part.run_part_id, + ); + match run_index_state.get_and_increment() { + Ok(run_index) => run_part.with_run_index(run_index), + Err(e) => { + warn!("Failed to track run index: {e}. Continuing with index 0."); + run_part.with_run_index(0) } } - None => None, - }; + }); Ok(UploadMetadata { version: Some(LATEST_UPLOAD_METADATA_VERSION),