This is an automated email from the ASF dual-hosted git repository.
rgoers pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/release-2.x by this push:
new 272a614b7f LOG4J2-3516 - Move perf tests to log4j-core-its
272a614b7f is described below
commit 272a614b7fcb7b604c573394bab76c949f564d9f
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 ++++++
.../logging/log4j/core/async/perftest/AbstractRunQueue.java | 0
.../apache/logging/log4j/core/async/perftest/Histogram.java | 0
.../logging/log4j/core/async/perftest/IPerfTestRunner.java | 0
.../logging/log4j/core/async/perftest/IdleStrategy.java | 0
.../log4j/core/async/perftest/MultiThreadPerfTest.java | 0
.../logging/log4j/core/async/perftest/NoOpIdleStrategy.java | 0
.../apache/logging/log4j/core/async/perftest/PerfTest.java | 0
.../logging/log4j/core/async/perftest/PerfTestDriver.java | 0
.../log4j/core/async/perftest/PerfTestResultFormatter.java | 0
.../logging/log4j/core/async/perftest/ResponseTimeTest.java | 0
.../logging/log4j/core/async/perftest/RunConversant.java | 0
.../apache/logging/log4j/core/async/perftest/RunJCTools.java | 0
.../apache/logging/log4j/core/async/perftest/RunLog4j1.java | 0
.../apache/logging/log4j/core/async/perftest/RunLog4j2.java | 0
.../apache/logging/log4j/core/async/perftest/RunLogback.java | 0
.../logging/log4j/core/async/perftest/SimplePerfTest.java | 0
.../logging/log4j/core/async/perftest/YieldIdleStrategy.java | 0
log4j-core/pom.xml | 12 ------------
.../log4j/core/appender/mom/kafka/KafkaAppenderTest.java | 8 ++++----
20 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/log4j-core-its/pom.xml b/log4j-core-its/pom.xml
index 965ac042dc..57c2d619e4 100644
--- a/log4j-core-its/pom.xml
+++ b/log4j-core-its/pom.xml
@@ -176,6 +176,12 @@
</exclusion>
</exclusions>
</dependency>
+ <!-- For Async tests -->
+ <dependency>
+ <groupId>org.hdrhistogram</groupId>
+ <artifactId>HdrHistogram</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
diff --git
a/log4j-core/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 100%
rename from
log4j-core/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
diff --git
a/log4j-core/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 100%
rename from
log4j-core/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
diff --git
a/log4j-core/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/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/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 100%
rename from
log4j-core/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
diff --git
a/log4j-core/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 100%
rename from
log4j-core/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
diff --git
a/log4j-core/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/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/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/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/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 100%
rename from
log4j-core/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
diff --git
a/log4j-core/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 100%
rename from
log4j-core/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
diff --git
a/log4j-core/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 100%
rename from
log4j-core/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
diff --git
a/log4j-core/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 100%
rename from
log4j-core/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/RunConversant.java
diff --git
a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/RunJCTools.java
b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/async/perftest/RunJCTools.java
similarity index 100%
rename from
log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/RunJCTools.java
rename to
log4j-core-its/src/test/java/org/apache/logging/log4j/core/async/perftest/RunJCTools.java
diff --git
a/log4j-core/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/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/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 100%
rename from
log4j-core/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
diff --git
a/log4j-core/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/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/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 100%
rename from
log4j-core/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
diff --git
a/log4j-core/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/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
diff --git a/log4j-core/pom.xml b/log4j-core/pom.xml
index f21e19afa5..5e48dfd4dd 100644
--- a/log4j-core/pom.xml
+++ b/log4j-core/pom.xml
@@ -176,13 +176,6 @@
<version>3.5.7</version>
<scope>test</scope>
</dependency>
- <!-- Log4j 1.2 tests -->
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.17</version>
- <scope>test</scope>
- </dependency>
<!-- SLF4J tests -->
<dependency>
<groupId>org.slf4j</groupId>
@@ -350,11 +343,6 @@
<artifactId>java-allocation-instrumenter</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.hdrhistogram</groupId>
- <artifactId>HdrHistogram</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
diff --git
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaAppenderTest.java
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaAppenderTest.java
index 45f4064739..787dbd25eb 100644
---
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaAppenderTest.java
+++
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaAppenderTest.java
@@ -36,8 +36,8 @@ import java.util.concurrent.TimeoutException;
import org.apache.kafka.clients.producer.MockProducer;
import org.apache.kafka.clients.producer.ProducerRecord;
import org.apache.kafka.clients.producer.RecordMetadata;
-import org.apache.log4j.MDC;
import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.ThreadContext;
import org.apache.logging.log4j.categories.Appenders;
import org.apache.logging.log4j.core.Appender;
import org.apache.logging.log4j.core.LogEvent;
@@ -61,7 +61,7 @@ public class KafkaAppenderTest {
Future<RecordMetadata> retVal = super.send(record);
- boolean isRetryTest =
"true".equals(MDC.get("KafkaAppenderWithRetryCount"));
+ boolean isRetryTest =
"true".equals(ThreadContext.get("KafkaAppenderWithRetryCount"));
if (isRetryTest) {
try {
throw new TimeoutException();
@@ -179,7 +179,7 @@ public class KafkaAppenderTest {
@Test
public void testAppendWithRetryCount() {
try {
- MDC.put("KafkaAppenderWithRetryCount", "true");
+ ThreadContext.put("KafkaAppenderWithRetryCount",
"true");
final Appender appender =
ctx.getRequiredAppender("KafkaAppenderWithRetryCount");
final LogEvent logEvent = createLogEvent();
appender.append(logEvent);
@@ -189,7 +189,7 @@ public class KafkaAppenderTest {
} catch (Exception e) {
e.printStackTrace();
} finally {
- MDC.clear();
+ ThreadContext.clearMap();
}
}
