IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-15 10:03:33 -06:00
Code Issues Packages Projects Releases Wiki Activity

Tempo: Add new structural operators (#77056)

Browse Source
This commit is contained in:
Fabrizio 2023-10-24 17:46:36 +02:00 committed by GitHub
parent 97be80d1f0
commit 3899620234
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -254,7 +254,7 @@
"@grafana/flamegraph": "workspace:*",
"@grafana/google-sdk": "0.1.1",
"@grafana/lezer-logql": "0.2.1",
"@grafana/lezer-traceql": "0.0.7",
"@grafana/lezer-traceql": "0.0.8",
"@grafana/monaco-logql": "^0.0.7",
"@grafana/runtime": "workspace:*",
"@grafana/scenes": "^1.18.0",

4
public/app/plugins/datasource/tempo/traceql/TraceQLEditor.test.tsx
View File

@ -72,6 +72,10 @@ describe('Check for syntax errors in query', () => {
['{span.status = $code}'],
['{span.${attribute} = "GET"}'],
['{span.${attribute:format} = ${value:format} }'],
['{true} >> {true}'],
['{true} << {true}'],
['{true} !>> {true}'],
['{true} !<< {true}'],
])('valid query - %s', (query: string) => {
expect(getErrorNodes(query)).toStrictEqual([]);
});

14
public/app/plugins/datasource/tempo/traceql/autocomplete.ts
View File

@ -137,6 +137,20 @@ export class CompletionProvider implements monacoTypes.languages.CompletionItemP
documentation:
'Child operator. Looks for spans matching {condB} that are direct child spans of a parent matching {condA}',
},
{
label: '<<',
insertText: '<<',
detail: 'Ancestor',
documentation:
'Ancestor operator. Looks for spans matching {condB} that are ancestors of a span matching {condA}',
},
{
label: '<',
insertText: '<',
detail: 'Parent',
documentation:
'Parent operator. Looks for spans matching {condB} that are direct parent spans of a child matching {condA}',
},
{
label: '~',
insertText: '~',

10
yarn.lock
View File

@ -3226,12 +3226,12 @@ __metadata:
languageName: node
linkType: hard
"@grafana/lezer-traceql@npm:0.0.7":
version: 0.0.7
resolution: "@grafana/lezer-traceql@npm:0.0.7"
"@grafana/lezer-traceql@npm:0.0.8":
version: 0.0.8
resolution: "@grafana/lezer-traceql@npm:0.0.8"
peerDependencies:
"@lezer/lr": ^1.3.0
checksum: 920f8116d61907e12ca1dd51949242abf435e675105699c7b2fcd8c024999ed0ddfd3500b1802111f3ed9ad37e16f40826790658bdf94224cd5b615e20360ab9
checksum: cd257010689de4c3177fd3e3bb74460d0d8669b9c25530c4ad1efa3cb2793a73c99f34a38058463b93790d3b80bf585992165801d6fd4b617823f1570c8dffad
languageName: node
linkType: hard
@ -17799,7 +17799,7 @@ __metadata:
"@grafana/flamegraph": "workspace:*"
"@grafana/google-sdk": 0.1.1
"@grafana/lezer-logql": 0.2.1
"@grafana/lezer-traceql": 0.0.7
"@grafana/lezer-traceql": 0.0.8
"@grafana/monaco-logql": ^0.0.7
"@grafana/runtime": "workspace:*"
"@grafana/scenes": ^1.18.0