From ea1620314f4d9b6f59d3e530e7ddc3f854cbe8c6 Mon Sep 17 00:00:00 2001
From: Lucas Kent <rubickent@gmail.com>
Date: Tue, 20 Feb 2024 16:13:14 +1100
Subject: [PATCH] Call setup_tracing_subscriber_for_test from shotover_process
 to

---
 test-helpers/src/docker_compose.rs   | 13 +++----------
 test-helpers/src/lib.rs              |  1 +
 test-helpers/src/shotover_process.rs |  3 +++
 test-helpers/src/test_tracing.rs     | 14 ++++++++++++++
 4 files changed, 21 insertions(+), 10 deletions(-)
 create mode 100644 test-helpers/src/test_tracing.rs

diff --git a/test-helpers/src/docker_compose.rs b/test-helpers/src/docker_compose.rs
index ca8354cdf..6043edcb7 100644
--- a/test-helpers/src/docker_compose.rs
+++ b/test-helpers/src/docker_compose.rs
@@ -1,19 +1,12 @@
 use docker_compose_runner::*;
 use std::{env, time::Duration};
-use tracing_subscriber::fmt::TestWriter;
 
 pub use docker_compose_runner::DockerCompose;
 
-fn setup_tracing_subscriber_for_test_logic() {
-    tracing_subscriber::fmt()
-        .with_writer(TestWriter::new())
-        .with_env_filter("warn")
-        .try_init()
-        .ok();
-}
-
 pub fn docker_compose(file_path: &str) -> DockerCompose {
-    setup_tracing_subscriber_for_test_logic();
+    // Run setup here to ensure any test that calls this gets tracing
+    crate::test_tracing::setup_tracing_subscriber_for_test();
+
     DockerCompose::new(&IMAGE_WAITERS, |_| {}, file_path)
 }
 
diff --git a/test-helpers/src/lib.rs b/test-helpers/src/lib.rs
index eb901ab1f..4fe74b3e6 100644
--- a/test-helpers/src/lib.rs
+++ b/test-helpers/src/lib.rs
@@ -4,6 +4,7 @@ pub mod docker_compose;
 pub mod metrics;
 pub mod mock_cassandra;
 pub mod shotover_process;
+mod test_tracing;
 
 use anyhow::{anyhow, Result};
 use subprocess::{Exec, Redirection};
diff --git a/test-helpers/src/shotover_process.rs b/test-helpers/src/shotover_process.rs
index 7ec24b167..065213425 100644
--- a/test-helpers/src/shotover_process.rs
+++ b/test-helpers/src/shotover_process.rs
@@ -18,6 +18,9 @@ pub struct ShotoverProcessBuilder {
 
 impl ShotoverProcessBuilder {
     pub fn new_with_topology(topology_path: &str) -> Self {
+        // Run setup here to ensure any test that calls this gets tracing
+        crate::test_tracing::setup_tracing_subscriber_for_test();
+
         Self {
             topology_path: topology_path.to_owned(),
             config_path: None,
diff --git a/test-helpers/src/test_tracing.rs b/test-helpers/src/test_tracing.rs
new file mode 100644
index 000000000..c27166eb0
--- /dev/null
+++ b/test-helpers/src/test_tracing.rs
@@ -0,0 +1,14 @@
+use tracing::level_filters::LevelFilter;
+use tracing_subscriber::EnvFilter;
+
+pub fn setup_tracing_subscriber_for_test() {
+    tracing_subscriber::fmt()
+        .with_env_filter(
+            EnvFilter::builder()
+                .with_default_directive(LevelFilter::WARN.into())
+                .from_env()
+                .unwrap(),
+        )
+        .try_init()
+        .ok();
+}