windsock: Fix cloud metrics for kafka+redis (#1461)

Co-authored-by: Conor <conor.brosnan@instaclustr.com>
shotover · Feb 8, 2024 · 8142031 · 8142031
1 parent 5bea9e9
commit 8142031
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/shotover-proxy/benches/windsock/kafka/bench.rs b/shotover-proxy/benches/windsock/kafka/bench.rs
@@ -287,12 +287,21 @@ impl Bench for KafkaBench {
  let shotover_ip = shotover_instance
  .as_ref()
  .map(|x| x.instance.private_ip().to_string());
+ let shotover_connect_ip = match self.topology {
+ KafkaTopology::Single => kafka_instances
+ .first()
+ .as_ref()
+ .map(|x| x.instance.connect_ip().to_string()),
+ KafkaTopology::Cluster1 | KafkaTopology::Cluster3 => shotover_instance
+ .as_ref()
+ .map(|x| x.instance.connect_ip().to_string()),
+ };
 
  let mut profiler = CloudProfilerRunner::new(
  self.name(),
  profiling,
  profiler_instances,
- &Some(kafka_ip.clone()),
+ &shotover_connect_ip,
  )
  .await;
 

diff --git a/shotover-proxy/benches/windsock/redis/bench.rs b/shotover-proxy/benches/windsock/redis/bench.rs
@@ -251,10 +251,17 @@ impl Bench for RedisBench {
  let shotover_ip = shotover_instance
  .as_ref()
  .map(|x| x.instance.private_ip().to_string());
-
- let mut profiler =
- CloudProfilerRunner::new(self.name(), profiling, profiler_instances, &shotover_ip)
- .await;
+ let shotover_connect_ip = shotover_instance
+ .as_ref()
+ .map(|x| x.instance.connect_ip().to_string());
+
+ let mut profiler = CloudProfilerRunner::new(
+ self.name(),
+ profiling,
+ profiler_instances,
+ &shotover_connect_ip,
+ )
+ .await;
 
  let (_, running_shotover) = futures::join!(
  redis_instances.run(self.encryption),