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: Simplify span filters logic and fix regex for tag only search (#90819)

Browse Source 
Simplify span filters logic and fix regex for tag only search
This commit is contained in:
Joey 2024-08-12 14:15:06 +01:00 committed by GitHub
parent 379249fc60
commit d00b4879d2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
public/app/features/explore/TraceView/components/utils/filter-spans.tsx
View File

@ -109,17 +109,15 @@ const getTagMatches = (spans: TraceSpan[], tags: Tag[]) => {
// match against every tag filter // match against every tag filter
return tags.every((tag: Tag) => { return tags.every((tag: Tag) => {
if (tag.key && tag.value) { if (tag.key && tag.value) {
if (tag.operator === '=' && checkKeyValConditionForMatch(tag, span)) { if (
return getReturnValue(tag.operator, true); (tag.operator === '=' && checkKeyValConditionForMatch(tag, span)) ||
} else if (tag.operator === '=~' && checkKeyValConditionForRegex(tag, span)) { (tag.operator === '=~' && checkKeyValConditionForRegex(tag, span)) ||
return getReturnValue(tag.operator, false); (tag.operator === '!=' && !checkKeyValConditionForMatch(tag, span)) ||
} else if (tag.operator === '!=' && !checkKeyValConditionForMatch(tag, span)) { (tag.operator === '!~' && !checkKeyValConditionForRegex(tag, span))
return getReturnValue(tag.operator, false); ) {
} else if (tag.operator === '!~' && !checkKeyValConditionForRegex(tag, span)) { return true;
return getReturnValue(tag.operator, false);
} else {
return false;
} }
return false;
} else if (tag.key) { } else if (tag.key) {
if ( if (
span.tags.some((kv) => checkKeyForMatch(tag.key!, kv.key)) || span.tags.some((kv) => checkKeyForMatch(tag.key!, kv.key)) ||
@ -133,10 +131,11 @@ const getTagMatches = (spans: TraceSpan[], tags: Tag[]) => {
(span.traceState && tag.key === TRACE_STATE) || (span.traceState && tag.key === TRACE_STATE) ||
tag.key === ID tag.key === ID
) { ) {
return getReturnValue(tag.operator, true); return tag.operator === '=' || tag.operator === '=~' ? true : false;
} }
return tag.operator === '=' || tag.operator === '=~' ? false : true;
} }
return getReturnValue(tag.operator, false); return false;
}); });
}); });
} }
@ -184,30 +183,15 @@ const checkKeyValConditionForMatch = (tag: Tag, span: TraceSpan) => {
}; };
const checkKeyForMatch = (tagKey: string, key: string) => { const checkKeyForMatch = (tagKey: string, key: string) => {
return tagKey === key.toString() ? true : false; return tagKey === key.toString();
}; };
const checkKeyAndValueForMatch = (tag: Tag, kv: TraceKeyValuePair) => { const checkKeyAndValueForMatch = (tag: Tag, kv: TraceKeyValuePair) => {
return tag.key === kv.key.toString() && tag.value === kv.value.toString() ? true : false; return tag.key === kv.key.toString() && tag.value === kv.value.toString();
}; };
const checkKeyAndValueForRegex = (tag: Tag, kv: TraceKeyValuePair) => { const checkKeyAndValueForRegex = (tag: Tag, kv: TraceKeyValuePair) => {
return kv.key.toString().includes(tag.key || '') && kv.value.toString().includes(tag.value || '') ? true : false; return kv.key.toString().includes(tag.key || '') && kv.value.toString().includes(tag.value || '');
};
const getReturnValue = (operator: string, found: boolean) => {
switch (operator) {
case '=':
return found;
case '!=':
return !found;
case '~=':
return !found;
case '!~':
return !found;
default:
return !found;
}
}; };
const getServiceNameMatches = (spans: TraceSpan[], searchProps: SearchProps) => { const getServiceNameMatches = (spans: TraceSpan[], searchProps: SearchProps) => {