gnodet commented on code in PR #13832: URL: https://github.com/apache/maven/pull/13832#discussion_r4540251744
########## impl/maven-logging-slf4j/src/main/java/org/apache/maven/logging/slf4j/MavenSimpleLogger.java: ########## @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.maven.logging.slf4j; + +import java.util.Arrays; +import java.util.Map; + +import org.apache.maven.api.MonotonicClock; +import org.apache.maven.api.logging.LogLevel; +import org.apache.maven.api.logging.LogSink; +import org.apache.maven.api.logging.LoggerManager; +import org.apache.maven.logging.impl.DefaultLogEvent; +import org.apache.maven.logging.impl.DefaultLoggerManager; +import org.slf4j.Marker; +import org.slf4j.event.Level; +import org.slf4j.helpers.LegacyAbstractLogger; +import org.slf4j.spi.LocationAwareLogger; + +/** + * Thin SLF4J logger that dispatches events to the Maven unified logging API + * via {@link LoggerManager}. Level checks are delegated to + * {@link DefaultLoggerManager}; formatting is deferred to the {@link LogSink}. + * + * @since 3.5.0 + */ +public class MavenSimpleLogger extends LegacyAbstractLogger { + + private static final StackWalker STACK_WALKER = StackWalker.getInstance(); + final String pluginId; + int currentLogLevel = LocationAwareLogger.INFO_INT; Review Comment: Fixed in 88938e78bb: `currentLogLevel` is now `volatile`. Valid finding — the field is written on the reconfiguration thread and read on logging threads without synchronization. ########## impl/maven-logging-slf4j/src/main/java/org/apache/maven/logging/slf4j/MavenSimpleLogger.java: ########## @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.maven.logging.slf4j; + +import java.util.Arrays; +import java.util.Map; + +import org.apache.maven.api.MonotonicClock; +import org.apache.maven.api.logging.LogLevel; +import org.apache.maven.api.logging.LogSink; +import org.apache.maven.api.logging.LoggerManager; +import org.apache.maven.logging.impl.DefaultLogEvent; +import org.apache.maven.logging.impl.DefaultLoggerManager; +import org.slf4j.Marker; +import org.slf4j.event.Level; +import org.slf4j.helpers.LegacyAbstractLogger; +import org.slf4j.spi.LocationAwareLogger; + +/** + * Thin SLF4J logger that dispatches events to the Maven unified logging API + * via {@link LoggerManager}. Level checks are delegated to + * {@link DefaultLoggerManager}; formatting is deferred to the {@link LogSink}. + * + * @since 3.5.0 + */ +public class MavenSimpleLogger extends LegacyAbstractLogger { + + private static final StackWalker STACK_WALKER = StackWalker.getInstance(); + final String pluginId; + int currentLogLevel = LocationAwareLogger.INFO_INT; Review Comment: Fixed in 88938e78bb: `currentLogLevel` is now `volatile`. Valid finding — the field is written on the reconfiguration thread and read on logging threads without synchronization. ########## impl/maven-logging-jul/src/test/java/org/apache/maven/logging/jul/MavenJulHandlerTest.java: ########## @@ -0,0 +1,189 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.maven.logging.jul; + +import java.util.List; +import java.util.concurrent.atomic.AtomicReference; +import java.util.logging.Level; +import java.util.logging.LogRecord; + +import org.apache.maven.api.logging.LogEvent; +import org.apache.maven.api.logging.LogLevel; +import org.apache.maven.api.logging.LogSink; +import org.apache.maven.logging.impl.DefaultLoggerManager; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Timeout; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.CsvSource; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; + +@Timeout(10) +class MavenJulHandlerTest { + + private DefaultLoggerManager testManager; + + @BeforeEach + void installTestManager() { + testManager = new DefaultLoggerManager(); + testManager.setRootLoggerLevel(LogLevel.TRACE); + testManager.install(); + } + + @AfterEach + void clearTestManager() { + testManager.uninstall(); + testManager = null; + } + + @ParameterizedTest(name = "JUL {0} -> LogLevel.{1}") + @CsvSource({ + "FINEST, TRACE", + "FINER, DEBUG", + "FINE, DEBUG", + "CONFIG, INFO", + "INFO, INFO", + "WARNING, WARN", + "SEVERE, ERROR", + }) + void julLevelMapsToCorrectLogLevel(String julLevelName, String expectedLogLevel) { + Level julLevel = Level.parse(julLevelName); Review Comment: Not fixed — this is a judgement call. `publishIsReentrantSafe()` correctly tests the guard path only (no exception when re-entrant). The normal publish path is covered by the three sibling tests added in this PR: `publishWithParameterizedMessagePreservesTemplateAndArgs`, `publishApostropheInMessageIsPreserved`, and `publishWithNoParametersIsPreserved`. Adding a happy-path assertion inside `publishIsReentrantSafe()` itself would duplicate those tests without adding coverage. Closing as not actionable. ########## impl/maven-logging-jul/src/test/java/org/apache/maven/logging/jul/MavenJulHandlerTest.java: ########## @@ -0,0 +1,189 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.maven.logging.jul; + +import java.util.List; +import java.util.concurrent.atomic.AtomicReference; +import java.util.logging.Level; +import java.util.logging.LogRecord; + +import org.apache.maven.api.logging.LogEvent; +import org.apache.maven.api.logging.LogLevel; +import org.apache.maven.api.logging.LogSink; +import org.apache.maven.logging.impl.DefaultLoggerManager; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Timeout; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.CsvSource; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; + +@Timeout(10) +class MavenJulHandlerTest { + + private DefaultLoggerManager testManager; + + @BeforeEach + void installTestManager() { + testManager = new DefaultLoggerManager(); + testManager.setRootLoggerLevel(LogLevel.TRACE); + testManager.install(); + } + + @AfterEach + void clearTestManager() { + testManager.uninstall(); + testManager = null; + } + + @ParameterizedTest(name = "JUL {0} -> LogLevel.{1}") + @CsvSource({ + "FINEST, TRACE", + "FINER, DEBUG", + "FINE, DEBUG", + "CONFIG, INFO", + "INFO, INFO", + "WARNING, WARN", + "SEVERE, ERROR", + }) + void julLevelMapsToCorrectLogLevel(String julLevelName, String expectedLogLevel) { + Level julLevel = Level.parse(julLevelName); Review Comment: Not fixed — this is a judgement call. `publishIsReentrantSafe()` correctly tests the guard path only (no exception when re-entrant). The normal publish path is covered by the three sibling tests added in this PR: `publishWithParameterizedMessagePreservesTemplateAndArgs`, `publishApostropheInMessageIsPreserved`, and `publishWithNoParametersIsPreserved`. Adding a happy-path assertion inside `publishIsReentrantSafe()` itself would duplicate those tests without adding coverage. Closing as not actionable. ########## impl/maven-logging-slf4j/src/main/java/org/apache/maven/logging/slf4j/MavenLoggerFactory.java: ########## @@ -0,0 +1,107 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.maven.logging.slf4j; + +import java.util.Objects; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; + +import org.apache.maven.api.logging.LoggerManager; +import org.apache.maven.logging.impl.DefaultLoggerManager; +import org.slf4j.ILoggerFactory; +import org.slf4j.Logger; + +/** + * LogFactory for Maven which creates SLF4J loggers that delegate level checks + * and severity recording to the shared {@link DefaultLoggerManager}. + */ +public class MavenLoggerFactory implements ILoggerFactory { + static volatile MavenLoggerFactory instance; + + private static final StackWalker STACK_WALKER = StackWalker.getInstance(StackWalker.Option.RETAIN_CLASS_REFERENCE); + + final DefaultLoggerManager logManager; + final ConcurrentMap<String, Logger> loggerMap = new ConcurrentHashMap<>(); + + public MavenLoggerFactory() { + instance = this; + LoggerManager mgr = LoggerManager.get(); + if (mgr instanceof DefaultLoggerManager dlm) { + logManager = dlm; + } else { + logManager = new DefaultLoggerManager(); + LoggerManager.set(logManager); + } + logManager.addReconfigurationListener(this::updateExistingLoggers); + } + + @Override + public Logger getLogger(String name) { + // Fast path: if a logger is already cached by name alone (non-plugin case), + // return it without performing an expensive stack walk. + Logger cached = loggerMap.get(name); + if (cached != null) { + return cached; + } + Review Comment: Fixed in 88938e78bb: removed the fast-path `loggerMap.get(name)` check. `getLogger()` now always calls `resolvePluginId()` first; the classloader cache makes the stack walk cheap after the first call per classloader. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
