From 9e4763032d3cb21e54755157ea45873ecc2872fb Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Tue, 5 May 2026 23:11:07 +0200 Subject: [PATCH] CAMEL-23427: Fix flaky SpanPropagationUpstreamTest in camel-telemetry-dev Change clearLogTraces() from @AfterEach to @BeforeEach to ensure the trace log file is rolled over before each test runs, not after. With @AfterEach, the rollover happened before CamelTestSupport.tearDown() stopped the context (JUnit 5 runs subclass @AfterEach before superclass), so any trace output during context shutdown would be written to the new clean log file and picked up by the next test as a stale trace. --- .../camel/telemetrydev/TelemetryDevTracerTestSupport.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/camel-telemetry-dev/src/test/java/org/apache/camel/telemetrydev/TelemetryDevTracerTestSupport.java b/components/camel-telemetry-dev/src/test/java/org/apache/camel/telemetrydev/TelemetryDevTracerTestSupport.java index 56f63d67d5c32..0b7f67e96f3f5 100644 --- a/components/camel-telemetry-dev/src/test/java/org/apache/camel/telemetrydev/TelemetryDevTracerTestSupport.java +++ b/components/camel-telemetry-dev/src/test/java/org/apache/camel/telemetrydev/TelemetryDevTracerTestSupport.java @@ -31,7 +31,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.appender.RollingFileAppender; -import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; public class TelemetryDevTracerTestSupport extends ExchangeTestSupport { @@ -61,7 +61,7 @@ protected Map tracesFromLog() throws IOException { * This one is required to rollover the log traces database file and make sure each test has its own * set of fresh data. */ - @AfterEach + @BeforeEach public synchronized void clearLogTraces() throws IOException { final LoggerContext ctx = (LoggerContext) LogManager.getContext(false); RollingFileAppender appender = (RollingFileAppender) ctx.getConfiguration().getAppenders().get("file2");