Skip to content

Fix #29: Make maxStackSize configurable #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 6, 2020
Merged

Fix #29: Make maxStackSize configurable #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92b8f0d
Fix #29: Make maxStackSize configurable
Oct 2, 2020
98bb204
Fix #29: Resolve code review feedback
Oct 3, 2020
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
6 changes: 5 additions & 1 deletion core/src/main/java/com/newrelic/logging/core/ExceptionUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,16 @@ public static String getErrorStack(Throwable throwable) {
}

public static String getErrorStack(StackTraceElement[] stack) {
return getErrorStack(stack, MAX_STACK_SIZE);
}

public static String getErrorStack(StackTraceElement[] stack, Integer maxStackSize) {
if (stack == null || stack.length == 0) {
return null;
}

StringBuilder stackBuilder = new StringBuilder();
for(int i = 0; i < Math.min(MAX_STACK_SIZE, stack.length); i++) {
for(int i = 0; i < Math.min(maxStackSize, stack.length); i++) {
stackBuilder.append(" at " + stack[i].toString() + "\n");
}
return stackBuilder.toString();
Expand Down
11 changes: 10 additions & 1 deletion logback/src/main/java/com/newrelic/logging/logback/NewRelicEncoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
import java.nio.charset.StandardCharsets;
import java.util.Arrays;

import static com.newrelic.logging.core.ExceptionUtil.MAX_STACK_SIZE;

/**
* An {@link ch.qos.logback.core.encoder.Encoder} that will write New Relic's JSON format.
*
Expand All @@ -28,7 +30,9 @@
* @see <a href="https://logback.qos.ch/manual/encoders.html#interface">Logback Encoders</a>
*/
public class NewRelicEncoder extends EncoderBase<ILoggingEvent> {
private NewRelicJsonLayout layout = new NewRelicJsonLayout();
private NewRelicJsonLayout layout;

private Integer maxStackSize = MAX_STACK_SIZE;

@Override
public byte[] encode(ILoggingEvent event) {
Expand All @@ -45,9 +49,14 @@ public byte[] encode(ILoggingEvent event) {
@Override
public void start() {
super.start();
layout = new NewRelicJsonLayout(maxStackSize);
layout.start();
}

public void setMaxStackSize(final Integer maxStackSize) {
this.maxStackSize = maxStackSize;
}

@Override
public byte[] headerBytes() {
return new byte[0];
Expand Down
16 changes: 13 additions & 3 deletions logback/src/main/java/com/newrelic/logging/logback/NewRelicJsonLayout.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,16 @@
import static com.newrelic.logging.core.ExceptionUtil.MAX_STACK_SIZE;

public class NewRelicJsonLayout extends LayoutBase<ILoggingEvent> {
private final Integer maxStackSize;

public NewRelicJsonLayout() {
this(MAX_STACK_SIZE);
}

public NewRelicJsonLayout(Integer maxStackSize) {
this.maxStackSize = maxStackSize;
}

@Override
public String doLayout(ILoggingEvent event) {
StringWriter sw = new StringWriter();
Expand Down Expand Up @@ -67,12 +77,12 @@ private void writeToGenerator(ILoggingEvent event, JsonGenerator generator) thro

StackTraceElementProxy[] stackProxy = proxy.getStackTraceElementProxyArray();
if (stackProxy != null && stackProxy.length > 0) {
List<StackTraceElement> elements = new ArrayList<>(MAX_STACK_SIZE);
for (int i = 0; i < MAX_STACK_SIZE && i < stackProxy.length; i++) {
List<StackTraceElement> elements = new ArrayList<>(maxStackSize);
for (int i = 0; i < maxStackSize && i < stackProxy.length; i++) {
elements.add(stackProxy[i].getStackTraceElement());
}

generator.writeObjectField(ElementName.ERROR_STACK, ExceptionUtil.getErrorStack(elements.toArray(new StackTraceElement[0])));
generator.writeObjectField(ElementName.ERROR_STACK, ExceptionUtil.getErrorStack(elements.toArray(new StackTraceElement[0]), maxStackSize));
}
}

Expand Down