This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit a7854ac1e52ca573c78450368d0729885360855c Author: Ralph Goers <[email protected]> AuthorDate: Tue May 24 23:07:11 2022 -0600 LOG4J2-3516 - Move perf tests to log4j-core-its --- log4j-core-its/pom.xml | 6 ++++ .../core/async/perftest/AbstractRunQueue.java | 17 ++++----- .../log4j/core/async/perftest/Histogram.java | 4 +-- .../log4j/core/async/perftest/IPerfTestRunner.java | 0 .../log4j/core/async/perftest/IdleStrategy.java | 2 +- .../core/async/perftest/MultiThreadPerfTest.java | 15 ++++---- .../core/async/perftest/NoOpIdleStrategy.java | 0 .../log4j/core/async/perftest/PerfTest.java | 0 .../log4j/core/async/perftest/PerfTestDriver.java | 40 +++++++++------------- .../async/perftest/PerfTestResultFormatter.java | 2 +- .../core/async/perftest/ResponseTimeTest.java | 23 ++++++------- .../log4j/core/async/perftest/RunConversant.java | 3 +- .../log4j/core/async/perftest/RunJCTools.java | 9 ++--- .../log4j/core/async/perftest/RunLog4j1.java | 0 .../log4j/core/async/perftest/RunLog4j2.java | 2 +- .../log4j/core/async/perftest/RunLogback.java | 0 .../log4j/core/async/perftest/SimplePerfTest.java | 4 +-- .../core/async/perftest/YieldIdleStrategy.java | 0 18 files changed, 59 insertions(+), 68 deletions(-) diff --git a/log4j-core-its/pom.xml b/log4j-core-its/pom.xml index 77edc541a0..dc38a2f1eb 100644 --- a/log4j-core-its/pom.xml +++ b/log4j-core-its/pom.xml @@ -153,6 +153,12 @@ <artifactId>wiremock-jre8</artifactId> <scope>test</scope> </dependency> + <!-- For Async tests --> + <dependency> + <groupId>org.hdrhistogram</groupId> + <artifactId>HdrHistogram</artifactId> + <scope>test</scope> + </dependency> </dependencies> <build> <plugins> diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/perftest/AbstractRunQueue.java b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/async/perftest/AbstractRunQueue.java similarity index 85% rename from log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/perftest/AbstractRunQueue.java rename to log4j-core-its/src/test/java/org/apache/logging/log4j/core/async/perftest/AbstractRunQueue.java index 7cf59b718e..fbf567bb4d 100644 --- a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/perftest/AbstractRunQueue.java +++ b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/async/perftest/AbstractRunQueue.java @@ -30,18 +30,15 @@ public abstract class AbstractRunQueue implements IPerfTestRunner { private final Thread backGroundThread; AbstractRunQueue() { - backGroundThread = new Thread(new Runnable() { - @Override - public void run() { - for (; ; ) { - try { - if (Objects.equals(queue.take(), STOP)) { - break; - } - } catch (final InterruptedException e) { - e.printStackTrace(); + backGroundThread = new Thread(() -> { + for (; ; ) { + try { + if (Objects.equals(queue.take(), STOP)) { break; } + } catch (final InterruptedException e) { + e.printStackTrace(); + break; } } }); diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/perftest/Histogram.java b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/async/perftest/Histogram.java similarity index 99% rename from log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/perftest/Histogram.java rename to log4j-core-its/src/test/java/org/apache/logging/log4j/core/async/perftest/Histogram.java index 37ab321d1f..49e6c8e729 100644 --- a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/perftest/Histogram.java +++ b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/async/perftest/Histogram.java @@ -189,9 +189,7 @@ public final class Histogram { maxValue = 0L; minValue = Long.MAX_VALUE; - for (int i = 0, size = counts.length; i < size; i++) { - counts[i] = 0L; - } + Arrays.fill(counts, 0L); } /** diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/perftest/IPerfTestRunner.java b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/async/perftest/IPerfTestRunner.java similarity index 100% rename from log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/perftest/IPerfTestRunner.java rename to log4j-core-its/src/test/java/org/apache/logging/log4j/core/async/perftest/IPerfTestRunner.java diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/perftest/IdleStrategy.java b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/async/perftest/IdleStrategy.java similarity index 96% rename from log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/perftest/IdleStrategy.java rename to log4j-core-its/src/test/java/org/apache/logging/log4j/core/async/perftest/IdleStrategy.java index 16ad04c9a9..6b46eba880 100644 --- a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/perftest/IdleStrategy.java +++ b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/async/perftest/IdleStrategy.java @@ -21,7 +21,7 @@ package org.apache.logging.log4j.core.async.perftest; * * <h3>Note regarding potential for TTSP(Time To Safe Point) issues</h3> * - * If the caller spins in a 'counted' loop, and the implementation does not include a safepoint poll this may cause a TTSP + * If the caller spins in a 'counted' loop, and the implementation does not include a a safepoint poll this may cause a TTSP * (Time To SafePoint) problem. If this is the case for your application you can solve it by preventing the idle method from * being inlined by using a Hotspot compiler command as a JVM argument e.g: * <code>-XX:CompileCommand=dontinline,org.apache.logging.log4j.core.async.perftest.NoOpIdleStrategy::idle</code> diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/perftest/MultiThreadPerfTest.java b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/async/perftest/MultiThreadPerfTest.java similarity index 90% rename from log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/perftest/MultiThreadPerfTest.java rename to log4j-core-its/src/test/java/org/apache/logging/log4j/core/async/perftest/MultiThreadPerfTest.java index ad77e49176..38ee47d0fd 100644 --- a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/perftest/MultiThreadPerfTest.java +++ b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/async/perftest/MultiThreadPerfTest.java @@ -37,15 +37,12 @@ public class MultiThreadPerfTest extends PerfTest { // warmup at least 2 rounds and at most 1 minute final Histogram warmupHist = PerfTest.createHistogram(); final long stop = System.nanoTime() + TimeUnit.MINUTES.toNanos(1); - final Runnable run1 = new Runnable() { - @Override - public void run() { - for (int i = 0; i < 10; i++) { - final int LINES = PerfTest.throughput ? 50000 : 200000; - runTest(runner, LINES, null, warmupHist, 2); - if (i > 0 && System.nanoTime() - stop >= 0) { - return; - } + final Runnable run1 = () -> { + for (int i = 0; i < 10; i++) { + final int LINES = PerfTest.throughput ? 50000 : 200000; + runTest(runner, LINES, null, warmupHist, 2); + if (i > 0 && System.nanoTime() - stop >= 0) { + return; } } }; diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/perftest/NoOpIdleStrategy.java b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/async/perftest/NoOpIdleStrategy.java similarity index 100% rename from log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/perftest/NoOpIdleStrategy.java rename to log4j-core-its/src/test/java/org/apache/logging/log4j/core/async/perftest/NoOpIdleStrategy.java diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTest.java b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTest.java similarity index 100% rename from log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTest.java rename to log4j-core-its/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTest.java diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTestDriver.java b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTestDriver.java similarity index 90% rename from log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTestDriver.java rename to log4j-core-its/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTestDriver.java index 11a575cb35..ea5b453cac 100644 --- a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTestDriver.java +++ b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTestDriver.java @@ -28,7 +28,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; import org.apache.logging.log4j.core.async.AsyncLoggerContextSelector; -import org.apache.logging.log4j.core.impl.Log4jPropertyKey; +import org.apache.logging.log4j.core.util.Integers; /** * Runs a sequence of performance tests. @@ -36,7 +36,7 @@ import org.apache.logging.log4j.core.impl.Log4jPropertyKey; public class PerfTestDriver { private static final String DEFAULT_WAIT_STRATEGY = "Block"; - enum WaitStrategy { + static enum WaitStrategy { Sleep, Yield, Block; @@ -95,17 +95,17 @@ public class PerfTestDriver { // args.add("-XX:+PrintGCApplicationConcurrentTime"); // args.add("-XX:+PrintSafepointStatistics"); - args.add("-D" + Log4jPropertyKey.Constant.CONFIG_V1_FILE_NAME + '=' + log4jConfig); // 1.2 - args.add("-D" + Log4jPropertyKey.Constant.CONFIG_LOCATION + '=' + log4jConfig); // 2.x + args.add("-Dlog4j.configuration=" + log4jConfig); // log4j 1.2 + args.add("-Dlog4j.configurationFile=" + log4jConfig); // log4j 2 args.add("-Dlogback.configurationFile=" + log4jConfig); // logback final int ringBufferSize = getUserSpecifiedRingBufferSize(); if (ringBufferSize >= 128) { - args.add("-D" + Log4jPropertyKey.Constant.ASYNC_CONFIG_RING_BUFFER_SIZE + '=' + ringBufferSize); - args.add("-D" + Log4jPropertyKey.Constant.ASYNC_LOGGER_RING_BUFFER_SIZE + '=' + ringBufferSize); + args.add("-DAsyncLoggerConfig.RingBufferSize=" + ringBufferSize); + args.add("-DAsyncLogger.RingBufferSize=" + ringBufferSize); } - args.add("-D" + Log4jPropertyKey.Constant.ASYNC_CONFIG_WAIT_STRATEGY + '=' + wait); - args.add("-D" + Log4jPropertyKey.Constant.ASYNC_LOGGER_WAIT_STRATEGY + '=' + wait); + args.add("-DAsyncLoggerConfig.WaitStrategy=" + wait); + args.add("-DAsyncLogger.WaitStrategy=" + wait); if (systemProperties != null) { Collections.addAll(args, systemProperties); } @@ -121,7 +121,7 @@ public class PerfTestDriver { private int getUserSpecifiedRingBufferSize() { try { - return Integer.parseInt(System.getProperty("RingBufferSize", "-1")); + return Integers.parseInt(System.getProperty("RingBufferSize", "-1")); } catch (final Exception ignored) { return -1; } @@ -179,7 +179,7 @@ public class PerfTestDriver { average += Long.parseLong(parts[i++].split("=")[1]); pct99 += Long.parseLong(parts[i++].split("=")[1]); pct99_99 += Long.parseLong(parts[i++].split("=")[1]); - count += Integer.parseInt(parts[i].split("=")[1]); + count += Integers.parseInt(parts[i].split("=")[1]); } else { throughputRowCount++; final String number = line.substring(0, line.indexOf(' ')); @@ -203,14 +203,14 @@ public class PerfTestDriver { } } - enum Runner { + static enum Runner { Log4j12(RunLog4j1.class), // Log4j2(RunLog4j2.class), // Logback(RunLogback.class); private final Class<? extends IPerfTestRunner> implementationClass; - Runner(final Class<? extends IPerfTestRunner> cls) { + private Runner(final Class<? extends IPerfTestRunner> cls) { this.implementationClass = cls; } } @@ -232,13 +232,11 @@ public class PerfTestDriver { final List<Setup> tests = new ArrayList<>(); // final String CACHEDCLOCK = "-Dlog4j.Clock=CachedClock"; - final String SYSCLOCK = asArgument(Log4jPropertyKey.Constant.CONFIG_CLOCK, "SystemClock"); - final String ALL_ASYNC = asArgument( - Log4jPropertyKey.Constant.CONTEXT_SELECTOR_CLASS_NAME, AsyncLoggerContextSelector.class.getName()); + final String SYSCLOCK = "-Dlog4j.Clock=SystemClock"; + final String ALL_ASYNC = "-DLog4jContextSelector=" + AsyncLoggerContextSelector.class.getName(); - final String THREADNAME = asArgument( - Log4jPropertyKey.Constant.ASYNC_LOGGER_THREAD_NAME_STRATEGY, - System.getProperty(Log4jPropertyKey.Constant.ASYNC_LOGGER_THREAD_NAME_STRATEGY, "CACHED")); + final String THREADNAME = "-DAsyncLogger.ThreadNameStrategy=" // + + System.getProperty("AsyncLogger.ThreadNameStrategy", "CACHED"); // includeLocation=false add(tests, 1, "perf3PlainNoLoc.xml", Runner.Log4j2, "Loggers all async", ALL_ASYNC, SYSCLOCK, THREADNAME); @@ -310,7 +308,7 @@ public class PerfTestDriver { private static void runPerfTests(final String[] args, final List<Setup> tests) throws IOException, InterruptedException, FileNotFoundException { final String java = args.length > 0 ? args[0] : "java"; - final int repeat = args.length > 1 ? Integer.parseInt(args[1]) : 5; + final int repeat = args.length > 1 ? Integers.parseInt(args[1]) : 5; int x = 0; for (final Setup setup : tests) { System.out.print(setup.description()); @@ -385,8 +383,4 @@ public class PerfTestDriver { t.start(); return t; } - - private static String asArgument(final String key, final String value) { - return String.format("-D%s=%s", key, value); - } } diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTestResultFormatter.java b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTestResultFormatter.java similarity index 99% rename from log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTestResultFormatter.java rename to log4j-core-its/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTestResultFormatter.java index 495110f48c..35d6c07693 100644 --- a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTestResultFormatter.java +++ b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTestResultFormatter.java @@ -151,7 +151,7 @@ class PerfTestResultFormatter { private Comparator<String> sort() { return new Comparator<String>() { - final List<String> expected = Arrays.asList( + List<String> expected = Arrays.asList( "1 thread", "2 threads", "4 threads", "8 threads", "16 threads", "32 threads", "64 threads"); @Override diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/perftest/ResponseTimeTest.java b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/async/perftest/ResponseTimeTest.java similarity index 94% rename from log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/perftest/ResponseTimeTest.java rename to log4j-core-its/src/test/java/org/apache/logging/log4j/core/async/perftest/ResponseTimeTest.java index abf61455c7..b67d39e2a5 100644 --- a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/perftest/ResponseTimeTest.java +++ b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/async/perftest/ResponseTimeTest.java @@ -16,8 +16,6 @@ */ package org.apache.logging.log4j.core.async.perftest; -import static org.apache.logging.log4j.util.Constants.isThreadLocalsEnabled; - import java.io.FileOutputStream; import java.io.IOException; import java.io.PrintStream; @@ -30,8 +28,8 @@ import org.HdrHistogram.Histogram; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.core.async.DefaultAsyncQueueFullPolicy; import org.apache.logging.log4j.core.async.EventRoute; -import org.apache.logging.log4j.core.impl.Log4jPropertyKey; import org.apache.logging.log4j.core.util.Constants; +import org.apache.logging.log4j.core.util.Integers; import org.apache.logging.log4j.core.util.Loader; /** @@ -111,18 +109,17 @@ public class ResponseTimeTest { + "and logger library (Log4j1, Log4j2, Logback, JUL)"); return; } - final int threadCount = Integer.parseInt(args[0]); + final int threadCount = Integers.parseInt(args[0]); final double loadMessagesPerSec = Double.parseDouble(args[1]); final String loggerLib = args.length > 2 ? args[2] : "Log4j2"; // print to console if ringbuffer is full - System.setProperty( - Log4jPropertyKey.ASYNC_LOGGER_QUEUE_FULL_POLICY.getKey(), PrintingAsyncQueueFullPolicy.class.getName()); - System.setProperty(Log4jPropertyKey.ASYNC_LOGGER_RING_BUFFER_SIZE.getKey(), String.valueOf(256 * 1024)); - // System.setProperty(Log4jProperties.CONTEXT_SELECTOR_CLASS_NAME, AsyncLoggerContextSelector.class.getName()); - // System.setProperty(Log4jProperties.CONFIG_LOCATION, "perf3PlainNoLoc.xml"); - if (System.getProperty(Log4jPropertyKey.ASYNC_LOGGER_WAIT_STRATEGY.getKey()) == null) { - System.setProperty(Log4jPropertyKey.ASYNC_LOGGER_WAIT_STRATEGY.getKey(), "Yield"); + System.setProperty("log4j2.AsyncQueueFullPolicy", PrintingAsyncQueueFullPolicy.class.getName()); + System.setProperty("AsyncLogger.RingBufferSize", String.valueOf(256 * 1024)); + // System.setProperty("Log4jContextSelector", AsyncLoggerContextSelector.class.getName()); + // System.setProperty("log4j.configurationFile", "perf3PlainNoLoc.xml"); + if (System.getProperty("AsyncLogger.WaitStrategy") == null) { + System.setProperty("AsyncLogger.WaitStrategy", "Yield"); } // for (Object key : System.getProperties().keySet()) { // System.out.println(key + "=" + System.getProperty((String) key)); @@ -163,7 +160,7 @@ public class ResponseTimeTest { warmupResponseTmHistograms, threadCount); System.out.println("-----------------Warmup done. load=" + loadMessagesPerSec); - if (!Constants.ENABLE_DIRECT_ENCODERS || !isThreadLocalsEnabled()) { + if (!Constants.ENABLE_DIRECT_ENCODERS || !Constants.ENABLE_THREADLOCALS) { // System.gc(); // Thread.sleep(5000); } @@ -207,7 +204,7 @@ public class ResponseTimeTest { private static void writeToFile( final String suffix, final Histogram hist, final int thousandMsgPerSec, final double scale) throws IOException { - try (final PrintStream pout = new PrintStream(new FileOutputStream(thousandMsgPerSec + "k" + suffix))) { + try (PrintStream pout = new PrintStream(new FileOutputStream(thousandMsgPerSec + "k" + suffix))) { hist.outputPercentileDistribution(pout, scale); } } diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/perftest/RunConversant.java b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/async/perftest/RunConversant.java similarity index 90% copy from log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/perftest/RunConversant.java copy to log4j-core-its/src/test/java/org/apache/logging/log4j/core/async/perftest/RunConversant.java index ce4545f1ec..a5ce8bc87b 100644 --- a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/perftest/RunConversant.java +++ b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/async/perftest/RunConversant.java @@ -24,6 +24,7 @@ public class RunConversant extends AbstractRunQueue { @Override BlockingQueue<String> createQueue(final int capacity) { - return DisruptorBlockingQueueFactory.createFactory(SpinPolicy.SPINNING).create(capacity); + return DisruptorBlockingQueueFactory.<String>createFactory(SpinPolicy.SPINNING) + .create(capacity); } } diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/perftest/RunConversant.java b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/async/perftest/RunJCTools.java similarity index 75% rename from log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/perftest/RunConversant.java rename to log4j-core-its/src/test/java/org/apache/logging/log4j/core/async/perftest/RunJCTools.java index ce4545f1ec..d84d86d86a 100644 --- a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/perftest/RunConversant.java +++ b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/async/perftest/RunJCTools.java @@ -16,14 +16,15 @@ */ package org.apache.logging.log4j.core.async.perftest; -import com.conversantmedia.util.concurrent.SpinPolicy; import java.util.concurrent.BlockingQueue; -import org.apache.logging.log4j.core.async.DisruptorBlockingQueueFactory; +import org.apache.logging.log4j.core.async.JCToolsBlockingQueueFactory; +import org.apache.logging.log4j.core.async.JCToolsBlockingQueueFactory.WaitStrategy; -public class RunConversant extends AbstractRunQueue { +public class RunJCTools extends AbstractRunQueue { @Override BlockingQueue<String> createQueue(final int capacity) { - return DisruptorBlockingQueueFactory.createFactory(SpinPolicy.SPINNING).create(capacity); + return JCToolsBlockingQueueFactory.<String>createFactory(WaitStrategy.SPIN) + .create(capacity); } } diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/perftest/RunLog4j1.java b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/async/perftest/RunLog4j1.java similarity index 100% rename from log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/perftest/RunLog4j1.java rename to log4j-core-its/src/test/java/org/apache/logging/log4j/core/async/perftest/RunLog4j1.java diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/perftest/RunLog4j2.java b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/async/perftest/RunLog4j2.java similarity index 97% rename from log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/perftest/RunLog4j2.java rename to log4j-core-its/src/test/java/org/apache/logging/log4j/core/async/perftest/RunLog4j2.java index 2f49e4eef0..cd0a0ac28a 100644 --- a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/perftest/RunLog4j2.java +++ b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/async/perftest/RunLog4j2.java @@ -18,7 +18,7 @@ package org.apache.logging.log4j.core.async.perftest; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.core.test.CoreLoggerContexts; +import org.apache.logging.log4j.core.CoreLoggerContexts; public class RunLog4j2 implements IPerfTestRunner { final Logger LOGGER = LogManager.getLogger(getClass()); diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/perftest/RunLogback.java b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/async/perftest/RunLogback.java similarity index 100% rename from log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/perftest/RunLogback.java rename to log4j-core-its/src/test/java/org/apache/logging/log4j/core/async/perftest/RunLogback.java diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/perftest/SimplePerfTest.java b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/async/perftest/SimplePerfTest.java similarity index 98% rename from log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/perftest/SimplePerfTest.java rename to log4j-core-its/src/test/java/org/apache/logging/log4j/core/async/perftest/SimplePerfTest.java index bd0213305a..d1de5621d2 100644 --- a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/perftest/SimplePerfTest.java +++ b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/async/perftest/SimplePerfTest.java @@ -148,9 +148,9 @@ public class SimplePerfTest { // use reflection so we can use the same test with older versions of log4j2 try { final Method setUseThreadLocals = - AsyncLoggerContext.class.getDeclaredMethod("setUseThreadLocals", new Class[] {boolean.class}); + AsyncLoggerContext.class.getDeclaredMethod("setUseThreadLocals", boolean.class); final LoggerContext context = LogManager.getContext(false); - setUseThreadLocals.invoke(context, new Object[] {Boolean.TRUE}); + setUseThreadLocals.invoke(context, Boolean.TRUE); } catch (final Throwable ignored) { } } diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/perftest/YieldIdleStrategy.java b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/async/perftest/YieldIdleStrategy.java similarity index 100% rename from log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/perftest/YieldIdleStrategy.java rename to log4j-core-its/src/test/java/org/apache/logging/log4j/core/async/perftest/YieldIdleStrategy.java
