IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Tempo: Update the embedded flame graph labelSelector (#79061)

Browse Source 
* Update the embedded flame graph labelSelector

* Update labelSelector
This commit is contained in:
Joey 2023-12-08 09:44:51 +00:00 committed by GitHub
parent 7ddcd0c961
commit 58c5e5c9dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/SpanFlameGraph.tsx
View File

@ -21,7 +21,7 @@ import { PyroscopeQueryType } from 'app/plugins/datasource/grafana-pyroscope-dat
import { PyroscopeDataSource } from 'app/plugins/datasource/grafana-pyroscope-datasource/datasource';
import { Query } from 'app/plugins/datasource/grafana-pyroscope-datasource/types';
import { pyroscopeProfileIdTagKey } from '../../../createSpanLink';
import { defaultProfilingKeys, getFormattedTags, pyroscopeProfileIdTagKey } from '../../../createSpanLink';
import { TraceSpan } from '../../types/trace';
import { TraceFlameGraphs } from '.';
@ -75,8 +75,20 @@ export default function SpanFlameGraph(props: SpanFlameGraphProps) {
const queryFlameGraph = useCallback(
async (
profilesDataSourceSettings: DataSourceInstanceSettings<DataSourceJsonData>,
traceToProfilesOptions: TraceToProfilesOptions
traceToProfilesOptions: TraceToProfilesOptions,
span: TraceSpan
) => {
let labelSelector = '{}';
if (traceToProfilesOptions.customQuery && traceToProfilesOptions.query) {
labelSelector = traceToProfilesOptions.query;
} else {
const tags =
traceToProfilesOptions.tags && traceToProfilesOptions.tags.length > 0
? traceToProfilesOptions.tags
: defaultProfilingKeys;
labelSelector = `{${getFormattedTags(span, tags)}}`;
}
const request = {
requestId: 'span-flamegraph-requestId',
interval: '2s',
@ -88,7 +100,7 @@ export default function SpanFlameGraph(props: SpanFlameGraphProps) {
startTime: span.startTime,
targets: [
{
labelSelector: '{}',
labelSelector,
groupBy: [],
profileTypeId: traceToProfilesOptions.profileTypeId ?? '',
queryType: 'profile' as PyroscopeQueryType,
@ -107,7 +119,7 @@ export default function SpanFlameGraph(props: SpanFlameGraphProps) {
setTraceFlameGraphs({ ...traceFlameGraphs, [profileTagValue]: flameGraph });
}
},
[getTimeRangeForProfile, profileTagValue, setTraceFlameGraphs, span.startTime, timeZone, traceFlameGraphs]
[getTimeRangeForProfile, profileTagValue, setTraceFlameGraphs, timeZone, traceFlameGraphs]
);
useEffect(() => {
@ -117,18 +129,16 @@ export default function SpanFlameGraph(props: SpanFlameGraphProps) {
profilesDataSourceSettings = getDatasourceSrv().getInstanceSettings(traceToProfilesOptions.datasourceUid);
}
if (traceToProfilesOptions && profilesDataSourceSettings) {
queryFlameGraph(profilesDataSourceSettings, traceToProfilesOptions);
queryFlameGraph(profilesDataSourceSettings, traceToProfilesOptions, span);
}
}
}, [
setTraceFlameGraphs,
span.tags,
span,
traceFlameGraphs,
traceToProfilesOptions,
getTimeRangeForProfile,
span.startTime,
timeZone,
span.spanID,
queryFlameGraph,
profileTagValue,
]);

4
public/app/features/explore/TraceView/createSpanLink.tsx
View File

@ -134,7 +134,7 @@ const formatDefaultKeys = (keys: string[]) => {
}));
};
const defaultKeys = formatDefaultKeys(['cluster', 'hostname', 'namespace', 'pod', 'service.name', 'service.namespace']);
const defaultProfilingKeys = formatDefaultKeys(['service.name', 'service.namespace']);
export const defaultProfilingKeys = formatDefaultKeys(['service.name', 'service.namespace']);
export const pyroscopeProfileIdTagKey = 'pyroscope.profile.id';
function legacyCreateSpanLinkFactory(
@ -499,7 +499,7 @@ function getQueryForFalconLogScale(span: TraceSpan, options: TraceToLogsOptionsV
* Creates a string representing all the tags already formatted for use in the query. The tags are filtered so that
* only intersection of tags that exist in a span and tags that you want are serialized into the string.
*/
function getFormattedTags(
export function getFormattedTags(
span: TraceSpan,
tags: TraceToLogsTag[],
{ labelValueSign = '=', joinBy = ', ' }: { labelValueSign?: string; joinBy?: string } = {}