github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 17:28:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

[Profiling] Fix UI discrepancies in frame information window (#142812)

Browse source 
* Fix UI discrepancies in frame information window

* Fix comment

* Use source line instead

This matches with the value used in the flamegraph labels.
This commit is contained in:
Joseph Crail 2022-10-06 12:50:21 -07:00 • committed by GitHub
parent 2d34b6e789
commit 39811a3bd5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 98 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
x-pack/plugins/profiling/common/profiling.ts
View file

@ -95,7 +95,7 @@ export interface StackFrameMetadata {
// StackTrace.Type
FrameType: FrameType;
// StackFrame.LineNumber?
// StackTrace.AddressOrLine
AddressOrLine: number;
// StackFrame.FunctionName
FunctionName: string;

53
x-pack/plugins/profiling/public/components/flame_graphs_view/flamegraph_information_window.tsx
View file

@ -15,14 +15,18 @@ import {
} from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import React from 'react';
import { NOT_AVAILABLE_LABEL } from '../../../common';
import { getImpactRows } from './get_impact_rows';
import { getInformationRows } from './get_information_rows';
interface Props {
frame?: {
fileID: string;
frameType: number;
exeFileName: string;
addressOrLine: number;
functionName: string;
sourceFileName: string;
sourceLine: number;
countInclusive: number;
countExclusive: number;
};
@ -104,7 +108,27 @@ export function FlamegraphInformationWindow({ onClose, frame, totalSamples, tota
);
}
const { exeFileName, functionName, sourceFileName, countInclusive, countExclusive } = frame;
const {
fileID,
frameType,
exeFileName,
addressOrLine,
functionName,
sourceFileName,
sourceLine,
countInclusive,
countExclusive,
} = frame;
const informationRows = getInformationRows({
fileID,
frameType,
exeFileName,
addressOrLine,
functionName,
sourceFileName,
sourceLine,
});
const impactRows = getImpactRows({
countInclusive,
@ -117,30 +141,7 @@ export function FlamegraphInformationWindow({ onClose, frame, totalSamples, tota
<FlamegraphFrameInformationPanel onClose={onClose}>
<EuiFlexGroup direction="column">
<EuiFlexItem>
<KeyValueList
rows={[
{
label: i18n.translate(
'xpack.profiling.flameGraphInformationWindow.executableLabel',
{ defaultMessage: 'Executable' }
),
value: exeFileName || NOT_AVAILABLE_LABEL,
},
{
label: i18n.translate('xpack.profiling.flameGraphInformationWindow.functionLabel', {
defaultMessage: 'Function',
}),
value: functionName || NOT_AVAILABLE_LABEL,
},
{
label: i18n.translate(
'xpack.profiling.flameGraphInformationWindow.sourceFileLabel',
{ defaultMessage: 'Source file' }
),
value: sourceFileName || NOT_AVAILABLE_LABEL,
},
]}
/>
<KeyValueList rows={informationRows} />
</EuiFlexItem>
<EuiFlexItem>
<EuiFlexGroup direction="column">

65
x-pack/plugins/profiling/public/components/flame_graphs_view/get_information_rows.ts Normal file
View file

@ -0,0 +1,65 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/
import { i18n } from '@kbn/i18n';
import { NOT_AVAILABLE_LABEL } from '../../../common';
import { describeFrameType } from '../../../common/profiling';
export function getInformationRows({
fileID,
frameType,
exeFileName,
addressOrLine,
functionName,
sourceFileName,
sourceLine,
}: {
fileID: string;
frameType: number;
exeFileName: string;
addressOrLine: number;
functionName: string;
sourceFileName: string;
sourceLine: number;
}) {
const executable = fileID === '' && addressOrLine === 0 ? 'root' : exeFileName;
const sourceLineNumber = sourceLine > 0 ? `#${sourceLine}` : '';
const informationRows = [];
if (executable) {
informationRows.push({
label: i18n.translate('xpack.profiling.flameGraphInformationWindow.executableLabel', {
defaultMessage: 'Executable',
}),
value: executable,
});
} else {
informationRows.push({
label: i18n.translate('xpack.profiling.flameGraphInformationWindow.frameTypeLabel', {
defaultMessage: 'Frame type',
}),
value: describeFrameType(frameType),
});
}
informationRows.push({
label: i18n.translate('xpack.profiling.flameGraphInformationWindow.functionLabel', {
defaultMessage: 'Function',
}),
value: functionName || NOT_AVAILABLE_LABEL,
});
informationRows.push({
label: i18n.translate('xpack.profiling.flameGraphInformationWindow.sourceFileLabel', {
defaultMessage: 'Source file',
}),
value: sourceFileName ? `${sourceFileName}${sourceLineNumber}` : NOT_AVAILABLE_LABEL,
});
return informationRows;
}

6
x-pack/plugins/profiling/public/components/flamegraph.tsx
View file

@ -188,9 +188,13 @@ export const FlameGraph: React.FC<FlameGraphProps> = ({
const selected: undefined | React.ComponentProps<typeof FlamegraphInformationWindow>['frame'] =
primaryFlamegraph && highlightedVmIndex !== undefined
? {
fileID: primaryFlamegraph.FileID[highlightedVmIndex],
frameType: primaryFlamegraph.FrameType[highlightedVmIndex],
exeFileName: primaryFlamegraph.ExeFilename[highlightedVmIndex],
sourceFileName: primaryFlamegraph.SourceFilename[highlightedVmIndex],
addressOrLine: primaryFlamegraph.AddressOrLine[highlightedVmIndex],
functionName: primaryFlamegraph.FunctionName[highlightedVmIndex],
sourceFileName: primaryFlamegraph.SourceFilename[highlightedVmIndex],
sourceLine: primaryFlamegraph.SourceLine[highlightedVmIndex],
countInclusive: primaryFlamegraph.CountInclusive[highlightedVmIndex],
countExclusive: primaryFlamegraph.CountExclusive[highlightedVmIndex],
}