From ed01ee79ce7f52f789ab867f3ceacabf9dbd0432 Mon Sep 17 00:00:00 2001 From: ecmel Date: Fri, 19 Dec 2025 11:34:29 +0300 Subject: [PATCH] update telemetry --- CHANGELOG.md | 4 +- ref_card.md | 231 +++++++++++------------ server/src/qLangServer.ts | 5 - src/commands/serverCommand.ts | 2 +- src/commands/workspaceCommand.ts | 24 +-- src/services/dataSourceEditorProvider.ts | 9 +- src/services/notebookController.ts | 14 +- src/services/resultsPanelProvider.ts | 8 + src/utils/connLabel.ts | 11 -- src/utils/queryUtils.ts | 30 +-- test/suite/utils/queryUtils.test.ts | 72 +++---- 11 files changed, 200 insertions(+), 210 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d349ec4c..1f1a4c01 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ All notable changes to the **kdb VS Code extension** are documented in this file - SQL Workbook - Connect and auto execute query functionality - Use own grid instead of ag-grid-community for kdb Results View +- Nested objects are better supported in kdb Results View - Add support for KDB-X modules in language server - Moved documentation to its own site @@ -26,7 +27,8 @@ All notable changes to the **kdb VS Code extension** are documented in this file - Updated telemetry data sent - Use structured text for datasources - Integrate KDB-X KX_TTY feature in REPL -- Update query wrappers and added q CI testing +- Added q CI testing +- Updated query wrappers # v1.16.1 diff --git a/ref_card.md b/ref_card.md index 6cc2af05..8e6d6c2b 100644 --- a/ref_card.md +++ b/ref_card.md @@ -74,119 +74,118 @@ ## Telemetry -| Telemetry | Measurements | Source | -| :----------------------------- | :----------: | :--------------------------------------- | -| Extension.Activated | | src/extension.ts | -| Extension.CustomAuth.Activated | | src/extension.ts | -| ¦ | | | -| Welcome.Displayed | | src/commands/setupCommand.ts | -| Install.kdbx | | src/commands/setupCommand.ts | -| Install.kdbx.workspace | | src/commands/setupCommand.ts | -| Install.kdbx.win32.fail | | src/commands/setupCommand.ts | -| Repl.Start | | src/commands/workspaceCommand.ts | -| ¦ | | | -| Connection.Create.kdb | | src/commands/serverCommand.ts | -| Connection.Edit.kdb | | src/commands/serverCommand.ts | -| Connection.Delete.kdb | | src/services/connectionManagerService.ts | -| Connection.Create.ie | | src/commands/serverCommand.ts | -| Connection.Edit.ie | | src/commands/serverCommand.ts | -| Connection.Delete.ie | | src/services/connectionManagerService.ts | -| Connection.Export.All | | src/extension.ts | -| Connection.Export.Single | | src/extension.ts | -| Connection.Import | | src/extension.ts | -| Connection.Reset.ie.sp | | src/classes/insightsConnection.ts | -| Connection.Label.Create | ✓ | src/utils/connLabel.ts | -| Connection.Label.Assign | ✓ | src/utils/connLabel.ts | -| Connection.Label.Unassign | ✓ | src/utils/connLabel.ts | -| Connection.Label.Delete | ✓ | src/utils/connLabel.ts | -| ¦ | | | -| Run.Workbook.repl.q | | src/utils/queryUtils.ts | -| Run.Workbook.repl.py | | src/utils/queryUtils.ts | -| Run.Workbook.repl.sql | | src/utils/queryUtils.ts | -| Run.File.repl.q | | src/utils/queryUtils.ts | -| Run.File.repl.py | | src/utils/queryUtils.ts | -| Run.File.repl.sql | | src/utils/queryUtils.ts | -| Run.Cell.repl.q | | src/utils/queryUtils.ts | -| Run.Cell.repl.py | | src/utils/queryUtils.ts | -| Run.Cell.repl.sql | | src/utils/queryUtils.ts | -| ¦ | | | -| Run.Workbook.kdb.q | | src/utils/queryUtils.ts | -| Run.Workbook.kdb.py | | src/utils/queryUtils.ts | -| Run.Workbook.kdb.sql | | src/utils/queryUtils.ts | -| Run.File.kdb.q | | src/utils/queryUtils.ts | -| Run.File.kdb.py | | src/utils/queryUtils.ts | -| Run.File.kdb.sql | | src/utils/queryUtils.ts | -| Run.Cell.kdb.q | | src/utils/queryUtils.ts | -| Run.Cell.kdb.py | | src/utils/queryUtils.ts | -| Run.Cell.kdb.sql | | src/utils/queryUtils.ts | -| ¦ | | | -| Run.Workbook.ie.q | | src/utils/queryUtils.ts | -| Run.Workbook.ie.py | | src/utils/queryUtils.ts | -| Run.Workbook.ie.sql | | src/utils/queryUtils.ts | -| Run.File.ie.q | | src/utils/queryUtils.ts | -| Run.File.ie.py | | src/utils/queryUtils.ts | -| Run.File.ie.sql | | src/utils/queryUtils.ts | -| Run.Cell.ie.q | | src/utils/queryUtils.ts | -| Run.Cell.ie.py | | src/utils/queryUtils.ts | -| Run.Cell.ie.sql | | src/utils/queryUtils.ts | -| ¦ | | | -| Run.Workbook.ie.dap.q | | src/utils/queryUtils.ts | -| Run.Workbook.ie.dap.py | | src/utils/queryUtils.ts | -| Run.File.ie.dap.q | | src/utils/queryUtils.ts | -| Run.File.ie.dap.py | | src/utils/queryUtils.ts | -| Run.Cell.ie.dap.q | | src/utils/queryUtils.ts | -| Run.Cell.ie.dap.py | | src/utils/queryUtils.ts | -| ¦ | | | -| Run.Workbook.kdb.quick.q | | | -| Run.Workbook.kdb.quick.py | | | -| Run.Workbook.kdb.quick.sql | | | -| Run.File.kdb.quick.q | | | -| Run.File.kdb.quick.py | | | -| Run.File.kdb.quick.sql | | | -| Run.Cell.kdb.quick.q | | | -| Run.Cell.kdb.quick.py | | | -| Run.Cell.kdb.quick.sql | | | -| ¦ | | | -| Run.Datasource.api | | src/utils/queryUtils.ts | -| Run.Datasource.qsql | | src/utils/queryUtils.ts | -| Run.Datasource.sql | | src/utils/queryUtils.ts | -| Run.Datasource.uda | | src/utils/queryUtils.ts | -| ¦ | | | -| Populate.Datasource.api | | src/utils/queryUtils.ts | -| Populate.Datasource.qsql | | src/utils/queryUtils.ts | -| Populate.Datasource.sql | | src/utils/queryUtils.ts | -| Populate.Datasource.uda | | src/utils/queryUtils.ts | -| ¦ | | | -| Populate.Workbook.q | | src/utils/queryUtils.ts | -| Populate.Workbook.py | | src/utils/queryUtils.ts | -| Populate.Workbook.sql | | src/utils/queryUtils.ts | -| Populate.File.q | | src/utils/queryUtils.ts | -| Populate.File.py | | src/utils/queryUtils.ts | -| Populate.File.sql | | src/utils/queryUtils.ts | -| Populate.Cell.q | | src/utils/queryUtils.ts | -| Populate.Cell.py | | src/utils/queryUtils.ts | -| Populate.Cell.sql | | src/utils/queryUtils.ts | -| ¦ | | | -| Graphics.Displayed.kdb.q | | src/commands/serverCommand.ts | -| Graphics.Displayed.kdb.py | | src/commands/serverCommand.ts | -| Graphics.Displayed.ie.q | | src/commands/serverCommand.ts | -| Graphics.Displayed.ie.py | | src/commands/serverCommand.ts | -| ¦ | | | -| Language.References | | server/src/qLangServer.ts | -| Language.Definition | | server/src/qLangServer.ts | -| Language.Completion | | server/src/qLangServer.ts | -| Language.RenameRequest | | server/src/qLangServer.ts | -| Language.ParameterCache | | server/src/qLangServer.ts | -| Language.FoldingRanges | | server/src/qLangServer.ts | -| Language.CallHierarchy | | server/src/qLangServer.ts | -| ¦ | | | -| Debugger.Run | | | -| Debugger.Resume | | | -| Debugger.StepOver | | | -| Debugger.SetBreakPoint | | | -| ¦ | | | -| Help.Open.Documentation | | src/extension.ts | -| Help.Open.ReportBug | | src/extension.ts | -| Help.Open.SuggestFeature | | src/extension.ts | -| Help.Open.Survey | | src/extension.ts | -| Help.Hide.Survey | | src/utils/feedbackSurveyUtils.ts | +| Telemetry | Measurements | Source | +| :-------------------------------- | :----------: | :--------------------------------------- | +| Extension.Activated | | src/extension.ts | +| Extension.CustomAuth.Activated | | src/extension.ts | +| ¦ | | | +| Welcome.Displayed | | src/commands/setupCommand.ts | +| Install.kdbx | | src/commands/setupCommand.ts | +| Install.kdbx.workspace | | src/commands/setupCommand.ts | +| Install.kdbx.win32.fail | | src/commands/setupCommand.ts | +| Repl.Start | | src/commands/workspaceCommand.ts | +| ¦ | | | +| Connection.Create.kdb | | src/commands/serverCommand.ts | +| Connection.Edit.kdb | | src/commands/serverCommand.ts | +| Connection.Delete.kdb | | src/services/connectionManagerService.ts | +| Connection.Create.ie | | src/commands/serverCommand.ts | +| Connection.Edit.ie | | src/commands/serverCommand.ts | +| Connection.Delete.ie | | src/services/connectionManagerService.ts | +| Connection.Export.All | | src/extension.ts | +| Connection.Export.Single | | src/extension.ts | +| Connection.Import | | src/extension.ts | +| Connection.Reset.ie.sp | | src/classes/insightsConnection.ts | +| Connection.Label.Create | ✓ | src/utils/connLabel.ts | +| Connection.Label.Delete | ✓ | src/utils/connLabel.ts | +| ¦ | | | +| Run.Workbook.repl.q | | src/utils/queryUtils.ts | +| Run.Workbook.repl.py | | src/utils/queryUtils.ts | +| Run.Workbook.repl.sql | | src/utils/queryUtils.ts | +| Run.File.repl.q | | src/utils/queryUtils.ts | +| Run.File.repl.py | | src/utils/queryUtils.ts | +| Run.File.repl.sql | | src/utils/queryUtils.ts | +| Run.Cell.repl.q | | src/utils/queryUtils.ts | +| Run.Cell.repl.py | | src/utils/queryUtils.ts | +| Run.Cell.repl.sql | | src/utils/queryUtils.ts | +| ¦ | | | +| Run.Workbook.kdb.q | | src/utils/queryUtils.ts | +| Run.Workbook.kdb.py | | src/utils/queryUtils.ts | +| Run.Workbook.kdb.sql | | src/utils/queryUtils.ts | +| Run.File.kdb.q | | src/utils/queryUtils.ts | +| Run.File.kdb.py | | src/utils/queryUtils.ts | +| Run.File.kdb.sql | | src/utils/queryUtils.ts | +| Run.Cell.kdb.q | | src/utils/queryUtils.ts | +| Run.Cell.kdb.py | | src/utils/queryUtils.ts | +| Run.Cell.kdb.sql | | src/utils/queryUtils.ts | +| ¦ | | | +| Run.Workbook.ie.q | | src/utils/queryUtils.ts | +| Run.Workbook.ie.py | | src/utils/queryUtils.ts | +| Run.Workbook.ie.sql | | src/utils/queryUtils.ts | +| Run.File.ie.q | | src/utils/queryUtils.ts | +| Run.File.ie.py | | src/utils/queryUtils.ts | +| Run.File.ie.sql | | src/utils/queryUtils.ts | +| Run.Cell.ie.q | | src/utils/queryUtils.ts | +| Run.Cell.ie.py | | src/utils/queryUtils.ts | +| Run.Cell.ie.sql | | src/utils/queryUtils.ts | +| ¦ | | | +| Run.Workbook.ie.dap.q | | src/utils/queryUtils.ts | +| Run.Workbook.ie.dap.py | | src/utils/queryUtils.ts | +| Run.File.ie.dap.q | | src/utils/queryUtils.ts | +| Run.File.ie.dap.py | | src/utils/queryUtils.ts | +| Run.Cell.ie.dap.q | | src/utils/queryUtils.ts | +| Run.Cell.ie.dap.py | | src/utils/queryUtils.ts | +| ¦ | | | +| Run.Workbook.kdb.quick.q | | | +| Run.Workbook.kdb.quick.py | | | +| Run.Workbook.kdb.quick.sql | | | +| Run.File.kdb.quick.q | | | +| Run.File.kdb.quick.py | | | +| Run.File.kdb.quick.sql | | | +| Run.Cell.kdb.quick.q | | | +| Run.Cell.kdb.quick.py | | | +| Run.Cell.kdb.quick.sql | | | +| ¦ | | | +| Run.Datasource.api | | src/utils/queryUtils.ts | +| Run.Datasource.qsql | | src/utils/queryUtils.ts | +| Run.Datasource.sql | | src/utils/queryUtils.ts | +| Run.Datasource.uda | | src/utils/queryUtils.ts | +| ¦ | | | +| Populate.Datasource.api | | src/utils/queryUtils.ts | +| Populate.Datasource.qsql | | src/utils/queryUtils.ts | +| Populate.Datasource.sql | | src/utils/queryUtils.ts | +| Populate.Datasource.uda | | src/utils/queryUtils.ts | +| ¦ | | | +| Populate.Workbook.q | | src/utils/queryUtils.ts | +| Populate.Workbook.py | | src/utils/queryUtils.ts | +| Populate.Workbook.sql | | src/utils/queryUtils.ts | +| Populate.File.q | | src/utils/queryUtils.ts | +| Populate.File.py | | src/utils/queryUtils.ts | +| Populate.File.sql | | src/utils/queryUtils.ts | +| Populate.Cell.q | | src/utils/queryUtils.ts | +| Populate.Cell.py | | src/utils/queryUtils.ts | +| Populate.Cell.sql | | src/utils/queryUtils.ts | +| ¦ | | | +| Results.Table.Displayed | | src/services/resultsPanelProvider.ts | +| Results.Export.csv | | src/services/resultsPanelProvider.ts | +| Results.Graphics.Displayed.kdb.q | | src/commands/serverCommand.ts | +| Results.Graphics.Displayed.kdb.py | | src/commands/serverCommand.ts | +| Results.Graphics.Displayed.ie.q | | src/commands/serverCommand.ts | +| Results.Graphics.Displayed.ie.py | | src/commands/serverCommand.ts | +| ¦ | | | +| Language.References | | server/src/qLangServer.ts | +| Language.Definition | | server/src/qLangServer.ts | +| Language.Completion | | server/src/qLangServer.ts | +| Language.RenameRequest | | server/src/qLangServer.ts | +| Language.ParameterCache | | server/src/qLangServer.ts | +| Language.CallHierarchy | | server/src/qLangServer.ts | +| ¦ | | | +| Debugger.Run | | | +| Debugger.Resume | | | +| Debugger.StepOver | | | +| Debugger.SetBreakPoint | | | +| ¦ | | | +| Help.Open.Documentation | | src/extension.ts | +| Help.Open.ReportBug | | src/extension.ts | +| Help.Open.SuggestFeature | | src/extension.ts | +| Help.Open.Survey | | src/extension.ts | +| Help.Hide.Survey | | src/utils/feedbackSurveyUtils.ts | diff --git a/server/src/qLangServer.ts b/server/src/qLangServer.ts index 3585e272..adf8afe7 100644 --- a/server/src/qLangServer.ts +++ b/server/src/qLangServer.ts @@ -451,11 +451,6 @@ export default class QLangServer { public async onFoldingRanges({ textDocument: { uri }, }: FoldingRangeParams): Promise { - this.notify("onFoldingRanges", MessageKind.DEBUG, { - logger, - telemetry: "Language.FoldingRanges", - }); - const source = await this.getSource(uri); const ranges: FoldingRange[] = []; diff --git a/src/commands/serverCommand.ts b/src/commands/serverCommand.ts index 14ab50ef..df0e1d50 100644 --- a/src/commands/serverCommand.ts +++ b/src/commands/serverCommand.ts @@ -966,7 +966,7 @@ export async function executeQuery( notify("GG Plot displayed", MessageKind.DEBUG, { logger, telemetry: - "Graphics.Displayed" + + "Results.Graphics.Displayed" + (isInsights ? ".ie" : ".kdb") + (isPython ? ".py" : ".q"), }); diff --git a/src/commands/workspaceCommand.ts b/src/commands/workspaceCommand.ts index 433b2b80..2d0b70d1 100644 --- a/src/commands/workspaceCommand.ts +++ b/src/commands/workspaceCommand.ts @@ -47,7 +47,7 @@ import { Runner, } from "../utils/notifications"; import { - ExecFlags, + RunFlag, getPythonWrapper, getSQLWrapper, notifyExecution, @@ -543,11 +543,11 @@ export async function runActiveEditor(type?: ExecutionTypes) { if (server === undefined) { await runOnRepl(ext.activeTextEditor, type); notifyExecution( - ExecFlags.Run | - ExecFlags.Repl | - (isWorkbook(uri) ? ExecFlags.Workbook : 0) | - (isPython(uri) ? ExecFlags.Python : 0) | - (isSql(uri) ? ExecFlags.Sql : 0), + RunFlag.Run | + RunFlag.Repl | + (isWorkbook(uri) ? RunFlag.Workbook : 0) | + (isPython(uri) ? RunFlag.Python : 0) | + (isSql(uri) ? RunFlag.Sql : 0), ); return; } @@ -585,12 +585,12 @@ export async function runActiveEditor(type?: ExecutionTypes) { isInsights, ); notifyExecution( - (type === ExecutionTypes.PopulateScratchpad ? 0 : ExecFlags.Run) | - (isInsights ? ExecFlags.Insights : 0) | - (target ? ExecFlags.Dap : 0) | - (isWorkbook(uri) ? ExecFlags.Workbook : 0) | - (isPython(uri) ? ExecFlags.Python : 0) | - (isSql(uri) ? ExecFlags.Sql : 0), + (type === ExecutionTypes.PopulateScratchpad ? 0 : RunFlag.Run) | + (isInsights ? RunFlag.Insights : 0) | + (target ? RunFlag.Dap : 0) | + (isWorkbook(uri) ? RunFlag.Workbook : 0) | + (isPython(uri) ? RunFlag.Python : 0) | + (isSql(uri) ? RunFlag.Sql : 0), ); } catch (error) { notify( diff --git a/src/services/dataSourceEditorProvider.ts b/src/services/dataSourceEditorProvider.ts index c51f1377..d59a4bc5 100644 --- a/src/services/dataSourceEditorProvider.ts +++ b/src/services/dataSourceEditorProvider.ts @@ -46,7 +46,7 @@ import { UDA } from "../models/uda"; import { getBasename, offerConnectAction } from "../utils/core"; import { getNonce } from "../utils/getNonce"; import { MessageKind, Runner, notify } from "../utils/notifications"; -import { ExecFlags, notifyExecution } from "../utils/queryUtils"; +import { RunFlag, notifyExecution } from "../utils/queryUtils"; import { parseUDAList } from "../utils/uda"; import { getUri } from "../utils/uriUtils"; @@ -223,7 +223,7 @@ export class DataSourceEditorProvider implements CustomTextEditorProvider { else if (await offerConnectAction(selectedServer)) await runner.execute(); notifyExecution( - ExecFlags.Run | ExecFlags.Insights, + RunFlag.Run, msg.dataSourceFile.dataSource.selectedType, ); break; @@ -236,10 +236,7 @@ export class DataSourceEditorProvider implements CustomTextEditorProvider { if (connected) await runner.execute(); else if (await offerConnectAction(selectedServer)) await runner.execute(); - notifyExecution( - ExecFlags.Insights, - msg.dataSourceFile.dataSource.selectedType, - ); + notifyExecution(0, msg.dataSourceFile.dataSource.selectedType); break; } } diff --git a/src/services/notebookController.ts b/src/services/notebookController.ts index ff867962..457d0174 100644 --- a/src/services/notebookController.ts +++ b/src/services/notebookController.ts @@ -38,7 +38,7 @@ import { getPythonWrapper, getSQLWrapper, notifyExecution, - ExecFlags, + RunFlag, } from "../utils/queryUtils"; import { convertToGrid, formatResult } from "../utils/resultsRenderer"; @@ -173,12 +173,12 @@ export class KxNotebookController { ]); notifyExecution( - ExecFlags.Notebook | - (variable ? 0 : ExecFlags.Run) | - (isInsights ? ExecFlags.Insights : 0) | - (target ? ExecFlags.Dap : 0) | - (kind === CellKind.PYTHON ? ExecFlags.Python : 0) | - (kind === CellKind.SQL ? ExecFlags.Sql : 0), + RunFlag.Notebook | + (variable ? 0 : RunFlag.Run) | + (isInsights ? RunFlag.Insights : 0) | + (target ? RunFlag.Dap : 0) | + (kind === CellKind.PYTHON ? RunFlag.Python : 0) | + (kind === CellKind.SQL ? RunFlag.Sql : 0), ); if (variable) { diff --git a/src/services/resultsPanelProvider.ts b/src/services/resultsPanelProvider.ts index a65968cd..a0d94d95 100644 --- a/src/services/resultsPanelProvider.ts +++ b/src/services/resultsPanelProvider.ts @@ -118,6 +118,10 @@ export class KdbResultsViewProvider implements WebviewViewProvider { } const workspaceUri = workspaceFolders[0].uri; utils.exportToCsv(workspaceUri); + notify("CSV exported.", MessageKind.DEBUG, { + logger, + telemetry: "Results.Export.csv", + }); } isVisible(): boolean { @@ -176,6 +180,10 @@ export class KdbResultsViewProvider implements WebviewViewProvider { theme: "legacy", themeColor: this.defineAgGridTheme(), }); + notify("Table displayed.", MessageKind.DEBUG, { + logger, + telemetry: "Results.Table.Displayed", + }); } else { this._view.webview.postMessage({ command: "setResultsContent", diff --git a/src/utils/connLabel.ts b/src/utils/connLabel.ts index b05ae969..bd670711 100644 --- a/src/utils/connLabel.ts +++ b/src/utils/connLabel.ts @@ -146,11 +146,6 @@ export function addConnToLabel(labelName: string, connName: string) { connections: [connName], }); } - notify("Connection assigned to label.", MessageKind.DEBUG, { - logger, - telemetry: "Connection.Label.Assign", - measurements: getConnectionLabelStatistics(connName), - }); } } @@ -165,12 +160,6 @@ export function removeConnFromLabels(connName: string) { workspace .getConfiguration() .update("kdb.labelsConnectionMap", ext.labelConnMapList, true); - - notify("Connection removed from label.", MessageKind.DEBUG, { - logger, - telemetry: "Connection.Label.Unassign", - measurements: getConnectionLabelStatistics(connName), - }); } export async function handleLabelsConnMap(labels: string[], connName: string) { diff --git a/src/utils/queryUtils.ts b/src/utils/queryUtils.ts index 88d0ab9c..2bf905cf 100644 --- a/src/utils/queryUtils.ts +++ b/src/utils/queryUtils.ts @@ -546,7 +546,7 @@ export function resetScratchpadStarted(connLabel: string) { ext.scratchpadStarted.delete(connLabel); } -export const enum ExecFlags { +export const enum RunFlag { Run = 0b000000001, Workbook = 0b000000010, Notebook = 0b000000100, @@ -560,22 +560,22 @@ export const enum ExecFlags { export function notifyExecution(flags: number, dsType?: string) { const telemetry = - (flags & ExecFlags.Run ? "Run" : "Populate") + + (flags & RunFlag.Run ? "Run" : "Populate") + (dsType ? ".Datasource." + dsType.toLowerCase() - : flags & ExecFlags.Workbook - ? ".Workbook" - : flags & ExecFlags.Notebook - ? ".Cell" - : ".File") + - (flags & ExecFlags.Repl - ? ".repl" - : flags & ExecFlags.Insights - ? ".ie" - : ".kdb") + - (flags & ExecFlags.Quick ? ".quick" : "") + - (flags & ExecFlags.Dap ? ".dap" : "") + - (flags & ExecFlags.Python ? ".py" : flags & ExecFlags.Sql ? ".sql" : ".q"); + : (flags & RunFlag.Workbook + ? ".Workbook" + : flags & RunFlag.Notebook + ? ".Cell" + : ".File") + + (flags & RunFlag.Repl + ? ".repl" + : flags & RunFlag.Insights + ? ".ie" + : ".kdb") + + (flags & RunFlag.Quick ? ".quick" : "") + + (flags & RunFlag.Dap ? ".dap" : "") + + (flags & RunFlag.Python ? ".py" : flags & RunFlag.Sql ? ".sql" : ".q")); notify(`Query ${telemetry} executed.`, MessageKind.DEBUG, { logger, diff --git a/test/suite/utils/queryUtils.test.ts b/test/suite/utils/queryUtils.test.ts index c9fd9da5..f27b3a2e 100644 --- a/test/suite/utils/queryUtils.test.ts +++ b/test/suite/utils/queryUtils.test.ts @@ -649,23 +649,23 @@ describe("queryUtils", () => { describe("File", () => { it("should return telemetry for q", () => { const res = queryUtils.notifyExecution( - queryUtils.ExecFlags.Run | queryUtils.ExecFlags.Repl, + queryUtils.RunFlag.Run | queryUtils.RunFlag.Repl, ); assert.strictEqual(res, "Run.File.repl.q"); }); it("should return telemetry for Python", () => { const res = queryUtils.notifyExecution( - queryUtils.ExecFlags.Run | - queryUtils.ExecFlags.Repl | - queryUtils.ExecFlags.Python, + queryUtils.RunFlag.Run | + queryUtils.RunFlag.Repl | + queryUtils.RunFlag.Python, ); assert.strictEqual(res, "Run.File.repl.py"); }); it("should return telemetry for SQL", () => { const res = queryUtils.notifyExecution( - queryUtils.ExecFlags.Run | - queryUtils.ExecFlags.Repl | - queryUtils.ExecFlags.Sql, + queryUtils.RunFlag.Run | + queryUtils.RunFlag.Repl | + queryUtils.RunFlag.Sql, ); assert.strictEqual(res, "Run.File.repl.sql"); }); @@ -673,27 +673,27 @@ describe("queryUtils", () => { describe("Workbook", () => { it("should return telemetry for q", () => { const res = queryUtils.notifyExecution( - queryUtils.ExecFlags.Run | - queryUtils.ExecFlags.Workbook | - queryUtils.ExecFlags.Repl, + queryUtils.RunFlag.Run | + queryUtils.RunFlag.Workbook | + queryUtils.RunFlag.Repl, ); assert.strictEqual(res, "Run.Workbook.repl.q"); }); it("should return telemetry for Python", () => { const res = queryUtils.notifyExecution( - queryUtils.ExecFlags.Run | - queryUtils.ExecFlags.Workbook | - queryUtils.ExecFlags.Repl | - queryUtils.ExecFlags.Python, + queryUtils.RunFlag.Run | + queryUtils.RunFlag.Workbook | + queryUtils.RunFlag.Repl | + queryUtils.RunFlag.Python, ); assert.strictEqual(res, "Run.Workbook.repl.py"); }); it("should return telemetry for SQL", () => { const res = queryUtils.notifyExecution( - queryUtils.ExecFlags.Run | - queryUtils.ExecFlags.Workbook | - queryUtils.ExecFlags.Repl | - queryUtils.ExecFlags.Sql, + queryUtils.RunFlag.Run | + queryUtils.RunFlag.Workbook | + queryUtils.RunFlag.Repl | + queryUtils.RunFlag.Sql, ); assert.strictEqual(res, "Run.Workbook.repl.sql"); }); @@ -703,23 +703,23 @@ describe("queryUtils", () => { describe("Workbook", () => { it("should return telemetry for q", () => { const res = queryUtils.notifyExecution( - queryUtils.ExecFlags.Run | queryUtils.ExecFlags.Workbook, + queryUtils.RunFlag.Run | queryUtils.RunFlag.Workbook, ); assert.strictEqual(res, "Run.Workbook.kdb.q"); }); it("should return telemetry for Python", () => { const res = queryUtils.notifyExecution( - queryUtils.ExecFlags.Run | - queryUtils.ExecFlags.Workbook | - queryUtils.ExecFlags.Python, + queryUtils.RunFlag.Run | + queryUtils.RunFlag.Workbook | + queryUtils.RunFlag.Python, ); assert.strictEqual(res, "Run.Workbook.kdb.py"); }); it("should return telemetry for SQL", () => { const res = queryUtils.notifyExecution( - queryUtils.ExecFlags.Run | - queryUtils.ExecFlags.Workbook | - queryUtils.ExecFlags.Sql, + queryUtils.RunFlag.Run | + queryUtils.RunFlag.Workbook | + queryUtils.RunFlag.Sql, ); assert.strictEqual(res, "Run.Workbook.kdb.sql"); }); @@ -729,27 +729,27 @@ describe("queryUtils", () => { describe("Workbook", () => { it("should return telemetry for q", () => { const res = queryUtils.notifyExecution( - queryUtils.ExecFlags.Run | - queryUtils.ExecFlags.Workbook | - queryUtils.ExecFlags.Insights, + queryUtils.RunFlag.Run | + queryUtils.RunFlag.Workbook | + queryUtils.RunFlag.Insights, ); assert.strictEqual(res, "Run.Workbook.ie.q"); }); it("should return telemetry for Python", () => { const res = queryUtils.notifyExecution( - queryUtils.ExecFlags.Run | - queryUtils.ExecFlags.Workbook | - queryUtils.ExecFlags.Insights | - queryUtils.ExecFlags.Python, + queryUtils.RunFlag.Run | + queryUtils.RunFlag.Workbook | + queryUtils.RunFlag.Insights | + queryUtils.RunFlag.Python, ); assert.strictEqual(res, "Run.Workbook.ie.py"); }); it("should return telemetry for SQL", () => { const res = queryUtils.notifyExecution( - queryUtils.ExecFlags.Run | - queryUtils.ExecFlags.Workbook | - queryUtils.ExecFlags.Insights | - queryUtils.ExecFlags.Sql, + queryUtils.RunFlag.Run | + queryUtils.RunFlag.Workbook | + queryUtils.RunFlag.Insights | + queryUtils.RunFlag.Sql, ); assert.strictEqual(res, "Run.Workbook.ie.sql"); });