github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 09:48:58 -04:00
Code Issues Projects Releases Packages Wiki Activity

[Profiling] Aggregate ELF frames by exeFilename, not fileID (#141139)

Browse source 
* [Profiling] Aggregate ELF frames by exeFilename, not fileID

* [CI] Auto-commit changed files from 'node scripts/precommit_hook.js --ref HEAD~1..HEAD --fix'

Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
This commit is contained in:
Tim Rühsen 2022-09-22 11:45:20 +02:00 • committed by GitHub
parent cea17e3dbe
commit 03b360a6b8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
x-pack/plugins/profiling/common/frame_group.test.ts
View file

@ -33,18 +33,21 @@ const elfSymbolizedFrameGroups = [
createFrameGroup(
createStackFrameMetadata({
FileID: '0x0123456789ABCDEF',
ExeFileName: 'libc',
FunctionName: 'strlen()',
})
),
createFrameGroup(
createStackFrameMetadata({
FileID: '0xFEDCBA9876543210',
ExeFileName: 'libc',
FunctionName: 'strtok()',
})
),
createFrameGroup(
createStackFrameMetadata({
FileID: '0xFEDCBA9876543210',
ExeFileName: 'myapp',
FunctionName: 'main()',
})
),
@ -165,9 +168,7 @@ describe('Frame group operations', () => {
});
test('non-symbolized ELF frame', () => {
expect(createFrameGroupID(elfSymbolizedFrameGroups[0])).toEqual(
'elf;0x0123456789ABCDEF;strlen()'
);
expect(createFrameGroupID(elfSymbolizedFrameGroups[0])).toEqual('elf;libc;strlen()');
});
test('symbolized frame', () => {

14
x-pack/plugins/profiling/common/frame_group.ts
View file

@ -28,6 +28,7 @@ interface EmptyFrameGroup extends BaseFrameGroup {
interface ElfFrameGroup extends BaseFrameGroup {
readonly name: FrameGroupName.ELF;
readonly fileID: StackFrameMetadata['FileID'];
readonly exeFilename: StackFrameMetadata['ExeFileName'];
readonly functionName: StackFrameMetadata['FunctionName'];
}
@ -43,7 +44,7 @@ export type FrameGroup = EmptyFrameGroup | ElfFrameGroup | FullFrameGroup;
// createFrameGroup is the "standard" way of grouping frames, by commonly
// shared group identifiers.
//
// For ELF-symbolized frames, group by FunctionName and FileID.
// For ELF-symbolized frames, group by FunctionName, ExeFileName and FileID.
// For non-symbolized frames, group by FileID and AddressOrLine.
// otherwise group by ExeFileName, SourceFilename and FunctionName.
export function createFrameGroup(frame: StackFrameMetadata): FrameGroup {
@ -59,6 +60,7 @@ export function createFrameGroup(frame: StackFrameMetadata): FrameGroup {
return {
name: FrameGroupName.ELF,
fileID: frame.FileID,
exeFilename: frame.ExeFileName,
functionName: frame.FunctionName,
} as ElfFrameGroup;
}
@ -123,12 +125,14 @@ export function compareFrameGroup(a: FrameGroup, b: FrameGroup): number {
if (b.name === FrameGroupName.ELF) {
if (a.functionName < b.functionName) return -1;
if (a.functionName > b.functionName) return 1;
if (a.fileID < b.fileID) return -1;
if (a.fileID > b.fileID) return 1;
if (a.exeFilename < b.exeFilename) return -1;
if (a.exeFilename > b.exeFilename) return 1;
return 0;
}
if (a.functionName < b.functionName) return -1;
if (a.functionName > b.functionName) return 1;
if (a.exeFilename < b.exeFilename) return -1;
if (a.exeFilename > b.exeFilename) return 1;
return -1;
}
@ -144,6 +148,8 @@ export function compareFrameGroup(a: FrameGroup, b: FrameGroup): number {
if (b.name === FrameGroupName.ELF) {
if (a.functionName < b.functionName) return -1;
if (a.functionName > b.functionName) return 1;
if (a.exeFilename < b.exeFilename) return -1;
if (a.exeFilename > b.exeFilename) return 1;
}
return 1;
}
@ -154,7 +160,7 @@ export function createFrameGroupID(frameGroup: FrameGroup): FrameGroupID {
return `${frameGroup.name};${frameGroup.fileID};${frameGroup.addressOrLine}`;
break;
case FrameGroupName.ELF:
return `${frameGroup.name};${frameGroup.fileID};${frameGroup.functionName}`;
return `${frameGroup.name};${frameGroup.exeFilename};${frameGroup.functionName}`;
break;
case FrameGroupName.FULL:
return `${frameGroup.name};${frameGroup.exeFilename};${frameGroup.functionName};${frameGroup.sourceFilename}`;