Skip to content

Commit ef4eea3

Browse files
committed
Migrate from logback to log4j2 in test-frame
Signed-off-by: David Kornel <kornys@outlook.com>
1 parent e8f84a6 commit ef4eea3

File tree

15 files changed

+96
-76
lines changed

15 files changed

+96
-76
lines changed

pom.xml

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
<maven.compiler.target>17</maven.compiler.target>
6969

7070
<fabric8.version>6.12.0</fabric8.version>
71-
<logback.version>1.4.12</logback.version>
71+
<log4j.version>2.17.2</log4j.version>
7272

7373
<!-- Build tools' properties -->
7474
<spotbugs.version>4.7.3</spotbugs.version>
@@ -172,10 +172,19 @@
172172
</dependency>
173173
<!-- Logger -->
174174
<dependency>
175-
<groupId>ch.qos.logback</groupId>
176-
<artifactId>logback-classic</artifactId>
177-
<scope>runtime</scope>
178-
<version>${logback.version}</version>
175+
<groupId>org.apache.logging.log4j</groupId>
176+
<artifactId>log4j-api</artifactId>
177+
<version>${log4j.version}</version>
178+
</dependency>
179+
<dependency>
180+
<groupId>org.apache.logging.log4j</groupId>
181+
<artifactId>log4j-core</artifactId>
182+
<version>${log4j.version}</version>
183+
</dependency>
184+
<dependency>
185+
<groupId>org.apache.logging.log4j</groupId>
186+
<artifactId>log4j-slf4j-impl</artifactId>
187+
<version>${log4j.version}</version>
179188
</dependency>
180189
</dependencies>
181190
</dependencyManagement>

test-frame-common/pom.xml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,17 +85,24 @@
8585
<groupId>org.junit.jupiter</groupId>
8686
<artifactId>junit-jupiter-api</artifactId>
8787
</dependency>
88-
<!-- Logger -->
89-
<dependency>
90-
<groupId>ch.qos.logback</groupId>
91-
<artifactId>logback-classic</artifactId>
92-
<scope>runtime</scope>
93-
</dependency>
9488
<dependency>
9589
<groupId>io.fabric8</groupId>
9690
<artifactId>kubernetes-server-mock</artifactId>
9791
<scope>test</scope>
9892
</dependency>
93+
<!-- Logger -->
94+
<dependency>
95+
<groupId>org.apache.logging.log4j</groupId>
96+
<artifactId>log4j-api</artifactId>
97+
</dependency>
98+
<dependency>
99+
<groupId>org.apache.logging.log4j</groupId>
100+
<artifactId>log4j-core</artifactId>
101+
</dependency>
102+
<dependency>
103+
<groupId>org.apache.logging.log4j</groupId>
104+
<artifactId>log4j-slf4j-impl</artifactId>
105+
</dependency>
99106
</dependencies>
100107

101108
<build>

test-frame-common/src/main/java/io/skodjob/testframe/LoggerUtils.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
import java.util.Collections;
88

99
import io.fabric8.kubernetes.api.model.HasMetadata;
10-
import org.slf4j.Logger;
11-
import org.slf4j.LoggerFactory;
10+
import org.apache.logging.log4j.LogManager;
11+
import org.apache.logging.log4j.Logger;
1212

1313
/**
1414
* Utility methods for logging.
1515
*/
1616
public final class LoggerUtils {
1717

18-
private static final Logger LOGGER = LoggerFactory.getLogger(LoggerUtils.class);
18+
private static final Logger LOGGER = LogManager.getLogger(LoggerUtils.class);
1919
static final String SEPARATOR_CHAR = "#";
2020

2121
/**

test-frame-common/src/main/java/io/skodjob/testframe/TestFrameEnv.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@
1414
import java.util.Objects;
1515
import java.util.function.Function;
1616

17-
import org.slf4j.Logger;
18-
import org.slf4j.LoggerFactory;
17+
import org.apache.logging.log4j.LogManager;
18+
import org.apache.logging.log4j.Logger;
1919
import org.yaml.snakeyaml.Yaml;
2020

2121
/**
2222
* Class which holds environment variables for system tests.
2323
*/
2424
public final class TestFrameEnv {
2525

26-
private static final Logger LOGGER = LoggerFactory.getLogger(TestFrameEnv.class);
26+
private static final Logger LOGGER = LogManager.getLogger(TestFrameEnv.class);
2727
private static final Map<String, String> VALUES = new HashMap<>();
2828
private static final Map<String, Object> YAML_DATA = loadConfigurationFile();
2929

test-frame-common/src/main/java/io/skodjob/testframe/clients/KubeClient.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@
2626
import io.skodjob.testframe.TestFrameConstants;
2727
import io.skodjob.testframe.TestFrameEnv;
2828
import io.skodjob.testframe.executor.Exec;
29-
import org.slf4j.Logger;
30-
import org.slf4j.LoggerFactory;
29+
import org.apache.logging.log4j.LogManager;
30+
import org.apache.logging.log4j.Logger;
3131

3232
/**
3333
* Provides functionality to interact with Kubernetes and OpenShift clusters.
3434
* This includes creating clients, reading resources from files, and managing kubeconfig for authentication.
3535
*/
3636
public class KubeClient {
37-
private static final Logger LOGGER = LoggerFactory.getLogger(KubeClient.class);
37+
private static final Logger LOGGER = LogManager.getLogger(KubeClient.class);
3838

3939

4040
private KubernetesClient client;

test-frame-common/src/main/java/io/skodjob/testframe/clients/cmdClient/BaseCmdKubeClient.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
import io.skodjob.testframe.clients.KubeClusterException;
2020
import io.skodjob.testframe.executor.Exec;
2121
import io.skodjob.testframe.executor.ExecResult;
22-
import org.slf4j.Logger;
23-
import org.slf4j.LoggerFactory;
22+
import org.apache.logging.log4j.LogManager;
23+
import org.apache.logging.log4j.Logger;
2424

2525
import static java.lang.String.join;
2626
import static java.util.Arrays.asList;
@@ -32,7 +32,7 @@
3232
*/
3333
public abstract class BaseCmdKubeClient<K extends BaseCmdKubeClient<K>> implements KubeCmdClient<K> {
3434

35-
private static final Logger LOGGER = LoggerFactory.getLogger(BaseCmdKubeClient.class);
35+
private static final Logger LOGGER = LogManager.getLogger(BaseCmdKubeClient.class);
3636

3737
private static final String CREATE = "create";
3838
private static final String APPLY = "apply";
@@ -425,7 +425,7 @@ public ExecResult exec(boolean throwError, boolean logToOutput, String... comman
425425
*
426426
* @param throwError Whether to throw errors.
427427
* @param logToOutput Whether to log the output.
428-
* @param timeout timeout in milis
428+
* @param timeout timeout in milis
429429
* @param command The command to execute.
430430
* @return The execution result.
431431
*/

test-frame-common/src/main/java/io/skodjob/testframe/executor/Exec.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030

3131
import io.fabric8.kubernetes.api.model.EnvVar;
3232
import io.skodjob.testframe.clients.KubeClusterException;
33-
import org.slf4j.Logger;
34-
import org.slf4j.LoggerFactory;
33+
import org.apache.logging.log4j.LogManager;
34+
import org.apache.logging.log4j.Logger;
3535

3636
import static java.lang.String.join;
3737

@@ -40,7 +40,7 @@
4040
*/
4141
public class Exec {
4242

43-
private static final Logger LOGGER = LoggerFactory.getLogger(Exec.class);
43+
private static final Logger LOGGER = LogManager.getLogger(Exec.class);
4444

4545
private static final Pattern ERROR_PATTERN = Pattern.compile("Error from server \\(([a-zA-Z0-9]+)\\):");
4646
private static final Pattern INVALID_PATTERN = Pattern

test-frame-common/src/main/java/io/skodjob/testframe/listeners/TestVisualSeparatorExtension.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@
55
package io.skodjob.testframe.listeners;
66

77
import io.skodjob.testframe.LoggerUtils;
8+
import org.apache.logging.log4j.LogManager;
9+
import org.apache.logging.log4j.Logger;
810
import org.junit.jupiter.api.extension.AfterEachCallback;
911
import org.junit.jupiter.api.extension.BeforeEachCallback;
1012
import org.junit.jupiter.api.extension.ExtensionContext;
11-
import org.slf4j.Logger;
12-
import org.slf4j.LoggerFactory;
1313

1414
/**
1515
* jUnit5 specific class which listening on test callbacks
1616
*/
1717
public class TestVisualSeparatorExtension implements BeforeEachCallback, AfterEachCallback {
18-
private final Logger logger = LoggerFactory.getLogger(TestVisualSeparatorExtension.class);
18+
private final Logger logger = LogManager.getLogger(TestVisualSeparatorExtension.class);
1919
@Override
2020
public void beforeEach(ExtensionContext extensionContext) {
2121
LoggerUtils.logSeparator();

test-frame-common/src/main/java/io/skodjob/testframe/resources/KubeResourceManager.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
import io.skodjob.testframe.interfaces.NamespacedResourceType;
2727
import io.skodjob.testframe.interfaces.ResourceType;
2828
import io.skodjob.testframe.wait.Wait;
29+
import org.apache.logging.log4j.LogManager;
30+
import org.apache.logging.log4j.Logger;
2931
import org.junit.jupiter.api.extension.ExtensionContext;
30-
import org.slf4j.Logger;
31-
import org.slf4j.LoggerFactory;
3232

3333
import static org.junit.jupiter.api.Assertions.assertNotNull;
3434
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -37,7 +37,7 @@
3737
* Manages Kubernetes resources for testing purposes.
3838
*/
3939
public class KubeResourceManager {
40-
private static final Logger LOGGER = LoggerFactory.getLogger(KubeResourceManager.class);
40+
private static final Logger LOGGER = LogManager.getLogger(KubeResourceManager.class);
4141
private static KubeResourceManager instance;
4242
private static KubeClient client;
4343
private static KubeCmdClient<?> kubeCmdClient;

test-frame-common/src/main/java/io/skodjob/testframe/utils/KubeUtils.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111
import io.skodjob.testframe.TestFrameConstants;
1212
import io.skodjob.testframe.resources.KubeResourceManager;
1313
import io.skodjob.testframe.wait.Wait;
14-
import org.slf4j.Logger;
15-
import org.slf4j.LoggerFactory;
14+
import org.apache.logging.log4j.LogManager;
15+
import org.apache.logging.log4j.Logger;
1616

1717
/**
1818
* Utility methods for Kubernetes and Openshift clusters.
1919
*/
2020
public final class KubeUtils {
2121

22-
private static final Logger LOGGER = LoggerFactory.getLogger(KubeUtils.class);
22+
private static final Logger LOGGER = LogManager.getLogger(KubeUtils.class);
2323

2424
private KubeUtils() {
2525
}

test-frame-common/src/main/java/io/skodjob/testframe/utils/TestFrameUtils.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@
1212
import com.fasterxml.jackson.databind.ObjectMapper;
1313
import com.fasterxml.jackson.databind.exc.InvalidFormatException;
1414
import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
15-
import org.slf4j.Logger;
16-
import org.slf4j.LoggerFactory;
15+
import org.apache.logging.log4j.LogManager;
16+
import org.apache.logging.log4j.Logger;
1717

1818
/**
1919
* Utility methods for TestFrame.
2020
*/
2121
@SuppressWarnings({"checkstyle:ClassFanOutComplexity"})
2222
public final class TestFrameUtils {
2323

24-
private static final Logger LOGGER = LoggerFactory.getLogger(TestFrameUtils.class);
24+
private static final Logger LOGGER = LogManager.getLogger(TestFrameUtils.class);
2525

2626
/**
2727
* Default timeout for asynchronous tests.

test-frame-common/src/main/java/io/skodjob/testframe/wait/Wait.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
import java.util.concurrent.TimeoutException;
1717
import java.util.function.BooleanSupplier;
1818

19-
import org.slf4j.Logger;
20-
import org.slf4j.LoggerFactory;
19+
import org.apache.logging.log4j.LogManager;
20+
import org.apache.logging.log4j.Logger;
2121

2222
/**
2323
* Wait utils
2424
*/
2525
public class Wait {
26-
private static final Logger LOGGER = LoggerFactory.getLogger(Wait.class);
26+
private static final Logger LOGGER = LogManager.getLogger(Wait.class);
2727

2828
/**
2929
* For every poll (happening once each {@code pollIntervalMs}) checks if supplier {@code ready} is true.
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name = TFConfig
2+
3+
appender.console.type = Console
4+
appender.console.name = STDOUT
5+
appender.console.layout.type = PatternLayout
6+
appender.console.layout.pattern = %d{yyyy-MM-dd HH:mm:ss}{GMT} [%thread] %highlight{%-5p} [%c{1}:%L] %m%n
7+
8+
appender.rolling.type = RollingFile
9+
appender.rolling.name = RollingFile
10+
appender.rolling.fileName = ${env:TEST_LOG_DIR:-target/logs}/tf-debug-${env:BUILD_ID:-0}.log
11+
appender.rolling.filePattern = ${env:TEST_LOG_DIR:-target/logs}/tf-debug-%d{yyyy-MM-dd-HH-mm-ss}-%i.log.gz
12+
appender.rolling.policies.type = Policies
13+
appender.rolling.policies.size.type = SizeBasedTriggeringPolicy
14+
appender.rolling.policies.size.size=100MB
15+
appender.rolling.strategy.type = DefaultRolloverStrategy
16+
appender.rolling.strategy.max = 5
17+
appender.rolling.layout.type = PatternLayout
18+
appender.rolling.layout.pattern=%d{yyyy-MM-dd HH:mm:ss}{GMT} %-5p [%c{1}:%L] %m%n
19+
20+
rootLogger.level = ${env:TEST_ROOT_LOG_LEVEL:-DEBUG}
21+
rootLogger.appenderRef.console.ref = STDOUT
22+
rootLogger.appenderRef.console.level = ${env:TEST_LOG_LEVEL:-INFO}
23+
rootLogger.appenderRef.rolling.ref = RollingFile
24+
rootLogger.appenderRef.rolling.level = DEBUG
25+
rootLogger.additivity = false
26+
27+
logger.fabric8.name = io.fabric8.kubernetes.client
28+
logger.fabric8.level = OFF

test-frame-common/src/main/resources/logback.xml

Lines changed: 0 additions & 31 deletions
This file was deleted.

test-frame-test/pom.xml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,16 @@
8383
</dependency>
8484
<!-- Logger -->
8585
<dependency>
86-
<groupId>ch.qos.logback</groupId>
87-
<artifactId>logback-classic</artifactId>
88-
<scope>test</scope>
86+
<groupId>org.apache.logging.log4j</groupId>
87+
<artifactId>log4j-api</artifactId>
88+
</dependency>
89+
<dependency>
90+
<groupId>org.apache.logging.log4j</groupId>
91+
<artifactId>log4j-core</artifactId>
92+
</dependency>
93+
<dependency>
94+
<groupId>org.apache.logging.log4j</groupId>
95+
<artifactId>log4j-slf4j-impl</artifactId>
8996
</dependency>
9097
</dependencies>
9198

0 commit comments

Comments
 (0)