Skip to content

[APM] Support error.{log,exception}.stacktrace.classname #54577

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 1 commit into from
Jan 14, 2020
Merged

[APM] Support error.{log,exception}.stacktrace.classname #54577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 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 @@ -35,9 +35,13 @@ const FrameHeading: React.FC<Props> = ({ stackframe, isLibraryFrame }) => {
? LibraryFrameFileDetail
: AppFrameFileDetail;
const lineNumber = stackframe.line.number;

const name =
'filename' in stackframe ? stackframe.filename : stackframe.classname;

return (
<FileDetails>
<FileDetail>{stackframe.filename}</FileDetail> in{' '}
<FileDetail>{name}</FileDetail> in{' '}
<FileDetail>{stackframe.function}</FileDetail>
{lineNumber > 0 && (
<Fragment>
Expand Down
9 changes: 4 additions & 5 deletions 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 @@ -4,8 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/

interface IStackframeBase {
filename: string;
type IStackframeBase = {
function?: string;
library_frame?: boolean;
exclude_from_grouping?: boolean;
Expand All @@ -19,13 +18,13 @@ interface IStackframeBase {
line: {
number: number;
};
}
} & ({ classname: string } | { filename: string });

export interface IStackframeWithLineContext extends IStackframeBase {
export type IStackframeWithLineContext = IStackframeBase & {
line: {
number: number;
context: string;
};
}
};

export type IStackframe = IStackframeBase | IStackframeWithLineContext;