public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[v9.3.x] Tempo: Fix TraceQL autocomplete issues (#60058) (#60125) (#60170)

Browse Source
This commit is contained in:
Hamas Shafiq
2022-12-13 10:51:28 +00:00
committed by GitHub
parent 61a9937027
commit c11e54766c
3 changed files with 32 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.betterer.results
+1 -3
View File
@@ -6818,9 +6818,7 @@ exports[`better eslint`] = {
[0, 0, 0, "Unexpected any. Specify a different type.", "15"],
[0, 0, 0, "Unexpected any. Specify a different type.", "16"],
[0, 0, 0, "Unexpected any. Specify a different type.", "17"],
[0, 0, 0, "Unexpected any. Specify a different type.", "18"],
[0, 0, 0, "Unexpected any. Specify a different type.", "19"],
[0, 0, 0, "Unexpected any. Specify a different type.", "20"]
[0, 0, 0, "Unexpected any. Specify a different type.", "18"]
],
"public/app/plugins/datasource/tempo/traceql/autocomplete.ts:5381": [
[0, 0, 0, "Do not use any type assertions.", "0"],
public/app/plugins/datasource/tempo/traceql/autocomplete.test.ts
+18 -5
View File
@@ -82,6 +82,17 @@ describe('CompletionProvider', () => {
]);
});
it('only suggests tags after typing the global attribute scope', async () => {
const { provider, model } = setup('{.}', 2, defaultTags);
const result = await provider.provideCompletionItems(
model as unknown as monacoTypes.editor.ITextModel,
{} as monacoTypes.Position
);
expect((result! as monacoTypes.languages.CompletionList).suggestions).toEqual(
defaultTags.map((s) => expect.objectContaining({ label: s, insertText: s }))
);
});
it('suggests operators after a space after the tag name', async () => {
const { provider, model } = setup('{ foo }', 6, defaultTags);
const result = await provider.provideCompletionItems(model as any, {} as any);
@@ -92,11 +103,13 @@ describe('CompletionProvider', () => {
it('suggests tags after a scope', async () => {
const { provider, model } = setup('{ resource. }', 11, defaultTags);
const result = await provider.provideCompletionItems(model as any, {} as any);
expect((result! as monacoTypes.languages.CompletionList).suggestions).toEqual([
...CompletionProvider.intrinsics.map((s) => expect.objectContaining({ label: s, insertText: s })),
...defaultTags.map((s) => expect.objectContaining({ label: s, insertText: s })),
]);
const result = await provider.provideCompletionItems(
model as unknown as monacoTypes.editor.ITextModel,
{} as monacoTypes.Position
);
expect((result! as monacoTypes.languages.CompletionList).suggestions).toEqual(
defaultTags.map((s) => expect.objectContaining({ label: s, insertText: s }))
);
});
it('suggests logical operators and close bracket after the value', async () => {
public/app/plugins/datasource/tempo/traceql/autocomplete.ts
+13 -1
View File
@@ -120,10 +120,13 @@ export class CompletionProvider implements monacoTypes.languages.CompletionItemP
}
case 'SPANSET_EMPTY':
return this.getScopesCompletions().concat(this.getIntrinsicsCompletions()).concat(this.getTagsCompletions('.'));
case 'SPANSET_ONLY_DOT': {
return this.getTagsCompletions();
}
case 'SPANSET_IN_NAME':
return this.getScopesCompletions().concat(this.getIntrinsicsCompletions()).concat(this.getTagsCompletions());
case 'SPANSET_IN_NAME_SCOPE':
return this.getIntrinsicsCompletions().concat(this.getTagsCompletions());
return this.getTagsCompletions();
case 'SPANSET_AFTER_NAME':
return CompletionProvider.operators.map((key) => ({
label: key,
@@ -223,6 +226,12 @@ export class CompletionProvider implements monacoTypes.languages.CompletionItemP
};
}
if (nameFull === '.') {
return {
type: 'SPANSET_ONLY_DOT',
};
}
const nameMatched = nameFull.match(/^(?<pre_dot>\.)?(?<word>\w[\w./-]*\w)(?<post_dot>\.)?$/);
// We already have a (potentially partial) tag name so let's check if there's an operator declared
@@ -344,6 +353,9 @@ export type Situation =
| {
type: 'SPANSET_EMPTY';
}
| {
type: 'SPANSET_ONLY_DOT';
}
| {
type: 'SPANSET_AFTER_NAME';
}