[#11818] Improve log4j context initialization

pinpoint-apm · Feb 3, 2025 · b055f08 · b055f08
1 parent 2dff5c3
commit b055f08
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 2 deletions.
diff --git a/agent-module/profiler-logging/pom.xml b/agent-module/profiler-logging/pom.xml
@@ -31,6 +31,12 @@
             <groupId>com.navercorp.pinpoint</groupId>
             <artifactId>pinpoint-bootstrap-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.jspecify</groupId>
+            <artifactId>jspecify</artifactId>
+            <scope>provided</scope>
+            <version>1.0.0</version>
+        </dependency>
 
         <!-- Logging dependencies -->
         <dependency>

diff --git a/...rofiler-logging/src/main/java/com/navercorp/pinpoint/profiler/logging/Log4j2Provider.java b/...rofiler-logging/src/main/java/com/navercorp/pinpoint/profiler/logging/Log4j2Provider.java
@@ -0,0 +1,10 @@
+package com.navercorp.pinpoint.profiler.logging;
+
+import org.apache.logging.log4j.spi.NoOpThreadContextMap;
+import org.apache.logging.log4j.spi.Provider;
+
+public class Log4j2Provider extends Provider {
+    public Log4j2Provider() {
+        super(11, CURRENT_VERSION, Log4j2ContextFactory.class, NoOpThreadContextMap.class);
+    }
+}
diff --git a/...filer-logging/src/main/java/com/navercorp/pinpoint/profiler/logging/Log4jEnvExecutor.java b/...filer-logging/src/main/java/com/navercorp/pinpoint/profiler/logging/Log4jEnvExecutor.java
@@ -4,20 +4,29 @@
 
 public class Log4jEnvExecutor {
 
+    /**
+     * log4j 2.24
+     * ref : {@value org.apache.logging.log4j.spi.Provider#PROVIDER_PROPERTY_NAME}
+     */
+    public static final String PROVIDER_PROPERTY_NAME = "log4j.provider";
     public static final String FACTORY_PROPERTY_NAME = "log4j2.loggerContextFactory";
 
     public <V> V call(Supplier<V> supplier) {
-        final String factory = prepare(FACTORY_PROPERTY_NAME, Log4j2ContextFactory.class.getName());
+        final String provider = prepare(PROVIDER_PROPERTY_NAME, Log4j2Provider.class.getName());
+        final String factory = prepare(FACTORY_PROPERTY_NAME, null);
         try {
             return supplier.get();
         } finally {
             rollback(FACTORY_PROPERTY_NAME, factory);
+            rollback(PROVIDER_PROPERTY_NAME, provider);
         }
     }
 
     private String prepare(String key, String value) {
         final String backup = System.getProperty(key);
-        System.setProperty(key, value);
+        if (value != null) {
+            System.setProperty(key, value);
+        }
         return backup;
     }