getWatchers() {
}
public boolean hasEventListeners() {
- return eventServiceList.size() > 0;
+ return !eventServiceList.isEmpty();
}
private String millisToString(final long millis) {
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/internal/HttpInputStreamUtil.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/internal/HttpInputStreamUtil.java
index c146958f9fe..2c25ed2d255 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/internal/HttpInputStreamUtil.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/internal/HttpInputStreamUtil.java
@@ -16,17 +16,24 @@
*/
package org.apache.logging.log4j.core.util.internal;
+import static org.apache.logging.log4j.util.Strings.toRootUpperCase;
+
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.HttpURLConnection;
+import java.time.Instant;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.config.ConfigurationException;
import org.apache.logging.log4j.core.net.UrlConnectionFactory;
import org.apache.logging.log4j.core.net.ssl.SslConfigurationFactory;
import org.apache.logging.log4j.core.util.AuthorizationProvider;
+import org.apache.logging.log4j.core.util.Source;
import org.apache.logging.log4j.status.StatusLogger;
+import org.apache.logging.log4j.util.Supplier;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
/**
* Utility method for reading data from an HTTP InputStream.
@@ -36,10 +43,21 @@ public final class HttpInputStreamUtil {
private static final Logger LOGGER = StatusLogger.getLogger();
private static final int NOT_MODIFIED = 304;
private static final int NOT_AUTHORIZED = 401;
+ private static final int FORBIDDEN = 403;
private static final int NOT_FOUND = 404;
private static final int OK = 200;
private static final int BUF_SIZE = 1024;
+ /**
+ * Retrieves an HTTP resource if it has been modified.
+ *
+ * Side effects: if the request is successful, the last modified time of the {@code source}
+ * parameter is modified.
+ *
+ * @param source The location of the HTTP resource
+ * @param authorizationProvider The authentication data for the HTTP request
+ * @return A {@link Result} object containing the status code and body of the response
+ */
public static Result getInputStream(
final LastModifiedSource source, final AuthorizationProvider authorizationProvider) {
final Result result = new Result();
@@ -55,12 +73,16 @@ public static Result getInputStream(
final int code = connection.getResponseCode();
switch (code) {
case NOT_MODIFIED: {
- LOGGER.debug("Configuration not modified");
+ LOGGER.debug(
+ "{} resource {}: not modified since {}",
+ formatProtocol(source),
+ () -> source,
+ () -> Instant.ofEpochMilli(lastModified));
result.status = Status.NOT_MODIFIED;
return result;
}
case NOT_FOUND: {
- LOGGER.debug("Unable to access {}: Not Found", source.toString());
+ LOGGER.debug("{} resource {}: not found", formatProtocol(source), () -> source);
result.status = Status.NOT_FOUND;
return result;
}
@@ -68,45 +90,65 @@ public static Result getInputStream(
try (final InputStream is = connection.getInputStream()) {
source.setLastModified(connection.getLastModified());
LOGGER.debug(
- "Content was modified for {}. previous lastModified: {}, new lastModified: {}",
- source.toString(),
- lastModified,
- connection.getLastModified());
+ "{} resource {}: last modified on {}",
+ formatProtocol(source),
+ () -> source,
+ () -> Instant.ofEpochMilli(connection.getLastModified()));
result.status = Status.SUCCESS;
- result.inputStream = new ByteArrayInputStream(readStream(is));
+ result.bytes = readStream(is);
return result;
} catch (final IOException e) {
try (final InputStream es = connection.getErrorStream()) {
- LOGGER.info(
- "Error accessing configuration at {}: {}", source.toString(), readStream(es));
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug(
+ "Error accessing {} resource at {}: {}",
+ formatProtocol(source).get(),
+ source,
+ readStream(es),
+ e);
+ }
} catch (final IOException ioe) {
- LOGGER.error(
- "Error accessing configuration at {}: {}", source.toString(), e.getMessage());
+ LOGGER.debug(
+ "Error accessing {} resource at {}",
+ formatProtocol(source),
+ () -> source,
+ () -> e);
}
- throw new ConfigurationException("Unable to access " + source.toString(), e);
+ throw new ConfigurationException("Unable to access " + source, e);
}
}
case NOT_AUTHORIZED: {
- throw new ConfigurationException("Authorization failed");
+ throw new ConfigurationException("Authentication required for " + source);
+ }
+ case FORBIDDEN: {
+ throw new ConfigurationException("Access denied to " + source);
}
default: {
if (code < 0) {
- LOGGER.info("Invalid response code returned");
+ LOGGER.debug("{} resource {}: invalid response code", formatProtocol(source), source);
} else {
- LOGGER.info("Unexpected response code returned {}", code);
+ LOGGER.debug(
+ "{} resource {}: unexpected response code {}",
+ formatProtocol(source),
+ source,
+ code);
}
- throw new ConfigurationException("Unable to access " + source.toString());
+ throw new ConfigurationException("Unable to access " + source);
}
}
} finally {
connection.disconnect();
}
} catch (IOException e) {
- LOGGER.warn("Error accessing {}: {}", source.toString(), e.getMessage());
- throw new ConfigurationException("Unable to access " + source.toString(), e);
+ LOGGER.debug("Error accessing {} resource at {}", formatProtocol(source), source, e);
+ throw new ConfigurationException("Unable to access " + source, e);
}
}
+ private static Supplier formatProtocol(Source source) {
+ return () -> toRootUpperCase(source.getURI().getScheme());
+ }
+
public static byte[] readStream(final InputStream is) throws IOException {
final ByteArrayOutputStream result = new ByteArrayOutputStream();
final byte[] buffer = new byte[BUF_SIZE];
@@ -117,19 +159,29 @@ public static byte[] readStream(final InputStream is) throws IOException {
return result.toByteArray();
}
+ @NullMarked
public static class Result {
- private InputStream inputStream;
+ private byte @Nullable [] bytes = null;
private Status status;
- public Result() {}
+ public Result() {
+ this(Status.ERROR);
+ }
public Result(final Status status) {
this.status = status;
}
- public InputStream getInputStream() {
- return inputStream;
+ /**
+ * Returns the data if the status is {@link Status#SUCCESS}.
+ *
+ * In any other case the result is {@code null}.
+ *
+ * @return The contents of the HTTP response or null if empty.
+ */
+ public @Nullable InputStream getInputStream() {
+ return bytes != null ? new ByteArrayInputStream(bytes) : null;
}
public Status getStatus() {
diff --git a/log4j-layout-template-json-test/pom.xml b/log4j-layout-template-json-test/pom.xml
index 7031fd4d80b..51bc8a9660b 100644
--- a/log4j-layout-template-json-test/pom.xml
+++ b/log4j-layout-template-json-test/pom.xml
@@ -43,6 +43,14 @@
org.apache.logging.log4j.layout.template.json.test
org.apache.logging.log4j.core
+
+ 8.15.1
+
@@ -85,6 +93,7 @@
co.elastic.clients
elasticsearch-java
+ ${elastic.version}
test
@@ -129,23 +138,6 @@
-
-
- org.apache.maven.plugins
- maven-failsafe-plugin
-
- true
-
-
-
-
- integration-test
- verify
-
-
-
-
-
org.apache.maven.plugins
maven-surefire-plugin
@@ -170,15 +162,29 @@
docker
+
- false
+
+ linux
+
+
+ env.CI
+ true
+
- 8.10.2
+
+
+ false
+ false
+
- -Xms750m -Xmx750m
+ -Xms750m -Xmx750m
+
@@ -188,7 +194,6 @@
io.fabric8
docker-maven-plugin
- all
true
true
@@ -199,10 +204,11 @@
single-node
false
- ${elastic.java-opts}
+ ${elastic.javaOpts}
- 9200:9200
+
+ localhost:elasticsearch.port:9200
custom
@@ -214,7 +220,11 @@
cyan
- recovered \[0\] indices into cluster_state
+
+
+ 9200
+
+
@@ -232,11 +242,13 @@
logstash
- ${elastic.java-opts}
+ ${elastic.javaOpts}
- 12222:12222
- 12345:12345
+
+ localhost:logstash.gelf.port:12222
+
+ localhost:logstash.tcp.port:12345
[LS]
@@ -248,54 +260,71 @@
--pipeline.batch.size
1
-e
- input {
+ "logstash"
+ use_tcp => true
+ use_udp => false
+ port => 12222
+ type => "gelf"
}
+
+ # Documentation: https://www.elastic.co/guide/en/logstash/current/plugins-inputs-tcp.html
tcp {
- port => 12345
- codec => json
- type => "tcp"
+ port => 12345
+ codec => json
+ type => "tcp"
}
+
}
filter {
if [type] == "gelf" {
# These are GELF/Syslog logging levels as defined in RFC 3164.
- # Map the integer level to its human readable format.
+ # Map the integer level to its human-readable format.
+ # Documentation: https://www.elastic.co/guide/en/logstash/current/plugins-filters-translate.html
translate {
- field => "[level]"
- destination => "[levelName]"
- dictionary => {
- "0" => "EMERG"
- "1" => "ALERT"
- "2" => "CRITICAL"
- "3" => "ERROR"
- "4" => "WARN"
- "5" => "NOTICE"
- "6" => "INFO"
- "7" => "DEBUG"
+ source => "[level]"
+ target => "[levelName]"
+ dictionary => {
+ "0" => "EMERG"
+ "1" => "ALERT"
+ "2" => "CRITICAL"
+ "3" => "ERROR"
+ "4" => "WARN"
+ "5" => "NOTICE"
+ "6" => "INFO"
+ "7" => "DEBUG"
}
}
}
}
+ # Documentation: https://www.elastic.co/guide/en/logstash/current/plugins-filters-elasticsearch.html
output {
# (Un)comment for debugging purposes
- # stdout { codec => rubydebug }
+ # stdout { codec => rubydebug }
elasticsearch {
- hosts => ["http://elasticsearch:9200"]
- index => "log4j"
+ hosts => ["http://elasticsearch:9200"]
+ index => "log4j"
}
- }
+ }
+
+ ]]>
- Successfully started Logstash API endpoint
+
+ localhost
+
+ 12222
+ 12345
+
+
@@ -327,6 +356,11 @@
**/*IT.java
+
+ ${elasticsearch.port}
+ ${logstash.gelf.port}
+ ${logstash.tcp.port}
+
diff --git a/log4j-layout-template-json-test/src/test/java/org/apache/logging/log4j/layout/template/json/LogstashIT.java b/log4j-layout-template-json-test/src/test/java/org/apache/logging/log4j/layout/template/json/LogstashIT.java
index abb86f8ebc0..17b83629755 100644
--- a/log4j-layout-template-json-test/src/test/java/org/apache/logging/log4j/layout/template/json/LogstashIT.java
+++ b/log4j-layout-template-json-test/src/test/java/org/apache/logging/log4j/layout/template/json/LogstashIT.java
@@ -16,6 +16,9 @@
*/
package org.apache.logging.log4j.layout.template.json;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
+
import co.elastic.clients.elasticsearch.ElasticsearchClient;
import co.elastic.clients.elasticsearch._types.ElasticsearchException;
import co.elastic.clients.elasticsearch._types.HealthStatus;
@@ -32,6 +35,7 @@
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.PrintStream;
+import java.net.Socket;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.time.Duration;
@@ -41,6 +45,7 @@
import java.util.Map;
import java.util.Objects;
import java.util.Set;
+import java.util.concurrent.TimeUnit;
import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -53,13 +58,11 @@
import org.apache.logging.log4j.core.config.DefaultConfiguration;
import org.apache.logging.log4j.core.impl.Log4jLogEvent;
import org.apache.logging.log4j.core.layout.GelfLayout;
-import org.apache.logging.log4j.core.util.NetUtils;
import org.apache.logging.log4j.layout.template.json.JsonTemplateLayout.EventTemplateAdditionalField;
import org.apache.logging.log4j.layout.template.json.util.ThreadLocalRecyclerFactory;
import org.apache.logging.log4j.message.SimpleMessage;
import org.apache.logging.log4j.status.StatusLogger;
-import org.assertj.core.api.Assertions;
-import org.awaitility.Awaitility;
+import org.apache.logging.log4j.util.Strings;
import org.elasticsearch.client.RestClient;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
@@ -71,14 +74,14 @@
@Execution(ExecutionMode.SAME_THREAD)
class LogstashIT {
+ private static final String LOG_PREFIX = LogstashIT.class.getSimpleName() + ' ';
+
private static final StatusLogger LOGGER = StatusLogger.getLogger();
private static final DefaultConfiguration CONFIGURATION = new DefaultConfiguration();
private static final Charset CHARSET = StandardCharsets.UTF_8;
- private static final String HOST_NAME = NetUtils.getLocalHostname();
-
private static final String SERVICE_NAME = "LogstashIT";
private static final String EVENT_DATASET = SERVICE_NAME + ".log";
@@ -88,7 +91,7 @@ class LogstashIT {
.setCharset(CHARSET)
.setCompressionType(GelfLayout.CompressionType.OFF)
.setIncludeNullDelimiter(true)
- .setHost(HOST_NAME)
+ .setHost(MavenHardcodedConstants.HOST_NAME)
.build();
private static final JsonTemplateLayout JSON_TEMPLATE_GELF_LAYOUT = JsonTemplateLayout.newBuilder()
@@ -99,13 +102,12 @@ class LogstashIT {
.setEventTemplateAdditionalFields(new EventTemplateAdditionalField[] {
EventTemplateAdditionalField.newBuilder()
.setKey("host")
- .setValue(HOST_NAME)
+ .setValue(MavenHardcodedConstants.HOST_NAME)
.build()
})
.build();
- // Note that EcsLayout doesn't support charset configuration, though it uses
- // UTF-8 internally.
+ // Note that `EcsLayout` doesn't support charset configuration, though it uses UTF-8 internally.
private static final EcsLayout ECS_LAYOUT = EcsLayout.newBuilder()
.setConfiguration(CONFIGURATION)
.setServiceName(SERVICE_NAME)
@@ -140,44 +142,85 @@ class LogstashIT {
private static ElasticsearchClient ES_CLIENT;
/**
- * Constants hardcoded in docker-maven-plugin configuration, do not change!
+ * Constants hardcoded in `docker-maven-plugin` configuration, do not change!
*/
private static final class MavenHardcodedConstants {
private MavenHardcodedConstants() {}
- private static final int LS_GELF_INPUT_PORT = 12222;
+ private static final String HOST_NAME = "localhost";
- private static final int LS_TCP_INPUT_PORT = 12345;
+ private static final int LS_GELF_INPUT_PORT = readPort("log4j.logstash.gelf.port");
- private static final int ES_PORT = 9200;
+ private static final int LS_TCP_INPUT_PORT = readPort("log4j.logstash.tcp.port");
+
+ private static final int ES_PORT = readPort("log4j.elasticsearch.port");
private static final String ES_INDEX_NAME = "log4j";
+
+ private static int readPort(final String propertyName) {
+ final String propertyValue = System.getProperty(propertyName);
+ final int port;
+ final String errorMessage = String.format(
+ "was expecting a valid port number in the system property `%s`, found: `%s`",
+ propertyName, propertyValue);
+ try {
+ if (Strings.isBlank(propertyValue) || (port = Integer.parseInt(propertyValue)) < 0 || port >= 0xFFFF) {
+ throw new IllegalArgumentException(errorMessage);
+ }
+ } catch (final NumberFormatException error) {
+ throw new IllegalArgumentException(errorMessage, error);
+ }
+ return port;
+ }
}
@BeforeAll
- public static void initClient() throws IOException {
+ public static void initEsClient() {
- LOGGER.info("instantiating the ES client");
- REST_CLIENT = RestClient.builder(
- HttpHost.create(String.format("http://%s:%d", HOST_NAME, MavenHardcodedConstants.ES_PORT)))
- .build();
+ LOGGER.info(LOG_PREFIX + "instantiating the ES client");
+ final String hostUri =
+ String.format("http://%s:%d", MavenHardcodedConstants.HOST_NAME, MavenHardcodedConstants.ES_PORT);
+ REST_CLIENT = RestClient.builder(HttpHost.create(hostUri)).build();
ES_TRANSPORT = new RestClientTransport(REST_CLIENT, new JacksonJsonpMapper());
ES_CLIENT = new ElasticsearchClient(ES_TRANSPORT);
- LOGGER.info("verifying the ES connection");
- HealthResponse healthResponse = ES_CLIENT.cluster().health();
- Assertions.assertThat(healthResponse.status()).isNotEqualTo(HealthStatus.Red);
+ LOGGER.info(LOG_PREFIX + "verifying the ES connection to `{}`", hostUri);
+ await("ES cluster health")
+ .pollDelay(100, TimeUnit.MILLISECONDS)
+ .atMost(1, TimeUnit.MINUTES)
+ .untilAsserted(() -> {
+ final HealthResponse healthResponse = ES_CLIENT.cluster().health();
+ assertThat(healthResponse.status()).isNotEqualTo(HealthStatus.Red);
+ });
+ }
+
+ @BeforeAll
+ public static void waitForLsInputSockets() {
+ waitForSocketBinding(MavenHardcodedConstants.LS_GELF_INPUT_PORT, "Logstash GELF input");
+ waitForSocketBinding(MavenHardcodedConstants.LS_TCP_INPUT_PORT, "Logstash TCP input");
+ }
+
+ private static void waitForSocketBinding(final int port, final String name) {
+ LOGGER.info(LOG_PREFIX + "verifying socket binding at port {} for {}", port, name);
+ await("socket binding at port " + port)
+ .pollDelay(100, TimeUnit.MILLISECONDS)
+ .atMost(1, TimeUnit.MINUTES)
+ .untilAsserted(() -> {
+ try (final Socket socket = new Socket(MavenHardcodedConstants.HOST_NAME, port)) {
+ assertThat(socket.isConnected()).isTrue();
+ }
+ });
}
@BeforeEach
void deleteIndex() throws IOException {
- LOGGER.info("deleting the ES index");
+ LOGGER.info(LOG_PREFIX + "deleting the ES index");
try {
DeleteIndexResponse deleteIndexResponse = ES_CLIENT
.indices()
.delete(DeleteIndexRequest.of(builder -> builder.index(MavenHardcodedConstants.ES_INDEX_NAME)));
- Assertions.assertThat(deleteIndexResponse.acknowledged()).isTrue();
+ assertThat(deleteIndexResponse.acknowledged()).isTrue();
} catch (ElasticsearchException error) {
if (!error.getMessage().contains("index_not_found_exception")) {
throw new RuntimeException(error);
@@ -209,15 +252,15 @@ private static void testEvents(final List logEvents) throws IOExceptio
try {
// Append events.
- LOGGER.info("appending events");
+ LOGGER.info(LOG_PREFIX + "appending events");
logEvents.forEach(appender::append);
- LOGGER.info("completed appending events");
+ LOGGER.info(LOG_PREFIX + "completed appending events");
// Wait all messages to arrive.
- Awaitility.await()
+ await("message delivery")
.atMost(Duration.ofSeconds(60))
.pollDelay(Duration.ofSeconds(2))
- .until(() -> checkDocumentCount(LOG_EVENT_COUNT));
+ .untilAsserted(() -> assertDocumentCount(LOG_EVENT_COUNT));
// Verify indexed messages.
final Set expectedMessages = logEvents.stream()
@@ -227,7 +270,7 @@ private static void testEvents(final List logEvents) throws IOExceptio
.map(source -> (String) source.get(ES_INDEX_MESSAGE_FIELD_NAME))
.filter(Objects::nonNull)
.collect(Collectors.toSet());
- Assertions.assertThat(actualMessages).isEqualTo(expectedMessages);
+ assertThat(actualMessages).isEqualTo(expectedMessages);
} finally {
appender.stop();
@@ -280,16 +323,16 @@ void test_newlines() throws IOException {
try {
// Append the event.
- LOGGER.info("appending events");
+ LOGGER.info(LOG_PREFIX + "appending events");
appender.append(logEvent1);
appender.append(logEvent2);
- LOGGER.info("completed appending events");
+ LOGGER.info(LOG_PREFIX + "completed appending events");
// Wait the message to arrive.
- Awaitility.await()
+ await("message delivery")
.atMost(Duration.ofSeconds(60))
.pollDelay(Duration.ofSeconds(2))
- .until(() -> checkDocumentCount(2));
+ .untilAsserted(() -> assertDocumentCount(2));
// Verify indexed messages.
final Set expectedMessages = Stream.of(logEvent1, logEvent2)
@@ -299,7 +342,7 @@ void test_newlines() throws IOException {
.map(source -> (String) source.get(ES_INDEX_MESSAGE_FIELD_NAME))
.filter(Objects::nonNull)
.collect(Collectors.toSet());
- Assertions.assertThat(actualMessages).isEqualTo(expectedMessages);
+ assertThat(actualMessages).isEqualTo(expectedMessages);
} finally {
appender.stop();
@@ -336,7 +379,7 @@ void test_GelfLayout() throws IOException {
Collections.emptySet());
// Compare persisted sources.
- Assertions.assertThat(actualSourceByKey).isEqualTo(expectedSourceByKey);
+ assertThat(actualSourceByKey).isEqualTo(expectedSourceByKey);
}
@Test
@@ -370,7 +413,7 @@ void test_EcsLayout() throws IOException {
excludedKeys);
// Compare persisted sources.
- Assertions.assertThat(actualSourceByKey).isEqualTo(expectedSourceByKey);
+ assertThat(actualSourceByKey).isEqualTo(expectedSourceByKey);
}
private static Map appendAndCollect(
@@ -384,15 +427,15 @@ private static Map appendAndCollect(
try {
// Append the event.
- LOGGER.info("appending events");
+ LOGGER.info(LOG_PREFIX + "appending events");
logEvents.forEach(appender::append);
- LOGGER.info("completed appending events");
+ LOGGER.info(LOG_PREFIX + "completed appending events");
// Wait the message to arrive.
- Awaitility.await()
+ await("message delivery")
.atMost(Duration.ofSeconds(60))
.pollDelay(Duration.ofSeconds(2))
- .until(() -> checkDocumentCount(LOG_EVENT_COUNT));
+ .untilAsserted(() -> assertDocumentCount(LOG_EVENT_COUNT));
// Retrieve the persisted messages.
return queryDocuments().stream().collect(Collectors.toMap(keyMapper, (final Map source) -> {
@@ -406,10 +449,10 @@ private static Map appendAndCollect(
}
private static SocketAppender createStartedAppender(final Layout layout, final int port) {
- LOGGER.info("creating the appender");
+ LOGGER.info(LOG_PREFIX + "creating the appender");
final SocketAppender appender = SocketAppender.newBuilder()
.setConfiguration(CONFIGURATION)
- .setHost(HOST_NAME)
+ .setHost(MavenHardcodedConstants.HOST_NAME)
.setPort(port)
.setReconnectDelayMillis(100)
.setName("LogstashItAppender")
@@ -422,12 +465,27 @@ private static SocketAppender createStartedAppender(final Layout layout, fina
return appender;
}
- private static boolean checkDocumentCount(int expectedCount) throws IOException {
- final CountResponse countResponse =
- ES_CLIENT.count(builder -> builder.index(MavenHardcodedConstants.ES_INDEX_NAME));
+ private static void assertDocumentCount(final int expectedCount) throws IOException {
+ final CountResponse countResponse;
+ try {
+ countResponse = ES_CLIENT.count(builder -> builder.index(MavenHardcodedConstants.ES_INDEX_NAME));
+ }
+ // Try to enrich the failure with the available list of indices
+ catch (final ElasticsearchException error) {
+ try {
+ if (error.getMessage().contains("index_not_found_exception")) {
+ final Set indexNames =
+ ES_CLIENT.cluster().health().indices().keySet();
+ final String message = String.format("Could not find index! Available index names: %s", indexNames);
+ throw new AssertionError(message, error);
+ }
+ } catch (final Exception suppressed) {
+ error.addSuppressed(suppressed);
+ }
+ throw error;
+ }
final long actualCount = countResponse.count();
- Assertions.assertThat(actualCount).isLessThanOrEqualTo(expectedCount);
- return actualCount == expectedCount;
+ assertThat(actualCount).isEqualTo(expectedCount);
}
private static List> queryDocuments() throws IOException {
@@ -441,7 +499,7 @@ private static List> queryDocuments() throws IOException {
return searchResponse.hits().hits().stream()
.map(hit -> {
@SuppressWarnings("unchecked")
- Map source = hit.source();
+ final Map source = hit.source();
return source;
})
.collect(Collectors.toList());
diff --git a/log4j-mongodb/pom.xml b/log4j-mongodb/pom.xml
index d1a37d71930..58d21508fb7 100644
--- a/log4j-mongodb/pom.xml
+++ b/log4j-mongodb/pom.xml
@@ -30,56 +30,59 @@
org.apache.logging.log4j.core
- 5.1.3
-
- false
- true
+ 5.1.4
+ 2.0.15
+
org.mongodb
bson
- ${mongodb5.version}
+ ${mongodb.version}
+
org.mongodb
mongodb-driver-core
- ${mongodb5.version}
-
-
- org.mongodb
- mongodb-driver-legacy
- ${mongodb5.version}
+ ${mongodb.version}
+
org.mongodb
mongodb-driver-sync
- ${mongodb5.version}
+ ${mongodb.version}
+
+
org.apache.logging.log4j
log4j-api
+
org.apache.logging.log4j
log4j-mongodb4
+
org.mongodb
bson
+
org.mongodb
mongodb-driver-core
+
org.mongodb
mongodb-driver-sync
+
org.apache.logging.log4j
log4j-api-test
@@ -91,6 +94,7 @@
+
org.apache.logging.log4j
log4j-core-test
@@ -102,31 +106,19 @@
+
org.apache.commons
commons-lang3
test
-
- de.flapdoodle.embed
- de.flapdoodle.embed.mongo
- test
-
-
- de.flapdoodle.embed
- de.flapdoodle.embed.process
- test
-
-
- de.flapdoodle.reverse
- de.flapdoodle.reverse
- test
-
+
org.junit.jupiter
junit-jupiter-api
test
+
@@ -134,8 +126,7 @@
org.apache.maven.plugins
maven-surefire-plugin
-
- 1
+ true
@@ -145,6 +136,114 @@
+
+
+
+
+
+ docker
+
+
+
+
+ linux
+
+
+ env.CI
+ true
+
+
+
+
+
+
+
+ io.fabric8
+ docker-maven-plugin
+
+ all
+ true
+ true
+
+
+ mongo
+ mongo:latest
+
+
+
+ localhost:mongo.port:27017
+
+
+
+
+
+
+
+ start-mongo
+
+ start
+
+
+
+ stop-mongo
+
+ stop
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-failsafe-plugin
+
+
+ org.junit.jupiter
+ junit-jupiter-engine
+ ${junit-jupiter.version}
+
+
+ org.slf4j
+ slf4j-nop
+ ${slf4j2.version}
+
+
+
+
+
+ integration-test
+ verify
+
+
+ true
+
+ **/*IT.java
+
+
+
+ OFF
+
+ ${mongo.port}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/AbstractMongoDbCappedTest.java b/log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/AbstractMongoDbCappedIT.java
similarity index 84%
rename from log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/AbstractMongoDbCappedTest.java
rename to log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/AbstractMongoDbCappedIT.java
index 07e39339941..56cf3a89bee 100644
--- a/log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/AbstractMongoDbCappedTest.java
+++ b/log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/AbstractMongoDbCappedIT.java
@@ -23,17 +23,16 @@
import org.apache.logging.log4j.core.LoggerContext;
import org.bson.Document;
import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-public abstract class AbstractMongoDbCappedTest {
+abstract class AbstractMongoDbCappedIT {
- @Test
- public void test(final LoggerContext ctx, final MongoClient mongoClient) {
- final Logger logger = ctx.getLogger(AbstractMongoDbCappedTest.class);
+ protected void test(final LoggerContext ctx, final MongoClient mongoClient) {
+ final Logger logger = ctx.getLogger(AbstractMongoDbCappedIT.class);
logger.info("Hello log");
final MongoDatabase database = mongoClient.getDatabase(MongoDbTestConstants.DATABASE_NAME);
Assertions.assertNotNull(database);
- final MongoCollection collection = database.getCollection(MongoDbTestConstants.COLLECTION_NAME);
+ final MongoCollection collection =
+ database.getCollection(getClass().getSimpleName());
Assertions.assertNotNull(collection);
final Document first = collection.find().first();
Assertions.assertNotNull(first);
diff --git a/log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbAdditionalFieldsTest.java b/log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbAdditionalFieldsIT.java
similarity index 88%
rename from log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbAdditionalFieldsTest.java
rename to log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbAdditionalFieldsIT.java
index c74172925f5..f63ecf4ecfd 100644
--- a/log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbAdditionalFieldsTest.java
+++ b/log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbAdditionalFieldsIT.java
@@ -26,21 +26,25 @@
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.test.junit.LoggerContextSource;
+import org.apache.logging.log4j.test.junit.UsingStatusListener;
import org.bson.Document;
import org.junit.jupiter.api.Test;
@UsingMongoDb
-@LoggerContextSource("log4j2-mongodb-additional-fields.xml")
-public class MongoDbAdditionalFieldsTest {
+@LoggerContextSource("MongoDbAdditionalFields.xml")
+// Print debug status logger output upon failure
+@UsingStatusListener
+class MongoDbAdditionalFieldsIT {
@Test
- public void test(final LoggerContext ctx, final MongoClient mongoClient) {
- final Logger logger = ctx.getLogger(MongoDbAdditionalFieldsTest.class);
+ void test(final LoggerContext ctx, final MongoClient mongoClient) {
+ final Logger logger = ctx.getLogger(MongoDbAdditionalFieldsIT.class);
logger.info("Hello log 1");
logger.info("Hello log 2", new RuntimeException("Hello ex 2"));
final MongoDatabase database = mongoClient.getDatabase(MongoDbTestConstants.DATABASE_NAME);
assertNotNull(database);
- final MongoCollection collection = database.getCollection(MongoDbTestConstants.COLLECTION_NAME);
+ final MongoCollection collection =
+ database.getCollection(getClass().getSimpleName());
assertNotNull(collection);
final FindIterable found = collection.find();
final Document first = found.first();
diff --git a/log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbAuthFailureTest.java b/log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbAuthFailureIT.java
similarity index 77%
rename from log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbAuthFailureTest.java
rename to log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbAuthFailureIT.java
index 3247dc28c06..5a44aa5456e 100644
--- a/log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbAuthFailureTest.java
+++ b/log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbAuthFailureIT.java
@@ -25,20 +25,25 @@
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.test.junit.LoggerContextSource;
+import org.apache.logging.log4j.test.junit.UsingStatusListener;
import org.bson.Document;
import org.junit.jupiter.api.Test;
@UsingMongoDb
-@LoggerContextSource("log4j2-mongodb-auth-failure.xml")
-public class MongoDbAuthFailureTest {
+@LoggerContextSource("MongoDbAuthFailureIT.xml")
+// Print debug status logger output upon failure
+@UsingStatusListener
+class MongoDbAuthFailureIT {
@Test
- public void test(final LoggerContext ctx, final MongoClient mongoClient) {
- final Logger logger = ctx.getLogger(MongoDbAuthFailureTest.class);
+ void test(final LoggerContext ctx, final MongoClient mongoClient) {
+ final Logger logger = ctx.getLogger(MongoDbAuthFailureIT.class);
logger.info("Hello log");
final MongoDatabase database = mongoClient.getDatabase(MongoDbTestConstants.DATABASE_NAME);
assertNotNull(database);
- final MongoCollection collection = database.getCollection(MongoDbTestConstants.DATABASE_NAME);
+ final MongoCollection collection =
+ database.getCollection(getClass().getSimpleName());
+ ;
assertNotNull(collection);
final Document first = collection.find().first();
assertNull(first);
diff --git a/log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbCappedIntTest.java b/log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbCappedIntIT.java
similarity index 64%
rename from log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbCappedIntTest.java
rename to log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbCappedIntIT.java
index 500964aff08..887132ded40 100644
--- a/log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbCappedIntTest.java
+++ b/log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbCappedIntIT.java
@@ -16,11 +16,21 @@
*/
package org.apache.logging.log4j.mongodb;
+import com.mongodb.client.MongoClient;
+import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.test.junit.LoggerContextSource;
+import org.apache.logging.log4j.test.junit.UsingStatusListener;
+import org.junit.jupiter.api.Test;
@UsingMongoDb
-@LoggerContextSource("log4j2-mongodb-capped-int.xml")
-public class MongoDbCappedIntTest extends AbstractMongoDbCappedTest {
+@LoggerContextSource("MongoDbCappedIntIT.xml")
+// Print debug status logger output upon failure
+@UsingStatusListener
+class MongoDbCappedIntIT extends AbstractMongoDbCappedIT {
- // test is in superclass
+ @Test
+ @Override
+ protected void test(LoggerContext ctx, MongoClient mongoClient) {
+ super.test(ctx, mongoClient);
+ }
}
diff --git a/log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbCappedLongTest.java b/log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbCappedLongIT.java
similarity index 64%
rename from log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbCappedLongTest.java
rename to log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbCappedLongIT.java
index 34f921fe7bf..bb6b4e65722 100644
--- a/log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbCappedLongTest.java
+++ b/log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbCappedLongIT.java
@@ -16,11 +16,21 @@
*/
package org.apache.logging.log4j.mongodb;
+import com.mongodb.client.MongoClient;
+import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.test.junit.LoggerContextSource;
+import org.apache.logging.log4j.test.junit.UsingStatusListener;
+import org.junit.jupiter.api.Test;
@UsingMongoDb
-@LoggerContextSource("log4j2-mongodb-capped-long.xml")
-public class MongoDbCappedLongTest extends AbstractMongoDbCappedTest {
+@LoggerContextSource("MongoDbCappedLongIT.xml")
+// Print debug status logger output upon failure
+@UsingStatusListener
+class MongoDbCappedLongIT extends AbstractMongoDbCappedIT {
- // test is in superclass
+ @Test
+ @Override
+ protected void test(LoggerContext ctx, MongoClient mongoClient) {
+ super.test(ctx, mongoClient);
+ }
}
diff --git a/log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbTest.java b/log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbIT.java
similarity index 84%
rename from log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbTest.java
rename to log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbIT.java
index 5c4bbb750c1..d0f43cc70fd 100644
--- a/log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbTest.java
+++ b/log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbIT.java
@@ -26,21 +26,25 @@
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.test.junit.LoggerContextSource;
+import org.apache.logging.log4j.test.junit.UsingStatusListener;
import org.bson.Document;
import org.junit.jupiter.api.Test;
@UsingMongoDb
-@LoggerContextSource("log4j2-mongodb.xml")
-public class MongoDbTest {
+@LoggerContextSource("MongoDbIT.xml")
+// Print debug status logger output upon failure
+@UsingStatusListener
+class MongoDbIT {
@Test
- public void test(final LoggerContext ctx, final MongoClient mongoClient) {
- final Logger logger = ctx.getLogger(MongoDbTest.class);
+ void test(final LoggerContext ctx, final MongoClient mongoClient) {
+ final Logger logger = ctx.getLogger(MongoDbIT.class);
logger.info("Hello log 1");
logger.info("Hello log 2", new RuntimeException("Hello ex 2"));
final MongoDatabase database = mongoClient.getDatabase(MongoDbTestConstants.DATABASE_NAME);
assertNotNull(database);
- final MongoCollection collection = database.getCollection(MongoDbTestConstants.COLLECTION_NAME);
+ final MongoCollection collection =
+ database.getCollection(getClass().getSimpleName());
assertNotNull(collection);
final FindIterable found = collection.find();
final Document first = found.first();
diff --git a/log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbMapMessageTest.java b/log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbMapMessageIT.java
similarity index 81%
rename from log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbMapMessageTest.java
rename to log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbMapMessageIT.java
index 2733554dbd3..b285529c0ce 100644
--- a/log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbMapMessageTest.java
+++ b/log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbMapMessageIT.java
@@ -23,24 +23,28 @@
import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.test.junit.LoggerContextSource;
import org.apache.logging.log4j.message.MapMessage;
+import org.apache.logging.log4j.test.junit.UsingStatusListener;
import org.bson.Document;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@UsingMongoDb
-@LoggerContextSource("log4j2-mongodb-map-message.xml")
-public class MongoDbMapMessageTest {
+@LoggerContextSource("MongoDbMapMessageIT.xml")
+// Print debug status logger output upon failure
+@UsingStatusListener
+class MongoDbMapMessageIT {
@Test
- public void test(final LoggerContext ctx, final MongoClient mongoClient) {
- final Logger logger = ctx.getLogger(MongoDbMapMessageTest.class);
+ void test(final LoggerContext ctx, final MongoClient mongoClient) {
+ final Logger logger = ctx.getLogger(MongoDbMapMessageIT.class);
final MapMessage mapMessage = new MapMessage<>();
mapMessage.with("SomeName", "SomeValue");
mapMessage.with("SomeInt", 1);
logger.info(mapMessage);
final MongoDatabase database = mongoClient.getDatabase(MongoDbTestConstants.DATABASE_NAME);
Assertions.assertNotNull(database);
- final MongoCollection collection = database.getCollection(MongoDbTestConstants.COLLECTION_NAME);
+ final MongoCollection collection =
+ database.getCollection(getClass().getSimpleName());
Assertions.assertNotNull(collection);
final Document first = collection.find().first();
Assertions.assertNotNull(first);
diff --git a/log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbResolver.java b/log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbResolver.java
index 4b1f394b765..1246d48e496 100644
--- a/log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbResolver.java
+++ b/log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbResolver.java
@@ -18,67 +18,19 @@
import com.mongodb.client.MongoClient;
import com.mongodb.client.MongoClients;
-import de.flapdoodle.embed.mongo.commands.ServerAddress;
-import de.flapdoodle.embed.mongo.distribution.Version;
-import de.flapdoodle.embed.mongo.packageresolver.Command;
-import de.flapdoodle.embed.mongo.transitions.Mongod;
-import de.flapdoodle.embed.mongo.transitions.PackageOfCommandDistribution;
-import de.flapdoodle.embed.mongo.transitions.RunningMongodProcess;
-import de.flapdoodle.embed.mongo.types.DistributionBaseUrl;
-import de.flapdoodle.embed.process.config.store.FileSet;
-import de.flapdoodle.embed.process.config.store.FileType;
-import de.flapdoodle.embed.process.config.store.Package;
-import de.flapdoodle.embed.process.distribution.Distribution;
-import de.flapdoodle.embed.process.io.ProcessOutput;
-import de.flapdoodle.embed.process.io.Processors;
-import de.flapdoodle.embed.process.io.StreamProcessor;
-import de.flapdoodle.embed.process.types.Name;
-import de.flapdoodle.embed.process.types.ProcessConfig;
-import de.flapdoodle.os.OSType;
-import de.flapdoodle.reverse.TransitionWalker.ReachedState;
-import de.flapdoodle.reverse.transitions.Derive;
-import de.flapdoodle.reverse.transitions.Start;
-import java.util.Objects;
import java.util.function.Supplier;
-import org.apache.commons.lang3.NotImplementedException;
-import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.status.StatusLogger;
-import org.apache.logging.log4j.test.TestProperties;
import org.apache.logging.log4j.test.junit.ExtensionContextAnchor;
-import org.apache.logging.log4j.test.junit.TestPropertySource;
import org.apache.logging.log4j.test.junit.TypeBasedParameterResolver;
+import org.apache.logging.log4j.util.PropertiesUtil;
import org.junit.jupiter.api.extension.BeforeAllCallback;
import org.junit.jupiter.api.extension.ExtensionContext;
import org.junit.jupiter.api.extension.ExtensionContext.Store.CloseableResource;
import org.junit.jupiter.api.extension.ParameterContext;
import org.junit.jupiter.api.extension.ParameterResolutionException;
-public class MongoDbResolver extends TypeBasedParameterResolver implements BeforeAllCallback {
+class MongoDbResolver extends TypeBasedParameterResolver implements BeforeAllCallback {
- private static final Logger LOGGER = StatusLogger.getLogger();
- private static final String LOGGING_TARGET_PROPERTY = "log4j2.mongoDbLoggingTarget";
-
- private static final int BUILDER_TIMEOUT_MILLIS = 30000;
-
- private static ProcessOutput getProcessOutput(final LoggingTarget loggingTarget, final String label) {
- if (loggingTarget != null) {
- switch (loggingTarget) {
- case STATUS_LOGGER:
- return ProcessOutput.builder()
- .output(Processors.named(
- "[" + label + " output]", new StatusLoggerStreamProcessor(Level.INFO)))
- .error(Processors.named(
- "[" + label + " error]", new StatusLoggerStreamProcessor(Level.ERROR)))
- .commands(new StatusLoggerStreamProcessor(Level.DEBUG))
- .build();
- case CONSOLE:
- return ProcessOutput.namedConsole(label);
- default:
- }
- }
- throw new NotImplementedException(Objects.toString(loggingTarget));
- }
+ static final String PORT_PROPERTY = "log4j2.mongo.port";
public MongoDbResolver() {
super(MongoClient.class);
@@ -86,40 +38,7 @@ public MongoDbResolver() {
@Override
public void beforeAll(ExtensionContext context) throws Exception {
- final TestProperties props = TestPropertySource.createProperties(context);
- final Mongod mongod = Mongod.builder()
- .processOutput(Derive.given(Name.class)
- .state(ProcessOutput.class)
- .deriveBy(name -> getProcessOutput(
- LoggingTarget.getLoggingTarget(LoggingTarget.STATUS_LOGGER), name.value())))
- .processConfig(Start.to(ProcessConfig.class)
- .initializedWith(ProcessConfig.defaults().withStopTimeoutInMillis(BUILDER_TIMEOUT_MILLIS))
- .withTransitionLabel("create default"))
- // workaround for https://github.com/flapdoodle-oss/de.flapdoodle.embed.mongo/issues/309
- .packageOfDistribution(new PackageOfCommandDistribution() {
-
- @Override
- protected Package packageOf(
- Command command, Distribution distribution, DistributionBaseUrl baseUrl) {
- if (distribution.platform().operatingSystem().type() == OSType.Windows) {
- final Package relativePackage =
- commandPackageResolver().apply(command).packageFor(distribution);
- final FileSet.Builder fileSetBuilder = FileSet.builder()
- .addEntry(FileType.Library, "ssleay32.dll")
- .addEntry(FileType.Library, "libeay32.dll");
- relativePackage.fileSet().entries().forEach(fileSetBuilder::addEntries);
- return Package.builder()
- .archiveType(relativePackage.archiveType())
- .fileSet(fileSetBuilder.build())
- .url(baseUrl.value() + relativePackage.url())
- .hint(relativePackage.hint())
- .build();
- }
- return super.packageOf(command, distribution, baseUrl);
- }
- })
- .build();
- ExtensionContextAnchor.setAttribute(MongoClientHolder.class, new MongoClientHolder(mongod, props), context);
+ ExtensionContextAnchor.setAttribute(MongoClientHolder.class, new MongoClientHolder(), context);
}
@Override
@@ -129,25 +48,13 @@ public MongoClient resolveParameter(ParameterContext parameterContext, Extension
.get();
}
- public enum LoggingTarget {
- CONSOLE,
- STATUS_LOGGER;
-
- public static LoggingTarget getLoggingTarget(final LoggingTarget defaultValue) {
- return LoggingTarget.valueOf(System.getProperty(LOGGING_TARGET_PROPERTY, defaultValue.name()));
- }
- }
-
private static final class MongoClientHolder implements CloseableResource, Supplier {
- private final ReachedState state;
private final MongoClient mongoClient;
- public MongoClientHolder(final Mongod mongod, final TestProperties props) {
- state = mongod.start(Version.Main.V7_0);
- final RunningMongodProcess mongodProcess = state.current();
- final ServerAddress addr = mongodProcess.getServerAddress();
- mongoClient = MongoClients.create(String.format("mongodb://%s:%d", addr.getHost(), addr.getPort()));
- props.setProperty(MongoDbTestConstants.PROP_NAME_PORT, addr.getPort());
+ public MongoClientHolder() {
+ mongoClient = MongoClients.create(String.format(
+ "mongodb://localhost:%d",
+ PropertiesUtil.getProperties().getIntegerProperty(MongoDbTestConstants.PROP_NAME_PORT, 27017)));
}
@Override
@@ -158,32 +65,6 @@ public MongoClient get() {
@Override
public void close() throws Exception {
mongoClient.close();
- state.close();
- }
- }
-
- private static final class StatusLoggerStreamProcessor implements StreamProcessor {
-
- private final Level level;
-
- public StatusLoggerStreamProcessor(Level level) {
- this.level = level;
- }
-
- @Override
- public void process(String line) {
- LOGGER.log(level, () -> stripLineEndings(line));
- }
-
- @Override
- public void onProcessed() {
- // noop
- }
-
- String stripLineEndings(String line) {
- // we still need to remove line endings that are passed on by
- // StreamToLineProcessor...
- return line.replaceAll("[\n\r]+", "");
}
}
}
diff --git a/log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbResolverTest.java b/log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbResolverIT.java
similarity index 86%
rename from log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbResolverTest.java
rename to log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbResolverIT.java
index 199cabcb2fe..dd6a544ca95 100644
--- a/log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbResolverTest.java
+++ b/log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbResolverIT.java
@@ -20,6 +20,7 @@
import com.mongodb.client.MongoClient;
import com.mongodb.client.MongoIterable;
+import org.apache.logging.log4j.test.junit.UsingStatusListener;
import org.junit.jupiter.api.Test;
/**
@@ -29,10 +30,12 @@
*
*/
@UsingMongoDb
-public class MongoDbResolverTest {
+// Print debug status logger output upon failure
+@UsingStatusListener
+class MongoDbResolverIT {
@Test
- public void testAccess(final MongoClient mongoClient) {
+ void testAccess(final MongoClient mongoClient) {
final MongoIterable databaseNames = mongoClient.listDatabaseNames();
assertNotNull(databaseNames);
assertNotNull(databaseNames.first());
diff --git a/log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbTestConstants.java b/log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbTestConstants.java
index ed5435599b9..95ed9ccbb5d 100644
--- a/log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbTestConstants.java
+++ b/log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbTestConstants.java
@@ -18,7 +18,6 @@
public class MongoDbTestConstants {
- public static final String PROP_NAME_PORT = "MongoDBTestPort";
- static final String COLLECTION_NAME = "testCollection";
+ public static final String PROP_NAME_PORT = "log4j.mongo.port";
static final String DATABASE_NAME = "testDb";
}
diff --git a/log4j-mongodb/src/test/resources/MongoDbAdditionalFields.xml b/log4j-mongodb/src/test/resources/MongoDbAdditionalFields.xml
new file mode 100644
index 00000000000..96528f13911
--- /dev/null
+++ b/log4j-mongodb/src/test/resources/MongoDbAdditionalFields.xml
@@ -0,0 +1,37 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/log4j-mongodb/src/test/resources/MongoDbAuthFailureIT.xml b/log4j-mongodb/src/test/resources/MongoDbAuthFailureIT.xml
new file mode 100644
index 00000000000..23fbbdf3aca
--- /dev/null
+++ b/log4j-mongodb/src/test/resources/MongoDbAuthFailureIT.xml
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/log4j-mongodb/src/test/resources/log4j2-mongodb-capped-int.xml b/log4j-mongodb/src/test/resources/MongoDbCappedIntIT.xml
similarity index 70%
rename from log4j-mongodb/src/test/resources/log4j2-mongodb-capped-int.xml
rename to log4j-mongodb/src/test/resources/MongoDbCappedIntIT.xml
index 746b19914e7..bdaa8e3f40d 100644
--- a/log4j-mongodb/src/test/resources/log4j2-mongodb-capped-int.xml
+++ b/log4j-mongodb/src/test/resources/MongoDbCappedIntIT.xml
@@ -15,18 +15,22 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-
+
-
+
-
+
diff --git a/log4j-mongodb/src/test/resources/log4j2-mongodb-capped-long.xml b/log4j-mongodb/src/test/resources/MongoDbCappedLongIT.xml
similarity index 71%
rename from log4j-mongodb/src/test/resources/log4j2-mongodb-capped-long.xml
rename to log4j-mongodb/src/test/resources/MongoDbCappedLongIT.xml
index 941ea71c4e2..6e3b8d6aad8 100644
--- a/log4j-mongodb/src/test/resources/log4j2-mongodb-capped-long.xml
+++ b/log4j-mongodb/src/test/resources/MongoDbCappedLongIT.xml
@@ -15,19 +15,23 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-
+
-
+
-
+
diff --git a/log4j-mongodb/src/test/resources/log4j2-mongodb-additional-fields.xml b/log4j-mongodb/src/test/resources/MongoDbIT.xml
similarity index 68%
rename from log4j-mongodb/src/test/resources/log4j2-mongodb-additional-fields.xml
rename to log4j-mongodb/src/test/resources/MongoDbIT.xml
index d9d27461a00..9c9ab6037ee 100644
--- a/log4j-mongodb/src/test/resources/log4j2-mongodb-additional-fields.xml
+++ b/log4j-mongodb/src/test/resources/MongoDbIT.xml
@@ -15,19 +15,19 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-
+
-
-
-
-
-
-
+
+
-
+
diff --git a/log4j-mongodb4/src/test/resources/log4j2-mongodb-map-message.xml b/log4j-mongodb/src/test/resources/MongoDbMapMessageIT.xml
similarity index 68%
rename from log4j-mongodb4/src/test/resources/log4j2-mongodb-map-message.xml
rename to log4j-mongodb/src/test/resources/MongoDbMapMessageIT.xml
index a84154e78da..dc6aa6846bd 100644
--- a/log4j-mongodb4/src/test/resources/log4j2-mongodb-map-message.xml
+++ b/log4j-mongodb/src/test/resources/MongoDbMapMessageIT.xml
@@ -15,16 +15,20 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-
+
-
-
+
+
-
+
diff --git a/log4j-mongodb/src/test/resources/log4j2-mongodb.xml b/log4j-mongodb/src/test/resources/log4j2-mongodb.xml
deleted file mode 100644
index 4f0865b2c46..00000000000
--- a/log4j-mongodb/src/test/resources/log4j2-mongodb.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/log4j-mongodb4/pom.xml b/log4j-mongodb4/pom.xml
index e4a9eefaeff..04639d0b535 100644
--- a/log4j-mongodb4/pom.xml
+++ b/log4j-mongodb4/pom.xml
@@ -35,55 +35,61 @@
org.apache.logging.log4j.core
- 4.11.3
+ 4.11.4
+ 1.7.36
+
org.mongodb
bson
${mongodb4.version}
+
org.mongodb
mongodb-driver-core
${mongodb4.version}
-
- org.mongodb
- mongodb-driver-legacy
- ${mongodb4.version}
-
+
org.mongodb
mongodb-driver-sync
${mongodb4.version}
+
+
org.apache.logging.log4j
log4j-api
+
org.apache.logging.log4j
log4j-core
+
org.mongodb
bson
+
org.mongodb
mongodb-driver-core
+
org.mongodb
mongodb-driver-sync
+
org.apache.logging.log4j
log4j-api-test
@@ -95,6 +101,7 @@
+
org.apache.logging.log4j
log4j-core-test
@@ -106,31 +113,19 @@
+
org.apache.commons
commons-lang3
test
-
- de.flapdoodle.embed
- de.flapdoodle.embed.mongo
- test
-
-
- de.flapdoodle.embed
- de.flapdoodle.embed.process
- test
-
-
- de.flapdoodle.reverse
- de.flapdoodle.reverse
- test
-
+
org.junit.jupiter
junit-jupiter-api
test
+
@@ -140,8 +135,7 @@
org.apache.maven.plugins
maven-surefire-plugin
-
- 1
+ true
@@ -155,4 +149,110 @@
+
+
+
+ docker
+
+
+
+
+ linux
+
+
+ env.CI
+ true
+
+
+
+
+
+
+
+ io.fabric8
+ docker-maven-plugin
+
+ all
+ true
+ true
+
+
+ mongo
+ mongo:latest
+
+
+
+ localhost:mongo.port:27017
+
+
+
+
+
+
+
+ start-mongo
+
+ start
+
+
+
+ stop-mongo
+
+ stop
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-failsafe-plugin
+
+
+ org.junit.jupiter
+ junit-jupiter-engine
+ ${junit-jupiter.version}
+
+
+ org.slf4j
+ slf4j-nop
+ ${slf4j.version}
+
+
+
+
+
+ integration-test
+ verify
+
+
+ true
+
+ **/*IT.java
+
+
+
+ OFF
+
+ ${mongo.port}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/AbstractMongoDb4CappedTest.java b/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/AbstractMongoDb4CappedIT.java
similarity index 84%
rename from log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/AbstractMongoDb4CappedTest.java
rename to log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/AbstractMongoDb4CappedIT.java
index 6f54e77c7e3..6be4f7f6852 100644
--- a/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/AbstractMongoDb4CappedTest.java
+++ b/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/AbstractMongoDb4CappedIT.java
@@ -23,17 +23,16 @@
import org.apache.logging.log4j.core.LoggerContext;
import org.bson.Document;
import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-public abstract class AbstractMongoDb4CappedTest {
+abstract class AbstractMongoDb4CappedIT {
- @Test
- public void test(final LoggerContext ctx, final MongoClient mongoClient) {
- final Logger logger = ctx.getLogger(AbstractMongoDb4CappedTest.class);
+ protected void test(final LoggerContext ctx, final MongoClient mongoClient) {
+ final Logger logger = ctx.getLogger(AbstractMongoDb4CappedIT.class);
logger.info("Hello log");
final MongoDatabase database = mongoClient.getDatabase(MongoDb4TestConstants.DATABASE_NAME);
Assertions.assertNotNull(database);
- final MongoCollection collection = database.getCollection(MongoDb4TestConstants.COLLECTION_NAME);
+ final MongoCollection collection =
+ database.getCollection(getClass().getSimpleName());
Assertions.assertNotNull(collection);
final Document first = collection.find().first();
Assertions.assertNotNull(first);
diff --git a/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4AdditionalFieldsTest.java b/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4AdditionalFieldsIT.java
similarity index 88%
rename from log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4AdditionalFieldsTest.java
rename to log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4AdditionalFieldsIT.java
index 27062452bf6..b5ccc77e735 100644
--- a/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4AdditionalFieldsTest.java
+++ b/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4AdditionalFieldsIT.java
@@ -26,21 +26,25 @@
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.test.junit.LoggerContextSource;
+import org.apache.logging.log4j.test.junit.UsingStatusListener;
import org.bson.Document;
import org.junit.jupiter.api.Test;
@UsingMongoDb4
-@LoggerContextSource("log4j2-mongodb-additional-fields.xml")
-public class MongoDb4AdditionalFieldsTest {
+@LoggerContextSource("MongoDb4AdditionalFields.xml")
+// Print debug status logger output upon failure
+@UsingStatusListener
+class MongoDb4AdditionalFieldsIT {
@Test
- public void test(final LoggerContext ctx, final MongoClient mongoClient) {
- final Logger logger = ctx.getLogger(MongoDb4AdditionalFieldsTest.class);
+ void test(final LoggerContext ctx, final MongoClient mongoClient) {
+ final Logger logger = ctx.getLogger(MongoDb4AdditionalFieldsIT.class);
logger.info("Hello log 1");
logger.info("Hello log 2", new RuntimeException("Hello ex 2"));
final MongoDatabase database = mongoClient.getDatabase(MongoDb4TestConstants.DATABASE_NAME);
assertNotNull(database);
- final MongoCollection collection = database.getCollection(MongoDb4TestConstants.COLLECTION_NAME);
+ final MongoCollection collection =
+ database.getCollection(getClass().getSimpleName());
assertNotNull(collection);
final FindIterable found = collection.find();
final Document first = found.first();
diff --git a/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4AuthFailureTest.java b/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4AuthFailureIT.java
similarity index 76%
rename from log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4AuthFailureTest.java
rename to log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4AuthFailureIT.java
index 641305256c4..c5b5b15c6db 100644
--- a/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4AuthFailureTest.java
+++ b/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4AuthFailureIT.java
@@ -25,20 +25,25 @@
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.test.junit.LoggerContextSource;
+import org.apache.logging.log4j.test.junit.UsingStatusListener;
import org.bson.Document;
import org.junit.jupiter.api.Test;
@UsingMongoDb4
-@LoggerContextSource("log4j2-mongodb-auth-failure.xml")
-public class MongoDb4AuthFailureTest {
+@LoggerContextSource("MongoDb4AuthFailureIT.xml")
+// Print debug status logger output upon failure
+@UsingStatusListener
+class MongoDb4AuthFailureIT {
@Test
- public void test(final LoggerContext ctx, final MongoClient mongoClient) {
- final Logger logger = ctx.getLogger(MongoDb4AuthFailureTest.class);
+ void test(final LoggerContext ctx, final MongoClient mongoClient) {
+ final Logger logger = ctx.getLogger(MongoDb4AuthFailureIT.class);
logger.info("Hello log");
final MongoDatabase database = mongoClient.getDatabase(MongoDb4TestConstants.DATABASE_NAME);
assertNotNull(database);
- final MongoCollection collection = database.getCollection(MongoDb4TestConstants.DATABASE_NAME);
+ final MongoCollection collection =
+ database.getCollection(getClass().getSimpleName());
+ ;
assertNotNull(collection);
final Document first = collection.find().first();
assertNull(first);
diff --git a/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4CappedIntTest.java b/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4CappedIntIT.java
similarity index 64%
rename from log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4CappedIntTest.java
rename to log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4CappedIntIT.java
index e01e0c0d63b..24add71aa5d 100644
--- a/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4CappedIntTest.java
+++ b/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4CappedIntIT.java
@@ -16,11 +16,21 @@
*/
package org.apache.logging.log4j.mongodb4;
+import com.mongodb.client.MongoClient;
+import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.test.junit.LoggerContextSource;
+import org.apache.logging.log4j.test.junit.UsingStatusListener;
+import org.junit.jupiter.api.Test;
@UsingMongoDb4
-@LoggerContextSource("log4j2-mongodb-capped-int.xml")
-public class MongoDb4CappedIntTest extends AbstractMongoDb4CappedTest {
+@LoggerContextSource("MongoDb4CappedIntIT.xml")
+// Print debug status logger output upon failure
+@UsingStatusListener
+class MongoDb4CappedIntIT extends AbstractMongoDb4CappedIT {
- // test is in superclass
+ @Test
+ @Override
+ protected void test(LoggerContext ctx, MongoClient mongoClient) {
+ super.test(ctx, mongoClient);
+ }
}
diff --git a/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4CappedLongTest.java b/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4CappedLongIT.java
similarity index 64%
rename from log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4CappedLongTest.java
rename to log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4CappedLongIT.java
index 0a99dbf5b87..580c6c60fa6 100644
--- a/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4CappedLongTest.java
+++ b/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4CappedLongIT.java
@@ -16,11 +16,21 @@
*/
package org.apache.logging.log4j.mongodb4;
+import com.mongodb.client.MongoClient;
+import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.test.junit.LoggerContextSource;
+import org.apache.logging.log4j.test.junit.UsingStatusListener;
+import org.junit.jupiter.api.Test;
@UsingMongoDb4
-@LoggerContextSource("log4j2-mongodb-capped-long.xml")
-public class MongoDb4CappedLongTest extends AbstractMongoDb4CappedTest {
+@LoggerContextSource("MongoDb4CappedLongIT.xml")
+// Print debug status logger output upon failure
+@UsingStatusListener
+class MongoDb4CappedLongIT extends AbstractMongoDb4CappedIT {
- // test is in superclass
+ @Test
+ @Override
+ protected void test(LoggerContext ctx, MongoClient mongoClient) {
+ super.test(ctx, mongoClient);
+ }
}
diff --git a/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4Test.java b/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4IT.java
similarity index 84%
rename from log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4Test.java
rename to log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4IT.java
index 140a9597505..ac0c550efca 100644
--- a/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4Test.java
+++ b/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4IT.java
@@ -26,21 +26,25 @@
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.test.junit.LoggerContextSource;
+import org.apache.logging.log4j.test.junit.UsingStatusListener;
import org.bson.Document;
import org.junit.jupiter.api.Test;
@UsingMongoDb4
-@LoggerContextSource("log4j2-mongodb.xml")
-public class MongoDb4Test {
+@LoggerContextSource("MongoDb4IT.xml")
+// Print debug status logger output upon failure
+@UsingStatusListener
+class MongoDb4IT {
@Test
- public void test(final LoggerContext ctx, final MongoClient mongoClient) {
- final Logger logger = ctx.getLogger(MongoDb4Test.class);
+ void test(final LoggerContext ctx, final MongoClient mongoClient) {
+ final Logger logger = ctx.getLogger(MongoDb4IT.class);
logger.info("Hello log 1");
logger.info("Hello log 2", new RuntimeException("Hello ex 2"));
final MongoDatabase database = mongoClient.getDatabase(MongoDb4TestConstants.DATABASE_NAME);
assertNotNull(database);
- final MongoCollection collection = database.getCollection(MongoDb4TestConstants.COLLECTION_NAME);
+ final MongoCollection collection =
+ database.getCollection(getClass().getSimpleName());
assertNotNull(collection);
final FindIterable found = collection.find();
final Document first = found.first();
diff --git a/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4MapMessageTest.java b/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4MapMessageIT.java
similarity index 80%
rename from log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4MapMessageTest.java
rename to log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4MapMessageIT.java
index d8877392448..b7a384c23b1 100644
--- a/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4MapMessageTest.java
+++ b/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4MapMessageIT.java
@@ -23,24 +23,28 @@
import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.test.junit.LoggerContextSource;
import org.apache.logging.log4j.message.MapMessage;
+import org.apache.logging.log4j.test.junit.UsingStatusListener;
import org.bson.Document;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@UsingMongoDb4
-@LoggerContextSource("log4j2-mongodb-map-message.xml")
-public class MongoDb4MapMessageTest {
+@LoggerContextSource("MongoDb4MapMessageIT.xml")
+// Print debug status logger output upon failure
+@UsingStatusListener
+class MongoDb4MapMessageIT {
@Test
- public void test(final LoggerContext ctx, final MongoClient mongoClient) {
- final Logger logger = ctx.getLogger(MongoDb4MapMessageTest.class);
+ void test(final LoggerContext ctx, final MongoClient mongoClient) {
+ final Logger logger = ctx.getLogger(MongoDb4MapMessageIT.class);
final MapMessage mapMessage = new MapMessage<>();
mapMessage.with("SomeName", "SomeValue");
mapMessage.with("SomeInt", 1);
logger.info(mapMessage);
final MongoDatabase database = mongoClient.getDatabase(MongoDb4TestConstants.DATABASE_NAME);
Assertions.assertNotNull(database);
- final MongoCollection collection = database.getCollection(MongoDb4TestConstants.COLLECTION_NAME);
+ final MongoCollection collection =
+ database.getCollection(getClass().getSimpleName());
Assertions.assertNotNull(collection);
final Document first = collection.find().first();
Assertions.assertNotNull(first);
diff --git a/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4Resolver.java b/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4Resolver.java
index 90c71606cfc..e7994f10297 100644
--- a/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4Resolver.java
+++ b/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4Resolver.java
@@ -18,69 +18,19 @@
import com.mongodb.client.MongoClient;
import com.mongodb.client.MongoClients;
-import de.flapdoodle.embed.mongo.commands.ServerAddress;
-import de.flapdoodle.embed.mongo.distribution.Version;
-import de.flapdoodle.embed.mongo.packageresolver.Command;
-import de.flapdoodle.embed.mongo.transitions.Mongod;
-import de.flapdoodle.embed.mongo.transitions.PackageOfCommandDistribution;
-import de.flapdoodle.embed.mongo.transitions.RunningMongodProcess;
-import de.flapdoodle.embed.mongo.types.DistributionBaseUrl;
-import de.flapdoodle.embed.process.config.store.FileSet;
-import de.flapdoodle.embed.process.config.store.FileType;
-import de.flapdoodle.embed.process.config.store.Package;
-import de.flapdoodle.embed.process.distribution.Distribution;
-import de.flapdoodle.embed.process.io.ProcessOutput;
-import de.flapdoodle.embed.process.io.Processors;
-import de.flapdoodle.embed.process.io.StreamProcessor;
-import de.flapdoodle.embed.process.types.Name;
-import de.flapdoodle.embed.process.types.ProcessConfig;
-import de.flapdoodle.os.OSType;
-import de.flapdoodle.reverse.TransitionWalker.ReachedState;
-import de.flapdoodle.reverse.transitions.Derive;
-import de.flapdoodle.reverse.transitions.Start;
-import java.util.Objects;
import java.util.function.Supplier;
-import org.apache.commons.lang3.NotImplementedException;
-import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.status.StatusLogger;
-import org.apache.logging.log4j.test.TestProperties;
import org.apache.logging.log4j.test.junit.ExtensionContextAnchor;
-import org.apache.logging.log4j.test.junit.TestPropertySource;
import org.apache.logging.log4j.test.junit.TypeBasedParameterResolver;
+import org.apache.logging.log4j.util.PropertiesUtil;
import org.junit.jupiter.api.extension.BeforeAllCallback;
import org.junit.jupiter.api.extension.ExtensionContext;
import org.junit.jupiter.api.extension.ExtensionContext.Store.CloseableResource;
import org.junit.jupiter.api.extension.ParameterContext;
import org.junit.jupiter.api.extension.ParameterResolutionException;
-public class MongoDb4Resolver extends TypeBasedParameterResolver implements BeforeAllCallback {
+class MongoDb4Resolver extends TypeBasedParameterResolver implements BeforeAllCallback {
- private static final Logger LOGGER = StatusLogger.getLogger();
- private static final String LOGGING_TARGET_PROPERTY = "log4j2.mongoDbLoggingTarget";
-
- private static final int BUILDER_TIMEOUT_MILLIS = 30000;
-
- private static ProcessOutput getProcessOutput(final LoggingTarget loggingTarget, final String label) {
- if (loggingTarget != null) {
- switch (loggingTarget) {
- case STATUS_LOGGER:
- // @formatter:off
- return ProcessOutput.builder()
- .output(Processors.named(
- "[" + label + " output]", new StatusLoggerStreamProcessor(Level.INFO)))
- .error(Processors.named(
- "[" + label + " error]", new StatusLoggerStreamProcessor(Level.ERROR)))
- .commands(new StatusLoggerStreamProcessor(Level.DEBUG))
- .build();
- // @formatter:on
- case CONSOLE:
- return ProcessOutput.namedConsole(label);
- default:
- }
- }
- throw new NotImplementedException(Objects.toString(loggingTarget));
- }
+ static final String PORT_PROPERTY = "log4j2.mongo.port";
public MongoDb4Resolver() {
super(MongoClient.class);
@@ -88,40 +38,7 @@ public MongoDb4Resolver() {
@Override
public void beforeAll(ExtensionContext context) throws Exception {
- final TestProperties props = TestPropertySource.createProperties(context);
- final Mongod mongod = Mongod.builder()
- .processOutput(Derive.given(Name.class)
- .state(ProcessOutput.class)
- .deriveBy(name -> getProcessOutput(
- LoggingTarget.getLoggingTarget(LoggingTarget.STATUS_LOGGER), name.value())))
- .processConfig(Start.to(ProcessConfig.class)
- .initializedWith(ProcessConfig.defaults().withStopTimeoutInMillis(BUILDER_TIMEOUT_MILLIS))
- .withTransitionLabel("create default"))
- // workaround for https://github.com/flapdoodle-oss/de.flapdoodle.embed.mongo/issues/309
- .packageOfDistribution(new PackageOfCommandDistribution() {
-
- @Override
- protected Package packageOf(
- Command command, Distribution distribution, DistributionBaseUrl baseUrl) {
- if (distribution.platform().operatingSystem().type() == OSType.Windows) {
- final Package relativePackage =
- commandPackageResolver().apply(command).packageFor(distribution);
- final FileSet.Builder fileSetBuilder = FileSet.builder()
- .addEntry(FileType.Library, "ssleay32.dll")
- .addEntry(FileType.Library, "libeay32.dll");
- relativePackage.fileSet().entries().forEach(fileSetBuilder::addEntries);
- return Package.builder()
- .archiveType(relativePackage.archiveType())
- .fileSet(fileSetBuilder.build())
- .url(baseUrl.value() + relativePackage.url())
- .hint(relativePackage.hint())
- .build();
- }
- return super.packageOf(command, distribution, baseUrl);
- }
- })
- .build();
- ExtensionContextAnchor.setAttribute(MongoClientHolder.class, new MongoClientHolder(mongod, props), context);
+ ExtensionContextAnchor.setAttribute(MongoClientHolder.class, new MongoClientHolder(), context);
}
@Override
@@ -131,25 +48,13 @@ public MongoClient resolveParameter(ParameterContext parameterContext, Extension
.get();
}
- public enum LoggingTarget {
- CONSOLE,
- STATUS_LOGGER;
-
- public static LoggingTarget getLoggingTarget(final LoggingTarget defaultValue) {
- return LoggingTarget.valueOf(System.getProperty(LOGGING_TARGET_PROPERTY, defaultValue.name()));
- }
- }
-
private static final class MongoClientHolder implements CloseableResource, Supplier {
- private final ReachedState state;
private final MongoClient mongoClient;
- public MongoClientHolder(final Mongod mongod, final TestProperties props) {
- state = mongod.start(Version.Main.V7_0);
- final RunningMongodProcess mongodProcess = state.current();
- final ServerAddress addr = mongodProcess.getServerAddress();
- mongoClient = MongoClients.create(String.format("mongodb://%s:%d", addr.getHost(), addr.getPort()));
- props.setProperty(MongoDb4TestConstants.PROP_NAME_PORT, addr.getPort());
+ public MongoClientHolder() {
+ mongoClient = MongoClients.create(String.format(
+ "mongodb://localhost:%d",
+ PropertiesUtil.getProperties().getIntegerProperty(MongoDb4TestConstants.PROP_NAME_PORT, 27017)));
}
@Override
@@ -160,32 +65,6 @@ public MongoClient get() {
@Override
public void close() throws Exception {
mongoClient.close();
- state.close();
- }
- }
-
- private static final class StatusLoggerStreamProcessor implements StreamProcessor {
-
- private final Level level;
-
- public StatusLoggerStreamProcessor(Level level) {
- this.level = level;
- }
-
- @Override
- public void process(String line) {
- LOGGER.log(level, () -> stripLineEndings(line));
- }
-
- @Override
- public void onProcessed() {
- // noop
- }
-
- String stripLineEndings(String line) {
- // we still need to remove line endings that are passed on by
- // StreamToLineProcessor...
- return line.replaceAll("[\n\r]+", "");
}
}
}
diff --git a/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4ResolverTest.java b/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4ResolverIT.java
similarity index 86%
rename from log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4ResolverTest.java
rename to log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4ResolverIT.java
index 9d0bebe5e0b..d63b07072bf 100644
--- a/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4ResolverTest.java
+++ b/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4ResolverIT.java
@@ -20,6 +20,7 @@
import com.mongodb.client.MongoClient;
import com.mongodb.client.MongoIterable;
+import org.apache.logging.log4j.test.junit.UsingStatusListener;
import org.junit.jupiter.api.Test;
/**
@@ -29,10 +30,12 @@
*
*/
@UsingMongoDb4
-public class MongoDb4ResolverTest {
+// Print debug status logger output upon failure
+@UsingStatusListener
+class MongoDb4ResolverIT {
@Test
- public void testAccess(final MongoClient mongoClient) {
+ void testAccess(final MongoClient mongoClient) {
final MongoIterable databaseNames = mongoClient.listDatabaseNames();
assertNotNull(databaseNames);
assertNotNull(databaseNames.first());
diff --git a/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4TestConstants.java b/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4TestConstants.java
index 6f43c72527e..5245c686700 100644
--- a/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4TestConstants.java
+++ b/log4j-mongodb4/src/test/java/org/apache/logging/log4j/mongodb4/MongoDb4TestConstants.java
@@ -18,7 +18,6 @@
public class MongoDb4TestConstants {
- public static final String PROP_NAME_PORT = "MongoDBTestPort";
- static final String COLLECTION_NAME = "testCollection";
+ public static final String PROP_NAME_PORT = "log4j.mongo.port";
static final String DATABASE_NAME = "testDb";
}
diff --git a/log4j-mongodb4/src/test/resources/MongoDb4AdditionalFields.xml b/log4j-mongodb4/src/test/resources/MongoDb4AdditionalFields.xml
new file mode 100644
index 00000000000..6892bcac508
--- /dev/null
+++ b/log4j-mongodb4/src/test/resources/MongoDb4AdditionalFields.xml
@@ -0,0 +1,37 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/log4j-mongodb4/src/test/resources/log4j2-mongodb-auth-failure.xml b/log4j-mongodb4/src/test/resources/MongoDb4AuthFailureIT.xml
similarity index 67%
rename from log4j-mongodb4/src/test/resources/log4j2-mongodb-auth-failure.xml
rename to log4j-mongodb4/src/test/resources/MongoDb4AuthFailureIT.xml
index 0674de4fa0c..fa8a46bbebe 100644
--- a/log4j-mongodb4/src/test/resources/log4j2-mongodb-auth-failure.xml
+++ b/log4j-mongodb4/src/test/resources/MongoDb4AuthFailureIT.xml
@@ -15,16 +15,20 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-
+
-
+
+ connection="mongodb://log4jUser:12345678@localhost:${sys:log4j.mongo.port:-27017}/testDb.MongoDb4AuthFailureIT" />
-
+
diff --git a/log4j-mongodb4/src/test/resources/log4j2-mongodb-capped-int.xml b/log4j-mongodb4/src/test/resources/MongoDb4CappedIntIT.xml
similarity index 70%
rename from log4j-mongodb4/src/test/resources/log4j2-mongodb-capped-int.xml
rename to log4j-mongodb4/src/test/resources/MongoDb4CappedIntIT.xml
index 03aca2ebbea..2e9a11cb68a 100644
--- a/log4j-mongodb4/src/test/resources/log4j2-mongodb-capped-int.xml
+++ b/log4j-mongodb4/src/test/resources/MongoDb4CappedIntIT.xml
@@ -15,18 +15,22 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-
+
-
+
-
+
diff --git a/log4j-mongodb4/src/test/resources/log4j2-mongodb-capped-long.xml b/log4j-mongodb4/src/test/resources/MongoDb4CappedLongIT.xml
similarity index 71%
rename from log4j-mongodb4/src/test/resources/log4j2-mongodb-capped-long.xml
rename to log4j-mongodb4/src/test/resources/MongoDb4CappedLongIT.xml
index ddde9bcb05e..b79a4dc59e8 100644
--- a/log4j-mongodb4/src/test/resources/log4j2-mongodb-capped-long.xml
+++ b/log4j-mongodb4/src/test/resources/MongoDb4CappedLongIT.xml
@@ -15,19 +15,23 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-
+
-
+
-
+
diff --git a/log4j-mongodb/src/test/resources/log4j2-mongodb-auth-failure.xml b/log4j-mongodb4/src/test/resources/MongoDb4IT.xml
similarity index 68%
rename from log4j-mongodb/src/test/resources/log4j2-mongodb-auth-failure.xml
rename to log4j-mongodb4/src/test/resources/MongoDb4IT.xml
index e84603a0a52..6ab35f8765a 100644
--- a/log4j-mongodb/src/test/resources/log4j2-mongodb-auth-failure.xml
+++ b/log4j-mongodb4/src/test/resources/MongoDb4IT.xml
@@ -15,16 +15,19 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-
+
-
-
+
+
-
+
diff --git a/log4j-mongodb4/src/test/resources/MongoDb4MapMessageIT.xml b/log4j-mongodb4/src/test/resources/MongoDb4MapMessageIT.xml
new file mode 100644
index 00000000000..8990a64afcc
--- /dev/null
+++ b/log4j-mongodb4/src/test/resources/MongoDb4MapMessageIT.xml
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/log4j-mongodb4/src/test/resources/log4j2-mongodb-additional-fields.xml b/log4j-mongodb4/src/test/resources/log4j2-mongodb-additional-fields.xml
deleted file mode 100644
index eec98585cd9..00000000000
--- a/log4j-mongodb4/src/test/resources/log4j2-mongodb-additional-fields.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/log4j-mongodb4/src/test/resources/log4j2-mongodb.xml b/log4j-mongodb4/src/test/resources/log4j2-mongodb.xml
deleted file mode 100644
index b36a58affc9..00000000000
--- a/log4j-mongodb4/src/test/resources/log4j2-mongodb.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/log4j-parent/pom.xml b/log4j-parent/pom.xml
index 0bfb616f0f4..1faa00a7101 100644
--- a/log4j-parent/pom.xml
+++ b/log4j-parent/pom.xml
@@ -53,7 +53,6 @@
2.2.4
0.45.0
4.13.5
- 3.0.2
2.4
3.5.0
@@ -79,12 +78,9 @@
1.2.15
3.4.4
- 8.15.0
0.9.0
7.0.5
- 4.13.1
- 1.8.0
- 3.0.22
+ 4.0.22
33.3.0-jre
2.2.224
3.0
@@ -109,7 +105,6 @@
1.7.0
4.0.5
0.6.0
- 9.4.55.v20240627
3.5.12
1.37
2.40.1
@@ -135,7 +130,6 @@
2.7.18
5.3.39
2.0.3
- 10.0.27
1.7
2.35.2
2.10.0
@@ -178,7 +172,7 @@
- org.codehaus.groovy
+ org.apache.groovy
groovy-bom
${groovy.version}
pom
@@ -201,14 +195,6 @@
import
-
- org.eclipse.jetty
- jetty-bom
- ${jetty.version}
- pom
- import
-
-
org.junit
junit-bom
@@ -372,24 +358,6 @@
${commons-pool2.version}
-
- de.flapdoodle.embed
- de.flapdoodle.embed.mongo
- ${flapdoodle-embed.version}
-
-
-
- de.flapdoodle.embed
- de.flapdoodle.embed.process
- ${flapdoodle-embed.version}
-
-
-
- de.flapdoodle.reverse
- de.flapdoodle.reverse
- ${flapdoodle-reverse.version}
-
-
com.conversantmedia
disruptor
@@ -402,12 +370,6 @@
${disruptor.version}
-
- co.elastic.clients
- elasticsearch-java
- ${elasticsearch-java.version}
-
-
org.zapodot
embedded-ldap-junit
@@ -814,12 +776,6 @@
${system-stubs.version}
-
- org.apache.tomcat
- tomcat-juli
- ${tomcat-juli.version}
-
-
org.apache.velocity
velocity
@@ -900,7 +856,7 @@
-
+
io.fabric8
docker-maven-plugin
@@ -999,21 +955,6 @@
org.codehaus.gmavenplus
gmavenplus-plugin
- ${gmavenplus-plugin.version}
-
-
- org.codehaus.groovy
- groovy-ant
- ${groovy.version}
- runtime
-
-
- org.codehaus.groovy
- groovy
- ${groovy.version}
- runtime
-
-
ban-static-transitive
diff --git a/pom.xml b/pom.xml
index ca216b5a2ed..dcd499d2d38 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
org.apache.logging
logging-parent
- 11.2.0
+ 11.3.0
diff --git a/src/changelog/.2.x.x/2229_mongodb_docker.xml b/src/changelog/.2.x.x/2229_mongodb_docker.xml
new file mode 100644
index 00000000000..1d5b36ed1ca
--- /dev/null
+++ b/src/changelog/.2.x.x/2229_mongodb_docker.xml
@@ -0,0 +1,8 @@
+
+
+
+ Switch MongoDB tests to use Docker.
+
diff --git a/src/changelog/.2.x.x/2937-http-watcher.xml b/src/changelog/.2.x.x/2937-http-watcher.xml
new file mode 100644
index 00000000000..ec3e1a14263
--- /dev/null
+++ b/src/changelog/.2.x.x/2937-http-watcher.xml
@@ -0,0 +1,8 @@
+
+
+
+ Fix reloading of the configuration from an HTTP(S) source
+
diff --git a/src/changelog/.2.x.x/2953_enable_docker_for_JTL.xml b/src/changelog/.2.x.x/2953_enable_docker_for_JTL.xml
new file mode 100644
index 00000000000..4d0f8d434f1
--- /dev/null
+++ b/src/changelog/.2.x.x/2953_enable_docker_for_JTL.xml
@@ -0,0 +1,8 @@
+
+
+
+ Enable Docker-based tests in CI for JSON Template Layout
+
diff --git a/src/changelog/.2.x.x/update_org_apache_logging_logging_parent.xml b/src/changelog/.2.x.x/update_org_apache_logging_logging_parent.xml
new file mode 100644
index 00000000000..5b17082960b
--- /dev/null
+++ b/src/changelog/.2.x.x/update_org_apache_logging_logging_parent.xml
@@ -0,0 +1,7 @@
+
+
+ Update `org.apache.logging:logging-parent` to version `11.3.0`
+