Skip to content

Set stacktrace.abs_path #856

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

Closed
felixbarny wants to merge 2 commits into from
Closed

Set stacktrace.abs_path #856

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb56cf4
Set stacktrace.abs_path
felixbarny Sep 20, 2019
4d1eab9
Avoid allocations
felixbarny Sep 23, 2019
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
9 changes: 7 additions & 2 deletions apm-agent-core/src/main/java/co/elastic/apm/agent/report/serialize/DslJsonSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -677,9 +677,14 @@ private void serializeStackTraceElement(StackTraceElement stacktrace) {
jw.writeByte(OBJECT_START);
writeField("filename", stacktrace.getFileName());
writeField("function", stacktrace.getMethodName());
writeField("library_frame", isLibraryFrame(stacktrace.getClassName()));
String className = stacktrace.getClassName();
writeField("library_frame", isLibraryFrame(className));
writeField("lineno", stacktrace.getLineNumber());
serializeStackFrameModule(stacktrace.getClassName());
int lastDotIndex = className.lastIndexOf('.');
if (lastDotIndex > 0) {
writeField("abs_path", className.substring(0, lastDotIndex).replace('.', '/') + "/" + stacktrace.getFileName());
Copy link
Contributor

@eyalkoren eyalkoren Sep 22, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This allocates two String objects (substring() and replace()) for each stack frame of each span. Can we use a char-copy to a StringBuilder that includes the char replacement as well?
If so, can it also be used for handling inner classes, lambdas and the like or that using getFileName() will always be safer?

}
serializeStackFrameModule(className);
jw.writeByte(OBJECT_END);
}

Expand Down
1 change: 1 addition & 0 deletions ...agent-core/src/test/java/co/elastic/apm/agent/report/serialize/DslJsonSerializerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ void testErrorSerialization() throws IOException {
assertThat(stackTraceElement.get("library_frame")).isNotNull();
assertThat(stackTraceElement.get("lineno")).isNotNull();
assertThat(stackTraceElement.get("module")).isNotNull();
assertThat(stackTraceElement.get("abs_path").textValue()).isEqualTo(stackTraceElement.get("module").textValue().replace('.', '/') + "/" + stackTraceElement.get("filename").textValue());
assertThat(exception.get("type").textValue()).isEqualTo(Exception.class.getName());
assertThat(errorTree.get("transaction").get("sampled").booleanValue()).isTrue();
assertThat(errorTree.get("transaction").get("type").textValue()).isEqualTo("test-type");
Expand Down