Skip to content

Commit 890ee15

Browse files
committed
Lift error finding utility to exceptions helpers
We have code used in the networking layer to search for errors buried in other exceptions. This code will be useful in other locations so with this commit we move it to our exceptions helpers. Relates #28691
1 parent 90bde12 commit 890ee15

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

core/src/main/java/org/elasticsearch/ExceptionsHelper.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,15 @@
3333
import java.io.PrintWriter;
3434
import java.io.StringWriter;
3535
import java.util.ArrayList;
36+
import java.util.Arrays;
3637
import java.util.Collections;
3738
import java.util.HashSet;
3839
import java.util.LinkedList;
3940
import java.util.List;
4041
import java.util.Optional;
4142
import java.util.Queue;
4243
import java.util.Set;
44+
import java.util.stream.Collectors;
4345

4446
public final class ExceptionsHelper {
4547

@@ -126,6 +128,10 @@ public static String stackTrace(Throwable e) {
126128
return stackTraceStringWriter.toString();
127129
}
128130

131+
public static String formatStackTrace(final StackTraceElement[] stackTrace) {
132+
return Arrays.stream(stackTrace).skip(1).map(e -> "\tat " + e).collect(Collectors.joining("\n"));
133+
}
134+
129135
static final int MAX_ITERATIONS = 1024;
130136

131137
/**

modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/Netty4Utils.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,8 +181,7 @@ public static void maybeDie(final Throwable cause) {
181181
*/
182182
try {
183183
// try to log the current stack trace
184-
final StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace();
185-
final String formatted = Arrays.stream(stackTrace).skip(1).map(e -> "\tat " + e).collect(Collectors.joining("\n"));
184+
final String formatted = ExceptionsHelper.formatStackTrace(Thread.currentThread().getStackTrace());
186185
logger.error("fatal error on the network layer\n{}", formatted);
187186
} finally {
188187
new Thread(

0 commit comments

Comments
 (0)