Skip to content
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

Jump to bottom

[7.x] [APM] Treat error.exception.stacktrace.line as optional (#55733) #55840

Merged
merged 2 commits into from
Jan 29, 2020
Merged

[7.x] [APM] Treat error.exception.stacktrace.line as optional (#55733) #55840

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
6e1fe33
[APM] Treat error.exception.stacktrace.line as optional (#55733)
dgieselaar Jan 24, 2020
50f3ccc
Merge branch '7.x' into backport/7.x/pr-55733
elasticmachine Jan 29, 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
4 changes: 2 additions & 2 deletions x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/FrameHeading.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ const FrameHeading: React.FC<Props> = ({ stackframe, isLibraryFrame }) => {
const FileDetail = isLibraryFrame
? LibraryFrameFileDetail
: AppFrameFileDetail;
const lineNumber = stackframe.line.number;
const lineNumber = stackframe.line?.number ?? 0;

const name =
'filename' in stackframe ? stackframe.filename : stackframe.classname;
Expand All @@ -46,7 +46,7 @@ const FrameHeading: React.FC<Props> = ({ stackframe, isLibraryFrame }) => {
{lineNumber > 0 && (
<Fragment>
{' at '}
<FileDetail>line {stackframe.line.number}</FileDetail>
<FileDetail>line {lineNumber}</FileDetail>
</Fragment>
)}
</FileDetails>
Expand Down
2 changes: 1 addition & 1 deletion x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/Stackframe.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,5 +77,5 @@ export function Stackframe({
function hasLineContext(
stackframe: IStackframe
): stackframe is IStackframeWithLineContext {
return stackframe.line.hasOwnProperty('context');
return stackframe.line?.hasOwnProperty('context') || false;
}
2 changes: 1 addition & 1 deletion x-pack/legacy/plugins/apm/typings/es_schemas/raw/fields/Stackframe.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ type IStackframeBase = {
vars?: {
[key: string]: unknown;
};
line: {
line?: {
number: number;
};
} & ({ classname: string } | { filename: string });
Expand Down