Skip to content

Move production code to log4j-async-logger #2248

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jan 26, 2024
Merged

Move production code to log4j-async-logger #2248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
31535be
Last tweaks to tests before moving async support
ppkarwasz Jan 25, 2024
564bcdb
Move async support to `log4j-async-logger`
ppkarwasz Jan 25, 2024
f79c120
Fix failing tests
ppkarwasz Jan 25, 2024
09d00bd
Add changelog for splitting off `log4j-async-logger`
ppkarwasz Jan 25, 2024
d529321
Remove references to async context selector in `log4j-script`
ppkarwasz Jan 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion log4j-async-logger/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
</parent>

<artifactId>log4j-async-logger</artifactId>
<name>Log4j Async Logger</name>
<name>Apache Log4j Async Logger</name>
<description>Alternative implementation of logger that uses LMAX Disruptor.</description>

<dependencies>
Expand Down Expand Up @@ -65,4 +65,22 @@
</dependency>

</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<annotationProcessorPaths combine.children="append">
<path>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-plugin-processor</artifactId>
<version>${project.version}</version>
</path>
</annotationProcessorPaths>
</configuration>
</plugin>
</plugins>
</build>
</project>
2 changes: 1 addition & 1 deletion .../async/AbstractAsyncExceptionHandler.java → ...logger/AbstractAsyncExceptionHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.logging.log4j.core.async;
package org.apache.logging.log4j.async.logger;

import com.lmax.disruptor.ExceptionHandler;

Expand Down
4 changes: 3 additions & 1 deletion ...logging/log4j/core/async/AsyncLogger.java → ...gging/log4j/async/logger/AsyncLogger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.logging.log4j.core.async;
package org.apache.logging.log4j.async.logger;

import java.util.List;
import org.apache.logging.log4j.Level;
Expand All @@ -24,6 +24,8 @@
import org.apache.logging.log4j.core.Logger;
import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.ReusableLogEvent;
import org.apache.logging.log4j.core.async.AsyncQueueFullMessageUtil;
import org.apache.logging.log4j.core.async.EventRoute;
import org.apache.logging.log4j.core.config.Configuration;
import org.apache.logging.log4j.core.config.LoggerConfig;
import org.apache.logging.log4j.core.config.Property;
Expand Down
4 changes: 3 additions & 1 deletion ...g/log4j/core/async/AsyncLoggerConfig.java → ...log4j/async/logger/AsyncLoggerConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.logging.log4j.core.async;
package org.apache.logging.log4j.async.logger;

import java.util.List;
import java.util.concurrent.TimeUnit;
Expand All @@ -23,6 +23,8 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.core.Filter;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.async.AsyncQueueFullMessageUtil;
import org.apache.logging.log4j.core.async.EventRoute;
import org.apache.logging.log4j.core.config.AppenderRef;
import org.apache.logging.log4j.core.config.Configuration;
import org.apache.logging.log4j.core.config.LoggerConfig;
Expand Down
2 changes: 1 addition & 1 deletion ...cLoggerConfigDefaultExceptionHandler.java → ...cLoggerConfigDefaultExceptionHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.logging.log4j.core.async;
package org.apache.logging.log4j.async.logger;

/**
* Default disruptor exception handler for errors that occur in the AsyncLogger background thread.
Expand Down
3 changes: 2 additions & 1 deletion ...core/async/AsyncLoggerConfigDelegate.java → ...ync/logger/AsyncLoggerConfigDelegate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.logging.log4j.core.async;
package org.apache.logging.log4j.async.logger;

import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.async.EventRoute;
import org.apache.logging.log4j.core.impl.LogEventFactory;

/**
Expand Down
7 changes: 6 additions & 1 deletion ...ore/async/AsyncLoggerConfigDisruptor.java → ...nc/logger/AsyncLoggerConfigDisruptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.logging.log4j.core.async;
package org.apache.logging.log4j.async.logger;

import com.lmax.disruptor.EventFactory;
import com.lmax.disruptor.EventHandler;
Expand All @@ -34,6 +34,11 @@
import org.apache.logging.log4j.core.AbstractLifeCycle;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.ReusableLogEvent;
import org.apache.logging.log4j.core.async.AsyncQueueFullPolicy;
import org.apache.logging.log4j.core.async.AsyncQueueFullPolicyFactory;
import org.apache.logging.log4j.core.async.DiscardingAsyncQueueFullPolicy;
import org.apache.logging.log4j.core.async.EventRoute;
import org.apache.logging.log4j.core.async.InternalAsyncUtil;
import org.apache.logging.log4j.core.impl.Log4jLogEvent;
import org.apache.logging.log4j.core.impl.Log4jPropertyKey;
import org.apache.logging.log4j.core.impl.LogEventFactory;
Expand Down
2 changes: 1 addition & 1 deletion .../log4j/core/async/AsyncLoggerContext.java → ...og4j/async/logger/AsyncLoggerContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.logging.log4j.core.async;
package org.apache.logging.log4j.async.logger;

import java.net.URI;
import java.util.concurrent.TimeUnit;
Expand Down
2 changes: 1 addition & 1 deletion ...ore/async/AsyncLoggerContextSelector.java → ...nc/logger/AsyncLoggerContextSelector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.logging.log4j.core.async;
package org.apache.logging.log4j.async.logger;

import java.net.URI;
import org.apache.logging.log4j.core.LoggerContext;
Expand Down
2 changes: 1 addition & 1 deletion ...c/AsyncLoggerDefaultExceptionHandler.java → ...r/AsyncLoggerDefaultExceptionHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.logging.log4j.core.async;
package org.apache.logging.log4j.async.logger;

/**
* Default disruptor exception handler for errors that occur in the AsyncLogger background thread.
Expand Down
6 changes: 5 additions & 1 deletion ...og4j/core/async/AsyncLoggerDisruptor.java → ...4j/async/logger/AsyncLoggerDisruptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.logging.log4j.core.async;
package org.apache.logging.log4j.async.logger;

import com.lmax.disruptor.ExceptionHandler;
import com.lmax.disruptor.RingBuffer;
Expand All @@ -30,6 +30,10 @@
import java.util.function.Supplier;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.core.AbstractLifeCycle;
import org.apache.logging.log4j.core.async.AsyncQueueFullPolicy;
import org.apache.logging.log4j.core.async.AsyncQueueFullPolicyFactory;
import org.apache.logging.log4j.core.async.DiscardingAsyncQueueFullPolicy;
import org.apache.logging.log4j.core.async.EventRoute;
import org.apache.logging.log4j.core.impl.Log4jPropertyKey;
import org.apache.logging.log4j.core.util.Log4jThread;
import org.apache.logging.log4j.core.util.Log4jThreadFactory;
Expand Down
2 changes: 1 addition & 1 deletion .../core/async/AsyncWaitStrategyFactory.java → ...sync/logger/AsyncWaitStrategyFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.logging.log4j.core.async;
package org.apache.logging.log4j.async.logger;

import com.lmax.disruptor.WaitStrategy;

Expand Down
2 changes: 1 addition & 1 deletion ...sync/BasicAsyncLoggerContextSelector.java → ...gger/BasicAsyncLoggerContextSelector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.logging.log4j.core.async;
package org.apache.logging.log4j.async.logger;

import java.net.URI;
import org.apache.logging.log4j.core.LoggerContext;
Expand Down
2 changes: 1 addition & 1 deletion ...sync/DefaultAsyncWaitStrategyFactory.java → ...gger/DefaultAsyncWaitStrategyFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.logging.log4j.core.async;
package org.apache.logging.log4j.async.logger;

import com.lmax.disruptor.BlockingWaitStrategy;
import com.lmax.disruptor.BusySpinWaitStrategy;
Expand Down
2 changes: 1 addition & 1 deletion ...4j/core/async/DisruptorConfiguration.java → .../async/logger/DisruptorConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.logging.log4j.core.async;
package org.apache.logging.log4j.async.logger;

import java.util.Objects;
import java.util.concurrent.TimeUnit;
Expand Down
2 changes: 1 addition & 1 deletion ...gging/log4j/core/async/DisruptorUtil.java → ...ing/log4j/async/logger/DisruptorUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.logging.log4j.core.async;
package org.apache.logging.log4j.async.logger;

import static org.apache.logging.log4j.core.impl.Log4jPropertyKey.ASYNC_CONFIG_EXCEPTION_HANDLER_CLASS_NAME;
import static org.apache.logging.log4j.core.impl.Log4jPropertyKey.ASYNC_LOGGER_EXCEPTION_HANDLER_CLASS_NAME;
Expand Down
3 changes: 2 additions & 1 deletion .../log4j/core/async/RingBufferLogEvent.java → ...og4j/async/logger/RingBufferLogEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.logging.log4j.core.async;
package org.apache.logging.log4j.async.logger;

import com.lmax.disruptor.EventFactory;
import java.util.Arrays;
Expand All @@ -23,6 +23,7 @@
import org.apache.logging.log4j.ThreadContext.ContextStack;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.ReusableLogEvent;
import org.apache.logging.log4j.core.async.InternalAsyncUtil;
import org.apache.logging.log4j.core.impl.ContextDataFactory;
import org.apache.logging.log4j.core.impl.Log4jLogEvent;
import org.apache.logging.log4j.core.impl.MementoMessage;
Expand Down
2 changes: 1 addition & 1 deletion ...core/async/RingBufferLogEventHandler.java → ...ync/logger/RingBufferLogEventHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.logging.log4j.core.async;
package org.apache.logging.log4j.async.logger;

import com.lmax.disruptor.EventHandler;
import com.lmax.disruptor.Sequence;
Expand Down
2 changes: 1 addition & 1 deletion ...e/async/RingBufferLogEventTranslator.java → .../logger/RingBufferLogEventTranslator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.logging.log4j.core.async;
package org.apache.logging.log4j.async.logger;

import com.lmax.disruptor.EventTranslator;
import org.apache.logging.log4j.Level;
Expand Down
2 changes: 1 addition & 1 deletion ...re/async/TimeoutBlockingWaitStrategy.java → ...c/logger/TimeoutBlockingWaitStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.logging.log4j.core.async;
package org.apache.logging.log4j.async.logger;

import com.lmax.disruptor.AlertException;
import com.lmax.disruptor.BatchEventProcessor;
Expand Down
52 changes: 52 additions & 0 deletions ...async-logger/src/test/java/org/apache/logging/log4j/async/logger/AsyncLateConfigTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
/*
* 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.logging.log4j.async.logger;

import java.nio.file.Path;
import java.util.stream.Stream;
import org.apache.logging.log4j.core.impl.Log4jContextFactory;
import org.apache.logging.log4j.core.selector.ContextSelector;
import org.apache.logging.log4j.core.test.LateConfigAbstractTest;
import org.apache.logging.log4j.plugins.di.ConfigurableInstanceFactory;
import org.apache.logging.log4j.plugins.di.DI;
import org.apache.logging.log4j.test.junit.TempLoggingDir;
import org.apache.logging.log4j.test.junit.UsingStatusListener;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;

@Tag("functional")
@UsingStatusListener
public class AsyncLateConfigTest extends LateConfigAbstractTest {

@TempLoggingDir
private static Path loggingPath;

static Stream<Log4jContextFactory> selectors() {
final ConfigurableInstanceFactory instanceFactory = DI.createInitializedFactory();
return Stream.<ContextSelector>of(
new AsyncLoggerContextSelector(instanceFactory.newChildInstanceFactory()),
new BasicAsyncLoggerContextSelector(instanceFactory.newChildInstanceFactory()))
.map(Log4jContextFactory::new);
}

@ParameterizedTest(name = "reconfigure {0}")
@MethodSource("selectors")
void reconfiguration(final Log4jContextFactory factory) throws Exception {
testReconfiguration(factory, loggingPath);
}
}
2 changes: 1 addition & 1 deletion ...ync/AsyncLoggerClassLoadDeadlockTest.java → ...ger/AsyncLoggerClassLoadDeadlockTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.logging.log4j.core.async;
package org.apache.logging.log4j.async.logger;

import static org.junit.jupiter.api.Assertions.assertNotNull;

Expand Down
2 changes: 1 addition & 1 deletion ...4j/core/async/AsyncLoggerConfig2Test.java → .../async/logger/AsyncLoggerConfig2Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.logging.log4j.core.async;
package org.apache.logging.log4j.async.logger;

import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
Expand Down
2 changes: 1 addition & 1 deletion ...4j/core/async/AsyncLoggerConfig3Test.java → .../async/logger/AsyncLoggerConfig3Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.logging.log4j.core.async;
package org.apache.logging.log4j.async.logger;

import java.nio.file.Path;
import java.util.HashMap;
Expand Down
2 changes: 1 addition & 1 deletion ...4j/core/async/AsyncLoggerConfig4Test.java → .../async/logger/AsyncLoggerConfig4Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.logging.log4j.core.async;
package org.apache.logging.log4j.async.logger;

import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.equalTo;
Expand Down
2 changes: 1 addition & 1 deletion ...async/AsyncLoggerConfigAutoFlushTest.java → ...ogger/AsyncLoggerConfigAutoFlushTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.logging.log4j.core.async;
package org.apache.logging.log4j.async.logger;

import static org.junit.jupiter.api.Assertions.assertTrue;

Expand Down
2 changes: 1 addition & 1 deletion ...async/AsyncLoggerConfigErrorOnFormat.java → ...ogger/AsyncLoggerConfigErrorOnFormat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.logging.log4j.core.async;
package org.apache.logging.log4j.async.logger;

import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsString;
Expand Down
4 changes: 2 additions & 2 deletions ...g4j/core/async/AsyncLoggerConfigTest.java → ...j/async/logger/AsyncLoggerConfigTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.logging.log4j.core.async;
package org.apache.logging.log4j.async.logger;

import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertFalse;
Expand All @@ -30,10 +30,10 @@
import java.nio.file.Path;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.async.logger.AsyncLoggerConfig.RootLogger;
import org.apache.logging.log4j.core.Appender;
import org.apache.logging.log4j.core.Filter;
import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.async.AsyncLoggerConfig.RootLogger;
import org.apache.logging.log4j.core.config.Configuration;
import org.apache.logging.log4j.core.config.LoggerConfig;
import org.apache.logging.log4j.core.config.NullConfiguration;
Expand Down
2 changes: 1 addition & 1 deletion ...syncLoggerConfigUseAfterShutdownTest.java → ...syncLoggerConfigUseAfterShutdownTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.logging.log4j.core.async;
package org.apache.logging.log4j.async.logger;

import java.nio.file.Path;
import org.apache.logging.log4j.Level;
Expand Down
Loading