Use more human-readable appender format for STs logs (#11377)

Signed-off-by: Jakub Stejskal <xstejs24@gmail.com>

Author: Frawless

systemtest/src/main/resources/log4j2.properties

@@ -3,8 +3,7 @@ name = STConfig
 appender.console.type = Console
 appender.console.name = STDOUT
 appender.console.layout.type = PatternLayout
-appender.console.layout.pattern = %d{yyyy-MM-dd HH:mm:ss}{GMT} [%thread] %highlight{%-5p} [%c{1}:%L] %m%n
-
+appender.console.layout.pattern = %d{yyyy-MM-dd HH:mm:ss}{GMT} [T-%.3T] %highlight{%-5p}%notEmpty{[%X{testClass}]}%notEmpty{[%X{testMethod}]} [%c{1}:%L] %m%n
 appender.rolling.type = RollingFile
 appender.rolling.name = RollingFile
 appender.rolling.fileName = ${env:TEST_LOG_DIR:-target/logs}/strimzi-debug-${env:BUILD_ID:-0}.log
@@ -15,7 +14,7 @@ appender.rolling.policies.size.size=100MB
 appender.rolling.strategy.type = DefaultRolloverStrategy
 appender.rolling.strategy.max = 5
 appender.rolling.layout.type = PatternLayout
-appender.rolling.layout.pattern=%d{yyyy-MM-dd HH:mm:ss}{GMT} %-5p [%c{1}:%L] %m%n
+appender.rolling.layout.pattern=%d{yyyy-MM-dd HH:mm:ss}{GMT} [T-%.3T] %highlight{%-5p}%notEmpty{[%X{testClass}]}%notEmpty{[%X{testMethod}]} [%c{1}:%L] %m%n
 
 rootLogger.level = ${env:STRIMZI_TEST_ROOT_LOG_LEVEL:-DEBUG}
 rootLogger.appenderRef.console.ref = STDOUT

systemtest/src/test/java/io/strimzi/systemtest/AbstractST.java

@@ -17,6 +17,7 @@
 import io.strimzi.test.k8s.KubeClusterResource;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.ThreadContext;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
@@ -138,6 +139,14 @@ protected void beforeAllMayOverride() {
 
     @BeforeEach
     void setUpTestCase(ExtensionContext extensionContext) {
+        // Check if we execute tests in parallel to update logger appender dynamically
+        boolean parallelEnabled = Boolean.getBoolean("junit.jupiter.execution.parallel.enabled");
+        if (extensionContext.getTestClass().isPresent() && parallelEnabled) {
+            ThreadContext.put("testClass", extensionContext.getTestClass().get().getSimpleName());
+        }
+        if (extensionContext.getTestMethod().isPresent() && parallelEnabled) {
+            ThreadContext.put("testMethod", extensionContext.getTestMethod().get().getName());
+        }
         ResourceManager.setTestContext(extensionContext);
         LOGGER.debug(String.join("", Collections.nCopies(76, "=")));
         LOGGER.debug("————————————  {}@Before Each - Setup TestCase environment ———————————— ", StUtils.removePackageName(this.getClass().getName()));
@@ -147,6 +156,11 @@ void setUpTestCase(ExtensionContext extensionContext) {
 
     @BeforeAll
     void setUpTestSuite(ExtensionContext extensionContext) {
+        // Check if we execute tests in parallel to update logger appender dynamically
+        boolean parallelEnabled = Boolean.getBoolean("junit.jupiter.execution.parallel.enabled");
+        if (extensionContext.getTestClass().isPresent() && parallelEnabled) {
+            ThreadContext.put("testClass", extensionContext.getTestClass().get().getSimpleName());
+        }
         ResourceManager.setTestContext(extensionContext);
         LOGGER.debug(String.join("", Collections.nCopies(76, "=")));
         LOGGER.debug("———————————— {}@Before All - Setup TestSuite environment ———————————— ", StUtils.removePackageName(this.getClass().getName()));
@@ -170,6 +184,7 @@ void tearDownTestCase(ExtensionContext extensionContext) throws Exception {
         } finally {
             afterEachMayOverride();
             afterEachMustExecute();
+            ThreadContext.remove("testMethod");
         }
     }
 
@@ -180,5 +195,6 @@ void tearDownTestSuite(ExtensionContext extensionContext) {
         LOGGER.debug("———————————— {}@After All - Clean up after TestSuite ———————————— ", StUtils.removePackageName(this.getClass().getName()));
         afterAllMayOverride();
         afterAllMustExecute();
+        ThreadContext.remove("testClass");
     }
 }