Fix extended stack trace (i.e., %xEx) rendering performance regression

log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ClassResourceInfo.java

@@ -26,15 +26,21 @@ final class ClassResourceInfo {
 
     static final ClassResourceInfo UNKNOWN = new ClassResourceInfo();
 
-    private final String text;
+    private final String exactnessPrefix;
+
+    private final String location;
+
+    private final String version;
 
     final Class<?> clazz;
 
     /**
      * Constructs an instance modelling an unknown class resource.
      */
     private ClassResourceInfo() {
-        this.text = "~[?:?]";
+        this.exactnessPrefix = "~";
+        this.location = "?";
+        this.version = "?";
         this.clazz = null;
     }
 
@@ -44,14 +50,9 @@ private ClassResourceInfo() {
      */
     ClassResourceInfo(final Class<?> clazz, final boolean exact) {
         this.clazz = clazz;
-        this.text = getText(clazz, exact);
-    }
-
-    private static String getText(final Class<?> clazz, final boolean exact) {
-        final String exactnessPrefix = exact ? "" : "~";
-        final String location = getLocation(clazz);
-        final String version = getVersion(clazz);
-        return String.format("%s[%s:%s]", exactnessPrefix, location, version);
+        this.exactnessPrefix = exact ? "" : "~";
+        this.location = getLocation(clazz);
+        this.version = getVersion(clazz);
     }
 
     private static String getLocation(final Class<?> clazz) {
@@ -87,6 +88,6 @@ private static String getVersion(final Class<?> clazz) {
 
     @Override
     public String toString() {
-        return text;
+        return String.format("%s[%s:%s]", exactnessPrefix, location, version);
     }
 }

log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ThrowableExtendedStackTraceRenderer.java

@@ -16,18 +16,20 @@
  */
 package org.apache.logging.log4j.core.pattern;
 
+import org.apache.logging.log4j.util.LoaderUtil;
+import org.apache.logging.log4j.util.StackLocatorUtil;
+
 import java.util.ArrayDeque;
 import java.util.Collections;
+import java.util.Deque;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Queue;
 import java.util.Set;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import org.apache.logging.log4j.util.LoaderUtil;
-import org.apache.logging.log4j.util.StackLocatorUtil;
 
 /**
  * {@link ThrowableStackTraceRenderer} variant where the rendered {@link StackTraceElement}s are enriched with the enclosing JAR file and its version information, if available.
@@ -105,12 +107,8 @@ private static Map<String, ClassResourceInfo> createClassResourceInfoByName(
             // But we need the associated `Class<?>` to extract its resource information, i.e., JAR file and version.
             // We are capturing the current stack to find suitable class loaders.
             // We will use this as a bootstrap to go from a class name in a stack trace to a `Class<?>`.
-            final Map<String, ClassResourceInfo> classResourceInfoByName =
-                    StackLocatorUtil.getCurrentStackTrace().stream()
-                            .collect(Collectors.toMap(
-                                    Class::getName,
-                                    clazz -> new ClassResourceInfo(clazz, true),
-                                    (classResourceInfo1, classResourceInfo2) -> classResourceInfo1));
+            final Deque<Class<?>> rootStackTrace = StackLocatorUtil.getCurrentStackTrace();
+            final Map<String, ClassResourceInfo> classResourceInfoByName = new HashMap<>();
 
             // Walk over the causal chain
             final Set<Throwable> visitedThrowables = new HashSet<>();
@@ -130,7 +128,9 @@ private static Map<String, ClassResourceInfo> createClassResourceInfoByName(
                     continue;
                 }
 
+                Class<?> clazz = rootStackTrace.isEmpty() ? null : rootStackTrace.peekLast();
                 ClassLoader lastLoader = null;
+                ClassResourceInfo classResourceInfo;
                 final StackTraceElement[] stackTraceElements = throwable.getStackTrace();
                 for (int throwableStackIndex = metadata.stackLength - 1;
                         throwableStackIndex >= 0;
@@ -139,20 +139,29 @@ private static Map<String, ClassResourceInfo> createClassResourceInfoByName(
                     // Skip if the current class name is either known, or already visited and is unknown
                     final StackTraceElement stackTraceElement = stackTraceElements[throwableStackIndex];
                     final String stackTraceElementClassName = stackTraceElement.getClassName();
-                    ClassResourceInfo classResourceInfo = classResourceInfoByName.get(stackTraceElementClassName);
-                    if (classResourceInfo != null) {
-                        if (classResourceInfo.clazz != null) {
-                            lastLoader = classResourceInfo.clazz.getClassLoader();
+                    if (clazz != null && stackTraceElementClassName.equals(clazz.getName())) {
+                        classResourceInfo = new ClassResourceInfo(clazz, true);
+                        classResourceInfoByName.put(clazz.getName(), classResourceInfo);
+                        lastLoader = classResourceInfo.clazz.getClassLoader();
+                        rootStackTrace.pollLast();
+                        clazz = rootStackTrace.peekLast();
+                    } else {
+                        classResourceInfo = classResourceInfoByName.get(stackTraceElementClassName);
+                        if (classResourceInfo != null) {
+                            if (classResourceInfo.clazz != null) {
+                                lastLoader = classResourceInfo.clazz.getClassLoader();
+                            }
+                        } else {
+                            final Class<?> stackTraceElementClass = loadClass(lastLoader, stackTraceElementClassName);
+                            classResourceInfo = stackTraceElementClass != null
+                                    ? new ClassResourceInfo(stackTraceElementClass, false)
+                                    : ClassResourceInfo.UNKNOWN;
+                            classResourceInfoByName.put(stackTraceElementClassName, classResourceInfo);
+                            if (classResourceInfo.clazz != null) {
+                                lastLoader = classResourceInfo.clazz.getClassLoader();
+                            }
                         }
-                        continue;
                     }
-
-                    // Try to determine the stack trace element class, and register the result to the lookup table
-                    final Class<?> stackTraceElementClass = loadClass(lastLoader, stackTraceElementClassName);
-                    classResourceInfo = stackTraceElementClass != null
-                            ? new ClassResourceInfo(stackTraceElementClass, false)
-                            : ClassResourceInfo.UNKNOWN;
-                    classResourceInfoByName.put(stackTraceElementClassName, classResourceInfo);
                 }
             }
             return classResourceInfoByName;