remove slf4j binding (does not improve perfs)

Author: jeromevdl

pom.xml

@@ -74,7 +74,7 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <log4j.version>2.20.0</log4j.version>
-        <slf4j.version>2.0.4</slf4j.version>
+        <slf4j.version>2.0.7</slf4j.version>
         <jackson.version>2.15.2</jackson.version>
         <aspectj.version>1.9.7</aspectj.version>
         <aws.sdk.version>2.20.136</aws.sdk.version>

powertools-logging/powertools-logging-log4j/pom.xml

@@ -151,14 +151,6 @@
                     </dependency>
                 </dependencies>
             </plugin>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <systemPropertyVariables>
-                        <slf4j.binding>org.apache.logging.slf4j.SLF4JServiceProvider</slf4j.binding>
-                    </systemPropertyVariables>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>

powertools-logging/powertools-logging-log4j/src/test/java/org/apache/logging/log4j/layout/template/json/resolver/PowerToolsResolverFactoryTest.java

@@ -41,7 +41,7 @@
 import software.amazon.lambda.powertools.logging.internal.LambdaLoggingAspect;
 import software.amazon.lambda.powertools.logging.internal.handler.PowertoolsLogEnabled;
 
-@Order(2)
+@Order(1)
 class PowerToolsResolverFactoryTest {
 
     @Mock
@@ -74,6 +74,8 @@ void shouldLogInJsonFormat() throws IllegalAccessException {
         try (MockedStatic<SystemWrapper> mocked = mockStatic(SystemWrapper.class)) {
             mocked.when(() -> getenv("_X_AMZN_TRACE_ID"))
                     .thenReturn("Root=1-63441c4a-abcdef012345678912345678");
+            mocked.when(() -> getenv("POWERTOOLS_SERVICE_NAME"))
+                    .thenReturn("testLog4j");
 
             writeStaticField(LambdaLoggingAspect.class, "SAMPLING_RATE", "0.000000001", true);
 
@@ -94,6 +96,8 @@ void shouldLogInEcsFormat() {
                     .thenReturn("Root=1-63441c4a-abcdef012345678912345678");
             mocked.when(() -> getenv("AWS_REGION"))
                     .thenReturn("eu-central-1");
+            mocked.when(() -> getenv("POWERTOOLS_SERVICE_NAME"))
+                    .thenReturn("testLog4j");
 
             PowertoolsLogEnabled handler = new PowertoolsLogEnabled();
             handler.handleRequest("Input", context);

powertools-logging/powertools-logging-log4j/src/test/java/software/amazon/lambda/powertools/logging/internal/LambdaLoggingAspectTest.java

@@ -151,14 +151,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
             </plugin>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <systemPropertyVariables>
-                        <slf4j.binding>ch.qos.logback.classic.spi.LogbackServiceProvider</slf4j.binding>
-                    </systemPropertyVariables>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 

powertools-logging/powertools-logging-logback/pom.xml

@@ -74,7 +74,7 @@ public final class LambdaLoggingAspect {
     private static Level LEVEL_AT_INITIALISATION; /* not final for test purpose */
 
     static {
-        loggingManager = loadLoggingManager();
+        loggingManager = getLoggingManagerFromServiceLoader();
 
         LEVEL_AT_INITIALISATION = loggingManager.getLogLevel(LOG);
 
@@ -83,54 +83,6 @@ public final class LambdaLoggingAspect {
         }
     }
 
-    private static LoggingManager loadLoggingManager() {
-        return getLoggingManagerFromSlf4jBinding().orElse(getLoggingManagerFromServiceLoader());
-    }
-
-    /**
-     * To avoid Service Loader loading of the log provider, SLF4j provides a system property 'slf4j.binding'
-     * that users can set. If this is set, we can also leverage it and avoid Service Loader for the {@link LoggingManager}.
-     * <p>In Lambda, system properties can be set with JAVA_TOOL_OPTIONS:
-     * <ul>
-     * <li>JAVA_TOOL_OPTIONS="-Dslf4j.binding=ch.qos.logback.classic.spi.LogbackServiceProvider"</li>
-     * <li>JAVA_TOOL_OPTIONS="-Dslf4j.binding=org.apache.logging.slf4j.SLF4JServiceProvider"</li>
-     * </ul>
-     * </p>
-     *
-     * @return an instance of {@link LoggingManager} or null
-     */
-    private static Optional<LoggingManager> getLoggingManagerFromSlf4jBinding() {
-        LoggingManager loggingManager = null;
-
-        String slf4jBinding = System.getProperty("slf4j.binding");
-        if (slf4jBinding != null) {
-            LOG.debug("slf4j.binding is set to {}", slf4jBinding);
-            try {
-                if ("org.apache.logging.slf4j.SLF4JServiceProvider".equals(slf4jBinding)) {
-                    String managerClass = "software.amazon.lambda.powertools.logging.internal.Log4jLoggingManager";
-                    LOG.debug("Loading {}", managerClass);
-                    Class<?> log4jManagerClass = LambdaLoggingAspect.class.getClassLoader()
-                            .loadClass(managerClass);
-                    loggingManager = (LoggingManager) log4jManagerClass.newInstance();
-                } else if ("ch.qos.logback.classic.spi.LogbackServiceProvider".equals(slf4jBinding)) {
-                    String managerClass = "software.amazon.lambda.powertools.logging.internal.LogbackLoggingManager";
-                    LOG.debug("Loading {}", managerClass);
-                    Class<?> log4backManagerClass = LambdaLoggingAspect.class.getClassLoader()
-                            .loadClass(managerClass);
-                    loggingManager = (LoggingManager) log4backManagerClass.newInstance();
-                } else {
-                    LOG.warn("slf4j.binding {} not supported, fallback to Service Loader. "
-                            + "Only log4j and logback are supported.", slf4jBinding);
-                }
-            } catch (ClassNotFoundException | InstantiationException | IllegalAccessException e) {
-                LOG.warn("Could not instantiate LoggingManager based on slf4j.binding {}, "
-                                + "make sure to add either powertools-logging-log4j or powertools-logging-logback module",
-                        slf4jBinding);
-            }
-        }
-        return Optional.ofNullable(loggingManager);
-    }
-
     /**
      * Use {@link ServiceLoader} to lookup for a {@link LoggingManager}.
      * A file <i>software.amazon.lambda.powertools.logging.internal.LoggingManager</i> must be created in