refactor(bench): remove TestServer startup capability (#2611)

hubcio · web-flow · commit e46f294b7af4 · 2026-01-26T15:40:15.000+01:00
The integration crate dependency existed solely for TestServer
functionality that was never used in practice - users always
run iggy-server separately before benchmarking.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/core/bench/Cargo.toml b/core/bench/Cargo.toml
@@ -29,8 +29,6 @@ readme = "../../README.md"
 [[bin]]
 name = "iggy-bench"
 path = "src/main.rs"
-# Due to dependency to integration, which has a dependency to server, setting
-# mimalloc on server is also setting it on bench.
 
 [dependencies]
 async-trait = { workspace = true }
@@ -45,14 +43,12 @@ governor = "0.10.4"
 hostname = "0.4.2"
 human-repr = { workspace = true }
 iggy = { workspace = true }
-integration = { workspace = true }
 nonzero_lit = { workspace = true }
 rand = { workspace = true }
 rayon = "1.11.0"
 serde = { workspace = true }
 sysinfo = { workspace = true }
 tokio = { workspace = true }
-toml = { workspace = true }
 tracing = { workspace = true }
 tracing-appender = { workspace = true }
 tracing-subscriber = { workspace = true }
diff --git a/core/bench/src/actors/consumer/client/high_level.rs b/core/bench/src/actors/consumer/client/high_level.rs
@@ -24,9 +24,9 @@ use crate::actors::{
     },
 };
 
+use crate::utils::{ClientFactory, login_root};
 use futures_util::StreamExt;
 use iggy::prelude::*;
-use integration::test_server::{ClientFactory, login_root};
 use std::{sync::Arc, time::Duration};
 use tokio::time::{Instant, timeout};
 use tracing::{error, warn};
diff --git a/core/bench/src/actors/consumer/client/low_level.rs b/core/bench/src/actors/consumer/client/low_level.rs
@@ -20,9 +20,9 @@ use crate::actors::consumer::client::BenchmarkConsumerClient;
 use crate::actors::consumer::client::interface::{BenchmarkConsumerConfig, ConsumerClient};
 use crate::actors::{ApiLabel, BatchMetrics, BenchmarkInit};
 use crate::benchmarks::common::create_consumer;
+use crate::utils::{ClientFactory, login_root};
 use crate::utils::{batch_total_size_bytes, batch_user_size_bytes};
 use iggy::prelude::*;
-use integration::test_server::{ClientFactory, login_root};
 use std::sync::Arc;
 use std::time::Duration;
 use tokio::time::Instant;
diff --git a/core/bench/src/actors/consumer/typed_benchmark_consumer.rs b/core/bench/src/actors/consumer/typed_benchmark_consumer.rs
@@ -18,6 +18,7 @@
 
 use std::sync::Arc;
 
+use crate::utils::ClientFactory;
 use crate::{
     actors::consumer::{
         BenchmarkConsumer,
@@ -33,7 +34,6 @@ use bench_report::{
     numeric_parameter::BenchmarkNumericParameter,
 };
 use iggy::prelude::*;
-use integration::test_server::ClientFactory;
 
 pub enum TypedBenchmarkConsumer {
     High(BenchmarkConsumer<HighLevelConsumerClient>),
diff --git a/core/bench/src/actors/producer/client/high_level.rs b/core/bench/src/actors/producer/client/high_level.rs
@@ -16,6 +16,7 @@
  * under the License.
  */
 
+use crate::utils::{ClientFactory, login_root};
 use crate::{
     actors::{
         ApiLabel, BatchMetrics, BenchmarkInit,
@@ -27,7 +28,6 @@ use crate::{
     utils::batch_generator::BenchmarkBatchGenerator,
 };
 use iggy::prelude::*;
-use integration::test_server::{ClientFactory, login_root};
 use std::sync::Arc;
 use tokio::time::Instant;
 
diff --git a/core/bench/src/actors/producer/client/low_level.rs b/core/bench/src/actors/producer/client/low_level.rs
@@ -18,6 +18,7 @@
 
 use std::sync::Arc;
 
+use crate::utils::{ClientFactory, login_root};
 use crate::{
     actors::{
         ApiLabel, BatchMetrics, BenchmarkInit,
@@ -29,7 +30,6 @@ use crate::{
     utils::batch_generator::BenchmarkBatchGenerator,
 };
 use iggy::prelude::*;
-use integration::test_server::{ClientFactory, login_root};
 use tokio::time::Instant;
 
 pub struct LowLevelProducerClient {
diff --git a/core/bench/src/actors/producer/typed_benchmark_producer.rs b/core/bench/src/actors/producer/typed_benchmark_producer.rs
@@ -16,6 +16,7 @@
  * under the License.
  */
 
+use crate::utils::ClientFactory;
 use crate::{
     actors::producer::{
         BenchmarkProducer,
@@ -31,7 +32,6 @@ use bench_report::{
     numeric_parameter::BenchmarkNumericParameter,
 };
 use iggy::prelude::*;
-use integration::test_server::ClientFactory;
 use std::sync::Arc;
 
 pub enum TypedBenchmarkProducer {
diff --git a/core/bench/src/actors/producing_consumer/typed_banchmark_producing_consumer.rs b/core/bench/src/actors/producing_consumer/typed_banchmark_producing_consumer.rs
@@ -18,6 +18,7 @@
 
 use std::sync::Arc;
 
+use crate::utils::ClientFactory;
 use crate::{
     actors::{
         consumer::client::{
@@ -38,7 +39,6 @@ use bench_report::{
 };
 
 use iggy::prelude::*;
-use integration::test_server::ClientFactory;
 
 pub enum TypedBenchmarkProducingConsumer {
     High(BenchmarkProducingConsumer<HighLevelProducerClient, HighLevelConsumerClient>),
diff --git a/core/bench/src/analytics/report_builder.rs b/core/bench/src/analytics/report_builder.rs
@@ -19,6 +19,7 @@
 use std::{collections::HashMap, thread};
 
 use super::metrics::group::{from_individual_metrics, from_producers_and_consumers_statistics};
+use crate::utils::ClientFactory;
 use crate::utils::get_server_stats;
 use bench_report::{
     actor_kind::ActorKind,
@@ -31,7 +32,6 @@ use bench_report::{
 };
 use chrono::{DateTime, Utc};
 use iggy::prelude::{CacheMetrics, CacheMetricsKey, IggyTimestamp, Stats};
-use integration::test_server::ClientFactory;
 use std::sync::Arc;
 
 pub struct BenchmarkReportBuilder;
diff --git a/core/bench/src/args/common.rs b/core/bench/src/args/common.rs
@@ -22,8 +22,7 @@ use super::props::{BenchmarkKindProps, BenchmarkTransportProps};
 use super::{
     defaults::{
         DEFAULT_MESSAGE_BATCHES, DEFAULT_MESSAGE_SIZE, DEFAULT_MESSAGES_PER_BATCH,
-        DEFAULT_MOVING_AVERAGE_WINDOW, DEFAULT_PERFORM_CLEANUP, DEFAULT_SAMPLING_TIME,
-        DEFAULT_SERVER_STDOUT_VISIBILITY, DEFAULT_SKIP_SERVER_START, DEFAULT_WARMUP_TIME,
+        DEFAULT_MOVING_AVERAGE_WINDOW, DEFAULT_SAMPLING_TIME, DEFAULT_WARMUP_TIME,
     },
     transport::BenchmarkTransportCommand,
 };
@@ -32,9 +31,7 @@ use bench_report::numeric_parameter::BenchmarkNumericParameter;
 use clap::error::ErrorKind;
 use clap::{CommandFactory, Parser};
 use iggy::prelude::{IggyByteSize, IggyDuration, TransportProtocol};
-use std::net::SocketAddr;
 use std::num::NonZeroU32;
-use std::path::Path;
 use std::str::FromStr;
 
 #[derive(Parser, Debug)]
@@ -72,10 +69,6 @@ pub struct IggyBenchArgs {
     #[arg(long, short = 'w', default_value_t = IggyDuration::from_str(DEFAULT_WARMUP_TIME).unwrap())]
     pub warmup_time: IggyDuration,
 
-    /// Server stdout visibility
-    #[arg(long, short = 'v', default_value_t = DEFAULT_SERVER_STDOUT_VISIBILITY)]
-    pub verbose: bool,
-
     /// Sampling time for metrics collection. It is also used as bucket size for time series calculations.
     #[arg(long, short = 't', default_value_t = IggyDuration::from_str(DEFAULT_SAMPLING_TIME).unwrap(), value_parser = IggyDuration::from_str)]
     pub sampling_time: IggyDuration,
@@ -84,34 +77,11 @@ pub struct IggyBenchArgs {
     #[arg(long, short = 'W', default_value_t = DEFAULT_MOVING_AVERAGE_WINDOW)]
     pub moving_average_window: u32,
 
-    /// Shutdown iggy-server and remove server `local_data` directory after the benchmark is finished.
-    /// Only applicable to local benchmarks.
-    #[arg(long, default_value_t = DEFAULT_PERFORM_CLEANUP, verbatim_doc_comment)]
-    pub cleanup: bool,
-
-    /// iggy-server executable path.
-    /// Only applicable to local benchmarks.
-    #[arg(long, short='e', default_value = None, value_parser = validate_server_executable_path)]
-    pub server_executable_path: Option<String>,
-
-    /// Skip server start.
-    /// Only applicable to local benchmarks.
-    #[arg(long, short = 'k', default_value_t = DEFAULT_SKIP_SERVER_START, verbatim_doc_comment)]
-    pub skip_server_start: bool,
-
     /// Use high-level API for actors
     #[arg(long, short = 'H', default_value_t = false)]
     pub high_level_api: bool,
 }
 
-fn validate_server_executable_path(v: &str) -> Result<String, String> {
-    if Path::new(v).exists() {
-        Ok(v.to_owned())
-    } else {
-        Err(format!("Provided server executable '{v}' does not exist."))
-    }
-}
-
 impl IggyBenchArgs {
     pub fn transport_command(&self) -> &BenchmarkTransportCommand {
         self.benchmark_kind.transport_command()
@@ -133,19 +103,6 @@ impl IggyBenchArgs {
     }
 
     pub fn validate(&mut self) {
-        let server_address = self.server_address().parse::<SocketAddr>().unwrap();
-        if (self.cleanup || self.verbose) && !server_address.ip().is_loopback() {
-            Self::command()
-                .error(
-                    ErrorKind::ArgumentConflict,
-                    format!(
-                        "Cannot use cleanup or verbose flags with a non-loopback server address: {}",
-                        self.server_address()
-                    ),
-                )
-                .exit();
-        }
-
         if self.output_dir().is_none()
             && (self.gitref().is_some()
                 || self.identifier().is_some()
diff --git a/core/bench/src/args/defaults.rs b/core/bench/src/args/defaults.rs
@@ -46,11 +46,7 @@ pub const DEFAULT_NUMBER_OF_CONSUMERS: NonZeroU32 = u32!(8);
 pub const DEFAULT_NUMBER_OF_CONSUMER_GROUPS: NonZeroU32 = u32!(1);
 pub const DEFAULT_NUMBER_OF_PRODUCERS: NonZeroU32 = u32!(8);
 
-pub const DEFAULT_PERFORM_CLEANUP: bool = false;
-pub const DEFAULT_SERVER_STDOUT_VISIBILITY: bool = false;
-
 pub const DEFAULT_WARMUP_TIME: &str = "0s";
-pub const DEFAULT_SKIP_SERVER_START: bool = false;
 
 pub const DEFAULT_SAMPLING_TIME: &str = "10ms";
 pub const DEFAULT_MOVING_AVERAGE_WINDOW: u32 = 20;
diff --git a/core/bench/src/args/examples.rs b/core/bench/src/args/examples.rs
@@ -57,13 +57,10 @@ const EXAMPLES: &str = r#"EXAMPLES:
                                 Mutually exclusive with --message-batches
     --message-size (-m): Message size in bytes [default: 1000]
                         For random sizes, use range format: "100..1000"
-    --start-stream-id (-S): Start stream ID [default: 1]
     --rate-limit (-r): Optional throughput limit per producer (e.g., "50KB", "10MB")
     --warmup-time (-w): Warmup duration [default: 0s]
     --sampling-time (-t): Metrics sampling interval [default: 10ms]
     --moving-average-window (-W): Window size for moving average [default: 20]
-    --cleanup: Remove server data after benchmark
-    --verbose (-v): Show server output (only applicable for local server)
 
     Benchmark-specific options (after the benchmark command):
     --streams (-s): Number of streams
diff --git a/core/bench/src/benchmarks/balanced_consumer_group.rs b/core/bench/src/benchmarks/balanced_consumer_group.rs
@@ -17,14 +17,14 @@
  */
 
 use super::benchmark::Benchmarkable;
+use crate::utils::ClientFactory;
 use crate::{
     args::common::IggyBenchArgs,
     benchmarks::common::{build_consumer_futures, init_consumer_groups},
 };
 use async_trait::async_trait;
 use bench_report::{benchmark_kind::BenchmarkKind, individual_metrics::BenchmarkIndividualMetrics};
 use iggy::prelude::*;
-use integration::test_server::ClientFactory;
 use std::sync::Arc;
 use tokio::task::JoinSet;
 use tracing::info;
diff --git a/core/bench/src/benchmarks/balanced_producer.rs b/core/bench/src/benchmarks/balanced_producer.rs
@@ -19,11 +19,11 @@
 use super::benchmark::Benchmarkable;
 use crate::args::common::IggyBenchArgs;
 use crate::benchmarks::common::build_producer_futures;
+use crate::utils::ClientFactory;
 use async_trait::async_trait;
 use bench_report::benchmark_kind::BenchmarkKind;
 use bench_report::individual_metrics::BenchmarkIndividualMetrics;
 use iggy::prelude::*;
-use integration::test_server::ClientFactory;
 use std::sync::Arc;
 use tokio::task::JoinSet;
 use tracing::info;
diff --git a/core/bench/src/benchmarks/balanced_producer_and_consumer_group.rs b/core/bench/src/benchmarks/balanced_producer_and_consumer_group.rs
@@ -17,14 +17,14 @@
  */
 
 use super::benchmark::Benchmarkable;
+use crate::utils::ClientFactory;
 use crate::{
     args::common::IggyBenchArgs,
     benchmarks::common::{build_consumer_futures, build_producer_futures, init_consumer_groups},
 };
 use async_trait::async_trait;
 use bench_report::{benchmark_kind::BenchmarkKind, individual_metrics::BenchmarkIndividualMetrics};
 use iggy::prelude::*;
-use integration::test_server::ClientFactory;
 use std::sync::Arc;
 use tokio::task::JoinSet;
 use tracing::info;
diff --git a/core/bench/src/benchmarks/benchmark.rs b/core/bench/src/benchmarks/benchmark.rs
@@ -17,13 +17,13 @@
  */
 
 use crate::args::kind::BenchmarkKindCommand;
+use crate::utils::{ClientFactory, login_root};
 use crate::{args::common::IggyBenchArgs, utils::client_factory::create_client_factory};
 use async_trait::async_trait;
 use bench_report::benchmark_kind::BenchmarkKind;
 use bench_report::individual_metrics::BenchmarkIndividualMetrics;
 use iggy::clients::client::IggyClient;
 use iggy::prelude::*;
-use integration::test_server::{ClientFactory, login_root};
 use std::sync::Arc;
 use tokio::task::JoinSet;
 use tracing::info;
diff --git a/core/bench/src/benchmarks/common.rs b/core/bench/src/benchmarks/common.rs
@@ -17,6 +17,7 @@
  */
 
 use super::{CONSUMER_GROUP_BASE_ID, CONSUMER_GROUP_NAME_PREFIX};
+use crate::utils::{ClientFactory, login_root};
 use crate::{
     actors::{
         consumer::typed_benchmark_consumer::TypedBenchmarkConsumer,
@@ -28,7 +29,6 @@ use crate::{
 };
 use bench_report::{benchmark_kind::BenchmarkKind, individual_metrics::BenchmarkIndividualMetrics};
 use iggy::prelude::*;
-use integration::test_server::{ClientFactory, login_root};
 use std::{future::Future, sync::Arc};
 use tracing::{error, info};
 
diff --git a/core/bench/src/benchmarks/end_to_end_producing_consumer.rs b/core/bench/src/benchmarks/end_to_end_producing_consumer.rs
@@ -18,11 +18,11 @@
 
 use crate::args::common::IggyBenchArgs;
 use crate::benchmarks::common::build_producing_consumers_futures;
+use crate::utils::ClientFactory;
 use async_trait::async_trait;
 use bench_report::benchmark_kind::BenchmarkKind;
 use bench_report::individual_metrics::BenchmarkIndividualMetrics;
 use iggy::prelude::*;
-use integration::test_server::ClientFactory;
 use std::sync::Arc;
 use tokio::task::JoinSet;
 use tracing::info;
diff --git a/core/bench/src/benchmarks/end_to_end_producing_consumer_group.rs b/core/bench/src/benchmarks/end_to_end_producing_consumer_group.rs
@@ -18,11 +18,11 @@
 
 use crate::args::common::IggyBenchArgs;
 use crate::benchmarks::common::{build_producing_consumer_groups_futures, init_consumer_groups};
+use crate::utils::ClientFactory;
 use async_trait::async_trait;
 use bench_report::benchmark_kind::BenchmarkKind;
 use bench_report::individual_metrics::BenchmarkIndividualMetrics;
 use iggy::prelude::*;
-use integration::test_server::ClientFactory;
 use std::sync::Arc;
 use tokio::task::JoinSet;
 use tracing::info;
diff --git a/core/bench/src/benchmarks/pinned_consumer.rs b/core/bench/src/benchmarks/pinned_consumer.rs
@@ -19,11 +19,11 @@
 use crate::args::common::IggyBenchArgs;
 use crate::benchmarks::benchmark::Benchmarkable;
 use crate::benchmarks::common::build_consumer_futures;
+use crate::utils::ClientFactory;
 use async_trait::async_trait;
 use bench_report::benchmark_kind::BenchmarkKind;
 use bench_report::individual_metrics::BenchmarkIndividualMetrics;
 use iggy::prelude::IggyError;
-use integration::test_server::ClientFactory;
 use std::sync::Arc;
 use tokio::task::JoinSet;
 use tracing::info;
diff --git a/core/bench/src/benchmarks/pinned_producer.rs b/core/bench/src/benchmarks/pinned_producer.rs
@@ -19,11 +19,11 @@
 use crate::args::common::IggyBenchArgs;
 use crate::benchmarks::benchmark::Benchmarkable;
 use crate::benchmarks::common::build_producer_futures;
+use crate::utils::ClientFactory;
 use async_trait::async_trait;
 use bench_report::benchmark_kind::BenchmarkKind;
 use bench_report::individual_metrics::BenchmarkIndividualMetrics;
 use iggy::prelude::{IggyError, MaxTopicSize};
-use integration::test_server::ClientFactory;
 use std::sync::Arc;
 use tokio::task::JoinSet;
 use tracing::info;
diff --git a/core/bench/src/benchmarks/pinned_producer_and_consumer.rs b/core/bench/src/benchmarks/pinned_producer_and_consumer.rs
diff --git a/core/bench/src/runner.rs b/core/bench/src/runner.rs
diff --git a/core/bench/src/utils/client_factory.rs b/core/bench/src/utils/client_factory.rs
diff --git a/core/bench/src/utils/mod.rs b/core/bench/src/utils/mod.rs
diff --git a/core/bench/src/utils/server_starter.rs b/core/bench/src/utils/server_starter.rs
diff --git a/scripts/check-backwards-compat.sh b/scripts/check-backwards-compat.sh
