From 4a744ff313b7b23b310d6ac9ea2f514af5f5071d Mon Sep 17 00:00:00 2001
From: Lucas Abel <22837557+uael@users.noreply.github.com>
Date: Mon, 10 Feb 2025 11:39:59 +0100
Subject: [PATCH] backend: move `bench.rs` from common to worker crate (#5253)

---
 backend/src/monitor.rs                                    | 2 +-
 backend/windmill-common/src/lib.rs                        | 2 --
 backend/{windmill-common => windmill-worker}/src/bench.rs | 8 ++++----
 backend/windmill-worker/src/lib.rs                        | 3 +++
 backend/windmill-worker/src/result_processor.rs           | 2 +-
 backend/windmill-worker/src/worker.rs                     | 2 +-
 backend/windmill-worker/src/worker_flow.rs                | 4 ++--
 7 files changed, 12 insertions(+), 11 deletions(-)
 rename backend/{windmill-common => windmill-worker}/src/bench.rs (99%)

diff --git a/backend/src/monitor.rs b/backend/src/monitor.rs
index aecefbff9f..a3f117721f 100644
--- a/backend/src/monitor.rs
+++ b/backend/src/monitor.rs
@@ -1713,7 +1713,7 @@ async fn handle_zombie_jobs(db: &Pool<Postgres>, base_internal_url: &str, worker
             worker_name,
             send_result_never_used,
             #[cfg(feature = "benchmark")]
-            &mut windmill_common::bench::BenchmarkIter::new(),
+            &mut windmill_worker::bench::BenchmarkIter::new(),
         )
         .await;
     }
diff --git a/backend/windmill-common/src/lib.rs b/backend/windmill-common/src/lib.rs
index 4bf68f59f9..802af6196b 100644
--- a/backend/windmill-common/src/lib.rs
+++ b/backend/windmill-common/src/lib.rs
@@ -19,8 +19,6 @@ use sqlx::{Pool, Postgres};
 
 pub mod apps;
 pub mod auth;
-#[cfg(feature = "benchmark")]
-pub mod bench;
 pub mod cache;
 pub mod db;
 pub mod ee;
diff --git a/backend/windmill-common/src/bench.rs b/backend/windmill-worker/src/bench.rs
similarity index 99%
rename from backend/windmill-common/src/bench.rs
rename to backend/windmill-worker/src/bench.rs
index dafbfdb6e5..5006d5a34c 100644
--- a/backend/windmill-common/src/bench.rs
+++ b/backend/windmill-worker/src/bench.rs
@@ -1,9 +1,9 @@
-use crate::{
+use serde::Serialize;
+use tokio::time::Instant;
+use windmill_common::{
     worker::{write_file, TMP_DIR},
     DB,
 };
-use serde::Serialize;
-use tokio::time::Instant;
 
 #[derive(Serialize)]
 pub struct BenchmarkInfo {
@@ -79,7 +79,7 @@ impl BenchmarkIter {
 }
 
 pub async fn benchmark_init(benchmark_jobs: i32, db: &DB) {
-    use crate::{jobs::JobKind, scripts::ScriptLang};
+    use windmill_common::{jobs::JobKind, scripts::ScriptLang};
 
     let benchmark_kind = std::env::var("BENCHMARK_KIND").unwrap_or("noop".to_string());
 
diff --git a/backend/windmill-worker/src/lib.rs b/backend/windmill-worker/src/lib.rs
index cc34dd72ab..9b77ca840f 100644
--- a/backend/windmill-worker/src/lib.rs
+++ b/backend/windmill-worker/src/lib.rs
@@ -9,6 +9,8 @@ mod snowflake_executor;
 mod ansible_executor;
 mod bash_executor;
 
+#[cfg(feature = "benchmark")]
+pub mod bench;
 mod bun_executor;
 pub mod common;
 mod config;
@@ -38,6 +40,7 @@ mod rust_executor;
 mod worker;
 mod worker_flow;
 mod worker_lockfiles;
+
 pub use worker::*;
 
 pub use result_processor::handle_job_error;
diff --git a/backend/windmill-worker/src/result_processor.rs b/backend/windmill-worker/src/result_processor.rs
index dc99d1aae8..1b7ec63a1c 100644
--- a/backend/windmill-worker/src/result_processor.rs
+++ b/backend/windmill-worker/src/result_processor.rs
@@ -26,7 +26,7 @@ use windmill_common::{
 };
 
 #[cfg(feature = "benchmark")]
-use windmill_common::bench::{BenchmarkInfo, BenchmarkIter};
+use crate::bench::{BenchmarkInfo, BenchmarkIter};
 
 use windmill_queue::{append_logs, get_queued_job, CanceledBy, WrappedError};
 
diff --git a/backend/windmill-worker/src/worker.rs b/backend/windmill-worker/src/worker.rs
index 0f57dc2f10..90b0444901 100644
--- a/backend/windmill-worker/src/worker.rs
+++ b/backend/windmill-worker/src/worker.rs
@@ -146,7 +146,7 @@ use crate::mssql_executor::do_mssql;
 use crate::bigquery_executor::do_bigquery;
 
 #[cfg(feature = "benchmark")]
-use windmill_common::bench::{benchmark_init, BenchmarkInfo, BenchmarkIter};
+use crate::bench::{benchmark_init, BenchmarkInfo, BenchmarkIter};
 
 use windmill_common::add_time;
 
diff --git a/backend/windmill-worker/src/worker_flow.rs b/backend/windmill-worker/src/worker_flow.rs
index e25aa6b8ab..42dd66c217 100644
--- a/backend/windmill-worker/src/worker_flow.rs
+++ b/backend/windmill-worker/src/worker_flow.rs
@@ -11,6 +11,8 @@ use std::sync::atomic::{AtomicUsize, Ordering};
 use std::sync::Arc;
 use std::time::Duration;
 
+#[cfg(feature = "benchmark")]
+use crate::bench::BenchmarkIter;
 use crate::common::{cached_result_path, save_in_cache};
 use crate::js_eval::{eval_timeout, IdContext};
 use crate::{
@@ -30,8 +32,6 @@ use tracing::instrument;
 use uuid::Uuid;
 use windmill_common::add_time;
 use windmill_common::auth::JobPerms;
-#[cfg(feature = "benchmark")]
-use windmill_common::bench::BenchmarkIter;
 use windmill_common::cache::{self, RawData};
 use windmill_common::db::Authed;
 use windmill_common::flow_status::{