Another attempt to fix o.o.transport.netty4.OpenSearchLoggingHandlerIT fails w/ stack overflow (#2051)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
This commit is contained in:
Andriy Redko 2022-02-04 11:23:36 -05:00 committed by GitHub
parent 309397520c
commit 1e5d98329e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions

View File

@ -53,6 +53,7 @@ public class OpenSearchLoggingHandlerIT extends OpenSearchNetty4IntegTestCase {
public void setUp() throws Exception { public void setUp() throws Exception {
super.setUp(); super.setUp();
appender = MockLogAppender.createForLoggers( appender = MockLogAppender.createForLoggers(
"^[^\n]+$", /* Only consider single line log statements */
LogManager.getLogger(OpenSearchLoggingHandler.class), LogManager.getLogger(OpenSearchLoggingHandler.class),
LogManager.getLogger(TransportLogger.class), LogManager.getLogger(TransportLogger.class),
LogManager.getLogger(TcpTransport.class) LogManager.getLogger(TcpTransport.class)

View File

@ -68,8 +68,12 @@ public class MockLogAppender extends AbstractAppender implements AutoCloseable {
* write to a closed MockLogAppender instance. * write to a closed MockLogAppender instance.
*/ */
public static MockLogAppender createForLoggers(Logger... loggers) throws IllegalAccessException { public static MockLogAppender createForLoggers(Logger... loggers) throws IllegalAccessException {
return createForLoggers(".*(\n.*)*", loggers);
}
public static MockLogAppender createForLoggers(String filter, Logger... loggers) throws IllegalAccessException {
final MockLogAppender appender = new MockLogAppender( final MockLogAppender appender = new MockLogAppender(
RegexFilter.createFilter(".*(\n.*)*", new String[0], false, null, null), RegexFilter.createFilter(filter, new String[0], false, null, null),
Collections.unmodifiableList(Arrays.asList(loggers)) Collections.unmodifiableList(Arrays.asList(loggers))
); );
appender.start(); appender.start();