[#8463] Replace slf4j with log4j2

agent-testweb/agentsdk-async-testweb/src/main/java/com/pinpointest/plugin/controller/ThreadContextPropagationController.java

@@ -3,8 +3,8 @@
 import com.navercorp.pinpoint.sdk.v1.concurrent.TraceCallable;
 import com.navercorp.pinpoint.sdk.v1.concurrent.TraceExecutors;
 import com.navercorp.pinpoint.sdk.v1.concurrent.TraceRunnable;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -20,7 +20,7 @@
 
 @RestController
 public class ThreadContextPropagationController {
-    private final Logger logger = LoggerFactory.getLogger(this.getClass());
+    private final Logger logger = LogManager.getLogger(this.getClass());
 
     private final ExecutorService traceExecutor = TraceExecutors.wrapExecutorService(Executors.newSingleThreadExecutor());
 

agent-testweb/jdk-http-plugin-testweb/src/main/java/com/pinpointest/plugin/CertService.java

@@ -1,7 +1,7 @@
 package com.pinpointest.plugin;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.core.io.Resource;
@@ -27,7 +27,7 @@
 @Component
 public class CertService {
 
-    private final Logger logger = LoggerFactory.getLogger(this.getClass());
+    private final Logger logger = LogManager.getLogger(this.getClass());
 
     private final Resource keyStorePath;
     private final String password;

agent-testweb/jdk-http-plugin-testweb/src/main/java/com/pinpointest/plugin/controller/HttpHeaderController.java

@@ -16,8 +16,8 @@
 
 package com.pinpointest.plugin.controller;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -33,7 +33,7 @@
 @RestController
 public class HttpHeaderController {
 
-    private final Logger logger = LoggerFactory.getLogger(this.getClass());
+    private final Logger logger = LogManager.getLogger(this.getClass());
 
     @GetMapping(value = "/reqHeader")
     public String reqHeader(HttpServletRequest request) {

agent-testweb/jdk-http-plugin-testweb/src/main/java/com/pinpointest/plugin/controller/JdkHttpPluginController.java

@@ -1,8 +1,8 @@
 package com.pinpointest.plugin.controller;
 
 import org.apache.commons.io.IOUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -20,7 +20,7 @@
 
 @RestController
 public class JdkHttpPluginController {
-    private final Logger logger = LoggerFactory.getLogger(this.getClass());
+    private final Logger logger = LogManager.getLogger(this.getClass());
 
     public static final String HTTP_TARGET = "%s://localhost:%s/helloworld";
 

agent-testweb/paho-mqtt-plugin-testweb/src/main/java/com/pinpoint/test/plugin/PahoMqttController.java

@@ -16,8 +16,8 @@
 
 package com.pinpoint.test.plugin;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -32,7 +32,7 @@
 @RestController
 public class PahoMqttController {
 
-    private final Logger logger = LoggerFactory.getLogger(this.getClass());
+    private final Logger logger = LogManager.getLogger(this.getClass());
 
     @Value("${mqtt.v3.broker.url}")
     private String v3BrokerUrl;

agent-testweb/paho-mqtt-plugin-testweb/src/main/java/com/pinpoint/test/plugin/Subscriber.java

@@ -16,8 +16,8 @@
 
 package com.pinpoint.test.plugin;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
@@ -30,7 +30,7 @@
 @Component
 public class Subscriber {
 
-    private final Logger logger = LoggerFactory.getLogger(this.getClass());
+    private final Logger logger = LogManager.getLogger(this.getClass());
 
     private org.eclipse.paho.mqttv5.client.MqttAsyncClient v5Client;
     private org.eclipse.paho.client.mqttv3.MqttAsyncClient v3Client;

agent-testweb/thread-plugin-testweb/src/main/java/com/pinpointest/plugin/controller/ThreadPluginController.java

@@ -1,7 +1,7 @@
 package com.pinpointest.plugin.controller;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -17,7 +17,7 @@
 
 @RestController
 public class ThreadPluginController {
-    private final Logger logger = LoggerFactory.getLogger(this.getClass());
+    private final Logger logger = LogManager.getLogger(this.getClass());
 
     private final ExecutorService executorService = Executors.newSingleThreadExecutor();
 

agent/src/test/java/com/navercorp/pinpoint/plugin/trace/TraceMetadataVerificationTest.java

@@ -22,8 +22,8 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ErrorCollector;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.io.IOException;
 import java.util.List;
@@ -32,7 +32,7 @@
  * @author HyunGil Jeong
  */
 public class TraceMetadataVerificationTest {
-    private final Logger logger = LoggerFactory.getLogger(this.getClass());
+    private final Logger logger = LogManager.getLogger(this.getClass());
 
     private final PinpointPluginLoader<TraceMetadataProvider> traceMetadataProviderLoader = new TraceMetadataProviderLoader();
 

batch/src/main/java/com/navercorp/pinpoint/batch/alarm/AlarmPartitioner.java

@@ -18,8 +18,8 @@
 
 import com.navercorp.pinpoint.batch.common.DefaultDivider;
 import com.navercorp.pinpoint.batch.common.Divider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.springframework.batch.core.partition.support.Partitioner;
 import org.springframework.batch.item.ExecutionContext;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -31,7 +31,7 @@
  * @author minwoo.jung
  */
 public class AlarmPartitioner implements Partitioner {
-    private final Logger logger = LoggerFactory.getLogger(this.getClass());
+    private final Logger logger = LogManager.getLogger(this.getClass());
 
     private static final String PARTITION_NAME_PREFIX = "alarm_partition_number_";
     private static final String BATCH_NAME = "alarm_batch";

batch/src/main/java/com/navercorp/pinpoint/batch/alarm/EmptySmsSender.java

@@ -16,16 +16,16 @@
 package com.navercorp.pinpoint.batch.alarm;
 
 import com.navercorp.pinpoint.batch.alarm.checker.AlarmChecker;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.springframework.batch.core.StepExecution;
 
 /**
  * @author minwoo.jung
  */
 public class EmptySmsSender implements SmsSender {
 
-    private final Logger logger = LoggerFactory.getLogger(this.getClass());
+    private final Logger logger = LogManager.getLogger(this.getClass());
 
     @Override
     public void sendSms(AlarmChecker<?> checker, int sequenceCount, StepExecution stepExecution) {

batch/src/main/java/com/navercorp/pinpoint/batch/alarm/SpringSmtpMailSender.java

@@ -18,8 +18,8 @@
 import com.navercorp.pinpoint.batch.alarm.checker.AlarmChecker;
 import com.navercorp.pinpoint.batch.common.BatchConfiguration;
 import com.navercorp.pinpoint.web.service.UserGroupService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.springframework.batch.core.StepExecution;
 import org.springframework.mail.javamail.JavaMailSenderImpl;
 
@@ -36,7 +36,7 @@
 public class SpringSmtpMailSender implements MailSender {
 
     private static final InternetAddress[] EMPTY_RECEIVERS = new InternetAddress[0];
-    private final Logger logger = LoggerFactory.getLogger(this.getClass());
+    private final Logger logger = LogManager.getLogger(this.getClass());
 
     private final UserGroupService userGroupService;
     private final String batchEnv;

batch/src/main/java/com/navercorp/pinpoint/batch/alarm/WebhookSenderImpl.java

@@ -24,8 +24,8 @@
 import com.navercorp.pinpoint.web.service.WebhookService;
 import com.navercorp.pinpoint.web.vo.User;
 import com.navercorp.pinpoint.web.vo.Webhook;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.springframework.batch.core.StepExecution;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
@@ -43,7 +43,7 @@
  */
 public class WebhookSenderImpl implements WebhookSender {
 
-    private final Logger logger = LoggerFactory.getLogger(this.getClass());
+    private final Logger logger = LogManager.getLogger(this.getClass());
     private final UserService userService;
     private final RestTemplate restTemplate;
 

batch/src/main/java/com/navercorp/pinpoint/batch/alarm/checker/AlarmChecker.java

@@ -20,8 +20,8 @@
 import com.navercorp.pinpoint.batch.alarm.vo.sender.payload.AlarmCheckerDetectedValue;
 import com.navercorp.pinpoint.batch.alarm.vo.sender.payload.CheckerDetectedValue;
 import com.navercorp.pinpoint.web.alarm.vo.Rule;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -34,7 +34,7 @@
  */
 public abstract class AlarmChecker<T> {
 
-    protected final Logger logger = LoggerFactory.getLogger(this.getClass());
+    protected final Logger logger = LogManager.getLogger(this.getClass());
 
     protected final Rule rule;
     protected final String unit;

batch/src/main/java/com/navercorp/pinpoint/batch/common/BatchConfiguration.java

@@ -17,8 +17,8 @@
 
 import com.navercorp.pinpoint.common.server.config.AnnotationVisitor;
 import com.navercorp.pinpoint.common.server.config.LoggingEvent;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
@@ -32,7 +32,7 @@
 @Component
 public class BatchConfiguration {
 
-    private final Logger logger = LoggerFactory.getLogger(BatchConfiguration.class);
+    private final Logger logger = LogManager.getLogger(BatchConfiguration.class);
 
     @Value("${alarm.mail.server.url}")
     private String emailServerUrl;

batch/src/main/java/com/navercorp/pinpoint/batch/common/BatchJobLauncher.java

@@ -16,8 +16,8 @@
 
 package com.navercorp.pinpoint.batch.common;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.springframework.batch.core.JobParameters;
 import org.springframework.batch.core.JobParametersBuilder;
 import org.springframework.batch.core.configuration.JobLocator;
@@ -30,7 +30,7 @@
  */
 public class BatchJobLauncher extends JobLaunchSupport {
 
-    private final Logger logger = LoggerFactory.getLogger(this.getClass());
+    private final Logger logger = LogManager.getLogger(this.getClass());
 
     public static final String CLEANUP_INACTIVE_AGENTS_JOB_NAME = "cleanupInactiveAgentsJob";
 

batch/src/main/java/com/navercorp/pinpoint/batch/flink/HealthCheckTasklet.java

@@ -16,8 +16,8 @@
 package com.navercorp.pinpoint.batch.flink;
 
 import com.navercorp.pinpoint.batch.common.BatchConfiguration;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.springframework.batch.core.StepContribution;
 import org.springframework.batch.core.scope.context.ChunkContext;
 import org.springframework.batch.core.step.tasklet.Tasklet;
@@ -39,7 +39,7 @@
 @Deprecated
 public class HealthCheckTasklet implements Tasklet {
 
-    private final Logger logger = LoggerFactory.getLogger(this.getClass());
+    private final Logger logger = LogManager.getLogger(this.getClass());
     private final static String URL_FORMAT = "http://%s:8081/joboverview";
     private final List<String> jobNameList;
 

batch/src/main/java/com/navercorp/pinpoint/batch/flink/HealthCheckTaskletV2.java

@@ -16,8 +16,8 @@
 package com.navercorp.pinpoint.batch.flink;
 
 import com.navercorp.pinpoint.batch.common.BatchConfiguration;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.springframework.batch.core.StepContribution;
 import org.springframework.batch.core.scope.context.ChunkContext;
 import org.springframework.batch.core.step.tasklet.Tasklet;
@@ -38,7 +38,7 @@
  */
 public class HealthCheckTaskletV2 implements Tasklet {
 
-    private final Logger logger = LoggerFactory.getLogger(this.getClass());
+    private final Logger logger = LogManager.getLogger(this.getClass());
     private final static String URL_FORMAT = "http://%s:8081/jobs/overview";
     private final static String NAME = "name";
     private final static String STATE = "state";

batch/src/main/java/com/navercorp/pinpoint/batch/job/CleanupInactiveAgentsTasklet.java

@@ -18,8 +18,8 @@
 
 import com.navercorp.pinpoint.batch.common.BatchConfiguration;
 import com.navercorp.pinpoint.web.service.AdminService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.springframework.batch.core.StepContribution;
 import org.springframework.batch.core.scope.context.ChunkContext;
 import org.springframework.batch.core.step.tasklet.Tasklet;
@@ -32,7 +32,7 @@
  */
 public class CleanupInactiveAgentsTasklet implements Tasklet {
 
-    private final Logger logger = LoggerFactory.getLogger(this.getClass());
+    private final Logger logger = LogManager.getLogger(this.getClass());
 
     private final int durationDays;
 

batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/ErrorCountToCalleCheckerTest.java

@@ -30,8 +30,8 @@
 import com.navercorp.pinpoint.web.vo.Range;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -41,7 +41,7 @@
 
 public class ErrorCountToCalleCheckerTest {
 
-    private static final Logger logger = LoggerFactory.getLogger(ErrorCountToCalleCheckerTest.class);
+    private static final Logger logger = LogManager.getLogger(ErrorCountToCalleCheckerTest.class);
 
     private static final String FROM_SERVICE_NAME = "from_local_service";
     private static final String TO_SERVICE_NAME = "to_local_service";

bootstraps/bootstrap-core/pom.xml

@@ -24,8 +24,8 @@
 
         <!-- Logging dependencies -->
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>