Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
package org.apache.logging.log4j.core.pattern;

import static java.util.Arrays.asList;
import static org.apache.logging.log4j.core.pattern.ThrowablePatternConverterTest.EXCEPTION;
import static org.apache.logging.log4j.core.pattern.ThrowablePatternConverterTest.LEVEL;
import static org.apache.logging.log4j.core.pattern.ThrowablePatternConverterTest.convert;
import static org.assertj.core.api.Assertions.assertThat;
Expand All @@ -38,6 +37,8 @@
*/
class RootThrowablePatternConverterTest {

static final Throwable EXCEPTION = TestFriendlyException.INSTANCE;

private static final StackTraceElement THROWING_METHOD =
Throwables.getRootCause(EXCEPTION).getStackTrace()[0];

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.locks.LockSupport;
import java.util.stream.Collectors;
Expand Down Expand Up @@ -443,10 +444,51 @@ private static String normalizeStackTrace(final String stackTrace, final String
.replaceAll(" ~\\[\\?:[^]]+](\\Q" + conversionEnding + "\\E|$)", " ~[?:0]$1");
}

@Test
@Issue("https://github.com/apache/logging-log4j2/issues/3940")
void concurrent_stacktrace_mutation_should_not_cause_failure() throws Exception {
final ExecutorService executor = Executors.newFixedThreadPool(2);

// Create the formatter
final List<PatternFormatter> patternFormatters = PATTERN_PARSER.parse(patternPrefix, false, true, true);
assertThat(patternFormatters).hasSize(1);
final PatternFormatter patternFormatter = patternFormatters.get(0);
final StringBuilder buffer = new StringBuilder();

try {
for (int i = 0; i < 10; i++) {
final CountDownLatch latch = new CountDownLatch(2);
final Throwable exception = new RuntimeException();
final LogEvent logEvent = Log4jLogEvent.newBuilder()
.setThrown(exception)
.setLevel(LEVEL)
.build();

executor.submit(() -> {
try {
patternFormatter.format(logEvent, buffer);
buffer.setLength(0);
latch.countDown();
} catch (Throwable e) {
e.printStackTrace();
}
});
executor.submit(() -> {
exception.setStackTrace(new StackTraceElement[0]);
latch.countDown();
});
if (latch.await(1, TimeUnit.SECONDS) == false) {
throw new IllegalStateException("timed out waiting for tasks to complete");
}
}
} finally {
executor.shutdownNow();
}
}

@RepeatedTest(10)
@Issue("https://github.com/apache/logging-log4j2/issues/3929")
void concurrent_suppressed_mutation_should_not_cause_failure() throws Exception {

// Test constants
final int threadCount = Math.max(8, Runtime.getRuntime().availableProcessors());
final ExecutorService executor = Executors.newFixedThreadPool(threadCount);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ private static Map<String, ClassResourceInfo> createClassResourceInfoByName(
Class<?> executionStackTraceElementClass =
executionStackTrace.isEmpty() ? null : executionStackTrace.peekLast();
ClassLoader lastLoader = null;
final StackTraceElement[] stackTraceElements = throwable.getStackTrace();
final StackTraceElement[] stackTraceElements = metadata.stackTrace;
for (int throwableStackIndex = metadata.stackLength - 1;
throwableStackIndex >= 0;
--throwableStackIndex) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ private void renderThrowable(
}
renderThrowableMessage(buffer, throwable);
buffer.append(lineSeparator);
renderStackTraceElements(buffer, throwable, context, metadata, prefix, lineSeparator);
renderStackTraceElements(buffer, context, metadata, prefix, lineSeparator);
renderSuppressed(buffer, metadata.suppressed, context, visitedThrowables, prefix + '\t', lineSeparator);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ private void renderThrowable(
final Context.Metadata metadata = context.metadataByThrowable.get(throwable);
renderThrowableMessage(buffer, throwable);
buffer.append(lineSeparator);
renderStackTraceElements(buffer, throwable, context, metadata, prefix, lineSeparator);
renderStackTraceElements(buffer, context, metadata, prefix, lineSeparator);
renderSuppressed(buffer, metadata.suppressed, context, visitedThrowables, prefix + '\t', lineSeparator);
renderCause(buffer, throwable.getCause(), context, visitedThrowables, prefix, lineSeparator);
}
Expand Down Expand Up @@ -148,13 +148,12 @@ static void renderThrowableMessage(final StringBuilder buffer, final Throwable t

final void renderStackTraceElements(
final StringBuilder buffer,
final Throwable throwable,
final C context,
final Context.Metadata metadata,
final String prefix,
final String lineSeparator) {
context.ignoredStackTraceElementCount = 0;
final StackTraceElement[] stackTraceElements = throwable.getStackTrace();
final StackTraceElement[] stackTraceElements = metadata.stackTrace;
for (int i = 0; i < metadata.stackLength; i++) {
renderStackTraceElement(buffer, stackTraceElements[i], context, prefix, lineSeparator);
}
Expand Down Expand Up @@ -268,6 +267,11 @@ static final class Metadata {
*/
final int stackLength;

/**
* The stack trace of this {@link Throwable}
*/
final StackTraceElement[] stackTrace;

/**
* The suppressed exceptions attached to this {@link Throwable}.
* This needs to be captured separately since {@link Throwable#getSuppressed()} can change.
Expand All @@ -277,9 +281,14 @@ static final class Metadata {
*/
final Throwable[] suppressed;

private Metadata(final int commonElementCount, final int stackLength, final Throwable[] suppressed) {
private Metadata(
final int commonElementCount,
final int stackLength,
final StackTraceElement[] stackTrace,
final Throwable[] suppressed) {
this.commonElementCount = commonElementCount;
this.stackLength = stackLength;
this.stackTrace = stackTrace;
this.suppressed = suppressed;
}

Expand Down Expand Up @@ -339,7 +348,7 @@ private static Metadata populateMetadata(
commonElementCount = 0;
stackLength = currentTrace.length;
}
return new Metadata(commonElementCount, stackLength, suppressed);
return new Metadata(commonElementCount, stackLength, currentTrace, suppressed);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<entry xmlns="https://logging.apache.org/xml/ns"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
https://logging.apache.org/xml/ns
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
type="fixed">
<issue id="3940" link="https://github.com/apache/logging-log4j2/pull/3940"/>
<description format="asciidoc">
Fixes `ArrayIndexOutOfBoundsException` thrown by `ThrowableStackTraceRenderer` when a `Throwable`'s stacktrace is mutated concurrently.
</description>
</entry>