diff --git a/extensions/admin-tool-ext-win/package.json b/extensions/admin-tool-ext-win/package.json index 7fc2cef551..719e33a019 100644 --- a/extensions/admin-tool-ext-win/package.json +++ b/extensions/admin-tool-ext-win/package.json @@ -107,7 +107,7 @@ ] }, "dependencies": { - "@microsoft/ads-extension-telemetry": "^1.3.4", + "@microsoft/ads-extension-telemetry": "^1.4.0", "@microsoft/ads-service-downloader": "^1.1.0", "vscode-nls": "^4.1.2" }, diff --git a/extensions/admin-tool-ext-win/src/main.ts b/extensions/admin-tool-ext-win/src/main.ts index 9d616cf90e..07f4a4ec52 100644 --- a/extensions/admin-tool-ext-win/src/main.ts +++ b/extensions/admin-tool-ext-win/src/main.ts @@ -52,7 +52,7 @@ function registerCommands(context: vscode.ExtensionContext): void { */ async function handleLaunchSsmsMinPropertiesDialogCommand(connectionContext?: azdata.ObjectExplorerContext): Promise { if (!connectionContext) { - TelemetryReporter.sendErrorEvent(TelemetryViews.SsmsMinProperties, 'NoConnectionContext'); + TelemetryReporter.sendErrorEvent2(TelemetryViews.SsmsMinProperties, 'NoConnectionContext'); void vscode.window.showErrorMessage(localize('adminToolExtWin.noConnectionContextForProp', "No ConnectionContext provided for handleLaunchSsmsMinPropertiesDialogCommand")); return; } @@ -64,7 +64,7 @@ async function handleLaunchSsmsMinPropertiesDialogCommand(connectionContext?: az else if (connectionContext.nodeInfo) { nodeType = connectionContext.nodeInfo.nodeType; } else { - TelemetryReporter.sendErrorEvent(TelemetryViews.SsmsMinProperties, 'NoOENode'); + TelemetryReporter.sendErrorEvent2(TelemetryViews.SsmsMinProperties, 'NoOENode'); void vscode.window.showErrorMessage(localize('adminToolExtWin.noOENode', "Could not determine Object Explorer node from connectionContext : {0}", JSON.stringify(connectionContext))); return; } @@ -81,7 +81,7 @@ async function handleLaunchSsmsMinPropertiesDialogCommand(connectionContext?: az async function handleLaunchSsmsMinGswDialogCommand(connectionContext?: azdata.ObjectExplorerContext): Promise { const action = 'GenerateScripts'; if (!connectionContext) { - TelemetryReporter.sendErrorEvent(TelemetryViews.SsmsMinGsw, 'NoConnectionContext'); + TelemetryReporter.sendErrorEvent2(TelemetryViews.SsmsMinGsw, 'NoConnectionContext'); void vscode.window.showErrorMessage(localize('adminToolExtWin.noConnectionContextForGsw', "No ConnectionContext provided for handleLaunchSsmsMinPropertiesDialogCommand")); return; } @@ -98,7 +98,7 @@ async function handleLaunchSsmsMinGswDialogCommand(connectionContext?: azdata.Ob */ async function launchSsmsDialog(action: string, connectionContext: azdata.ObjectExplorerContext): Promise { if (!connectionContext.connectionProfile) { - TelemetryReporter.sendErrorEvent(TelemetryViews.SsmsMinDialog, 'NoConnectionProfile'); + TelemetryReporter.sendErrorEvent2(TelemetryViews.SsmsMinDialog, 'NoConnectionProfile'); void vscode.window.showErrorMessage(localize('adminToolExtWin.noConnectionProfile', "No connectionProfile provided from connectionContext : {0}", JSON.stringify(connectionContext))); return; } @@ -112,7 +112,7 @@ async function launchSsmsDialog(action: string, connectionContext: azdata.Object oeNode = await azdata.objectexplorer.getNode(connectionContext.connectionProfile.id, connectionContext.nodeInfo.nodePath); } else { - TelemetryReporter.sendErrorEvent(TelemetryViews.SsmsMinDialog, 'NoOENode'); + TelemetryReporter.sendErrorEvent2(TelemetryViews.SsmsMinDialog, 'NoOENode'); void vscode.window.showErrorMessage(localize('adminToolExtWin.noOENode', "Could not determine Object Explorer node from connectionContext : {0}", JSON.stringify(connectionContext))); return; } @@ -156,9 +156,10 @@ async function launchSsmsDialog(action: string, connectionContext: azdata.Object runningProcesses.delete(proc.pid); const err = stderr.toString(); if ((execException?.code !== 0) || err !== '') { - TelemetryReporter.sendErrorEvent( + TelemetryReporter.sendErrorEvent2( TelemetryViews.SsmsMinDialog, 'LaunchSsmsDialogError', + execException, execException ? execException?.code?.toString() : '', getTelemetryErrorType(err)); } diff --git a/extensions/admin-tool-ext-win/yarn.lock b/extensions/admin-tool-ext-win/yarn.lock index 9aecc917db..41b8913b46 100644 --- a/extensions/admin-tool-ext-win/yarn.lock +++ b/extensions/admin-tool-ext-win/yarn.lock @@ -182,10 +182,10 @@ resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd" integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw== -"@microsoft/ads-extension-telemetry@^1.3.4": - version "1.3.4" - resolved "https://registry.yarnpkg.com/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.3.4.tgz#25d34cff39171a79663816faa6ba889e07dfb5ab" - integrity sha512-XTkMUA4BsTVNETjrKE4M3xaXlmk7m93Xy/eQHxHhzf8POjtPTvlw+8i96W8lTiRPnN81yAVE7YOB3GExsur6RA== +"@microsoft/ads-extension-telemetry@^1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.4.0.tgz#73b156f399c810b58949e83021da9071335a29a0" + integrity sha512-uiPD12Jeu3/CGPCQctyZKE+2FLwn+/iXLoLn80EoJ0MTnonHo1AREvbtR1y6JpOjh8hJXBdh6LjCxs15giIESg== dependencies: "@vscode/extension-telemetry" "0.6.1" diff --git a/extensions/azuremonitor/package.json b/extensions/azuremonitor/package.json index 21d308f7aa..b994f3fbc4 100644 --- a/extensions/azuremonitor/package.json +++ b/extensions/azuremonitor/package.json @@ -213,7 +213,7 @@ "figures": "^2.0.0", "find-remove": "1.2.1", "@microsoft/ads-service-downloader": "^1.1.0", - "@microsoft/ads-extension-telemetry": "^1.3.4", + "@microsoft/ads-extension-telemetry": "^1.4.0", "vscode-languageclient": "5.2.1", "vscode-nls": "^4.0.0" }, diff --git a/extensions/azuremonitor/yarn.lock b/extensions/azuremonitor/yarn.lock index 312ee0e5e4..67302f230f 100644 --- a/extensions/azuremonitor/yarn.lock +++ b/extensions/azuremonitor/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"@microsoft/ads-extension-telemetry@^1.3.4": - version "1.3.4" - resolved "https://registry.yarnpkg.com/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.3.4.tgz#25d34cff39171a79663816faa6ba889e07dfb5ab" - integrity sha512-XTkMUA4BsTVNETjrKE4M3xaXlmk7m93Xy/eQHxHhzf8POjtPTvlw+8i96W8lTiRPnN81yAVE7YOB3GExsur6RA== +"@microsoft/ads-extension-telemetry@^1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.4.0.tgz#73b156f399c810b58949e83021da9071335a29a0" + integrity sha512-uiPD12Jeu3/CGPCQctyZKE+2FLwn+/iXLoLn80EoJ0MTnonHo1AREvbtR1y6JpOjh8hJXBdh6LjCxs15giIESg== dependencies: "@vscode/extension-telemetry" "0.6.1" diff --git a/extensions/dacpac/package.json b/extensions/dacpac/package.json index f2c37cb6a3..be9dc622a2 100644 --- a/extensions/dacpac/package.json +++ b/extensions/dacpac/package.json @@ -92,7 +92,7 @@ } }, "dependencies": { - "@microsoft/ads-extension-telemetry": "^1.3.4", + "@microsoft/ads-extension-telemetry": "^1.4.0", "htmlparser2": "^3.10.1", "vscode-nls": "^4.0.0" }, diff --git a/extensions/dacpac/src/wizard/dataTierApplicationWizard.ts b/extensions/dacpac/src/wizard/dataTierApplicationWizard.ts index 3ed5c4f3c4..1cfbd4e596 100644 --- a/extensions/dacpac/src/wizard/dataTierApplicationWizard.ts +++ b/extensions/dacpac/src/wizard/dataTierApplicationWizard.ts @@ -493,7 +493,7 @@ export class DataTierApplicationWizard { .withAdditionalMeasurements(additionalMeasurements) .send(); } else { - TelemetryReporter.createErrorEvent(TelemetryViews.DataTierApplicationWizard, telemetryAction) + TelemetryReporter.createErrorEvent2(TelemetryViews.DataTierApplicationWizard, telemetryAction) .withAdditionalProperties(additionalProps) .withAdditionalMeasurements(additionalMeasurements) .send(); diff --git a/extensions/dacpac/yarn.lock b/extensions/dacpac/yarn.lock index 0e1f116013..dee3f67f5d 100644 --- a/extensions/dacpac/yarn.lock +++ b/extensions/dacpac/yarn.lock @@ -182,10 +182,10 @@ resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd" integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw== -"@microsoft/ads-extension-telemetry@^1.3.4": - version "1.3.4" - resolved "https://registry.yarnpkg.com/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.3.4.tgz#25d34cff39171a79663816faa6ba889e07dfb5ab" - integrity sha512-XTkMUA4BsTVNETjrKE4M3xaXlmk7m93Xy/eQHxHhzf8POjtPTvlw+8i96W8lTiRPnN81yAVE7YOB3GExsur6RA== +"@microsoft/ads-extension-telemetry@^1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.4.0.tgz#73b156f399c810b58949e83021da9071335a29a0" + integrity sha512-uiPD12Jeu3/CGPCQctyZKE+2FLwn+/iXLoLn80EoJ0MTnonHo1AREvbtR1y6JpOjh8hJXBdh6LjCxs15giIESg== dependencies: "@vscode/extension-telemetry" "0.6.1" diff --git a/extensions/data-workspace/package.json b/extensions/data-workspace/package.json index 830f995106..538cf07e71 100644 --- a/extensions/data-workspace/package.json +++ b/extensions/data-workspace/package.json @@ -179,7 +179,7 @@ }, "dependencies": { "fast-glob": "^3.2.7", - "@microsoft/ads-extension-telemetry": "^1.3.4", + "@microsoft/ads-extension-telemetry": "^1.4.0", "vscode-nls": "^4.0.0" }, "devDependencies": { diff --git a/extensions/data-workspace/src/dialogs/newProjectDialog.ts b/extensions/data-workspace/src/dialogs/newProjectDialog.ts index d6c265bdc3..841f57b865 100644 --- a/extensions/data-workspace/src/dialogs/newProjectDialog.ts +++ b/extensions/data-workspace/src/dialogs/newProjectDialog.ts @@ -95,7 +95,7 @@ export class NewProjectDialog extends DialogBase { } catch (err) { - TelemetryReporter.createErrorEvent(TelemetryViews.NewProjectDialog, TelemetryActions.NewProjectDialogCompleted) + TelemetryReporter.createErrorEvent2(TelemetryViews.NewProjectDialog, TelemetryActions.NewProjectDialogCompleted, err) .withAdditionalProperties({ projectFileExtension: this.model.projectFileExtension, projectTemplateId: this.model.projectTypeId, error: err?.message ? err.message : err }) .send(); diff --git a/extensions/data-workspace/yarn.lock b/extensions/data-workspace/yarn.lock index ba0c675493..0158155758 100644 --- a/extensions/data-workspace/yarn.lock +++ b/extensions/data-workspace/yarn.lock @@ -182,10 +182,10 @@ resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd" integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw== -"@microsoft/ads-extension-telemetry@^1.3.4": - version "1.3.4" - resolved "https://registry.yarnpkg.com/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.3.4.tgz#25d34cff39171a79663816faa6ba889e07dfb5ab" - integrity sha512-XTkMUA4BsTVNETjrKE4M3xaXlmk7m93Xy/eQHxHhzf8POjtPTvlw+8i96W8lTiRPnN81yAVE7YOB3GExsur6RA== +"@microsoft/ads-extension-telemetry@^1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.4.0.tgz#73b156f399c810b58949e83021da9071335a29a0" + integrity sha512-uiPD12Jeu3/CGPCQctyZKE+2FLwn+/iXLoLn80EoJ0MTnonHo1AREvbtR1y6JpOjh8hJXBdh6LjCxs15giIESg== dependencies: "@vscode/extension-telemetry" "0.6.1" diff --git a/extensions/datavirtualization/package.json b/extensions/datavirtualization/package.json index baaa8d8f6d..1cf2938e11 100644 --- a/extensions/datavirtualization/package.json +++ b/extensions/datavirtualization/package.json @@ -105,7 +105,7 @@ } }, "dependencies": { - "@microsoft/ads-extension-telemetry": "^1.3.4", + "@microsoft/ads-extension-telemetry": "^1.4.0", "@microsoft/ads-service-downloader": "^1.1.0", "dataprotocol-client": "github:Microsoft/sqlops-dataprotocolclient#1.3.2", "vscode-nls": "^5.2.0" diff --git a/extensions/datavirtualization/yarn.lock b/extensions/datavirtualization/yarn.lock index 91107e1d7e..5b72a3e0cb 100644 --- a/extensions/datavirtualization/yarn.lock +++ b/extensions/datavirtualization/yarn.lock @@ -206,10 +206,10 @@ resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98" integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA== -"@microsoft/ads-extension-telemetry@^1.3.4": - version "1.3.4" - resolved "https://registry.yarnpkg.com/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.3.4.tgz#25d34cff39171a79663816faa6ba889e07dfb5ab" - integrity sha512-XTkMUA4BsTVNETjrKE4M3xaXlmk7m93Xy/eQHxHhzf8POjtPTvlw+8i96W8lTiRPnN81yAVE7YOB3GExsur6RA== +"@microsoft/ads-extension-telemetry@^1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.4.0.tgz#73b156f399c810b58949e83021da9071335a29a0" + integrity sha512-uiPD12Jeu3/CGPCQctyZKE+2FLwn+/iXLoLn80EoJ0MTnonHo1AREvbtR1y6JpOjh8hJXBdh6LjCxs15giIESg== dependencies: "@vscode/extension-telemetry" "0.6.1" diff --git a/extensions/import/package.json b/extensions/import/package.json index e35884c417..388f806bff 100644 --- a/extensions/import/package.json +++ b/extensions/import/package.json @@ -80,7 +80,7 @@ "dataprotocol-client": "github:Microsoft/sqlops-dataprotocolclient#1.3.1", "htmlparser2": "^3.10.1", "@microsoft/ads-service-downloader": "^1.1.0", - "@microsoft/ads-extension-telemetry": "^1.3.4", + "@microsoft/ads-extension-telemetry": "^1.4.0", "vscode-nls": "^4.1.2" }, "devDependencies": { diff --git a/extensions/import/yarn.lock b/extensions/import/yarn.lock index 0b1f66deba..5846affc18 100644 --- a/extensions/import/yarn.lock +++ b/extensions/import/yarn.lock @@ -182,10 +182,10 @@ resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd" integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw== -"@microsoft/ads-extension-telemetry@^1.3.4": - version "1.3.4" - resolved "https://registry.yarnpkg.com/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.3.4.tgz#25d34cff39171a79663816faa6ba889e07dfb5ab" - integrity sha512-XTkMUA4BsTVNETjrKE4M3xaXlmk7m93Xy/eQHxHhzf8POjtPTvlw+8i96W8lTiRPnN81yAVE7YOB3GExsur6RA== +"@microsoft/ads-extension-telemetry@^1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.4.0.tgz#73b156f399c810b58949e83021da9071335a29a0" + integrity sha512-uiPD12Jeu3/CGPCQctyZKE+2FLwn+/iXLoLn80EoJ0MTnonHo1AREvbtR1y6JpOjh8hJXBdh6LjCxs15giIESg== dependencies: "@vscode/extension-telemetry" "0.6.1" diff --git a/extensions/kusto/package.json b/extensions/kusto/package.json index 96ed6390b7..9825f53902 100644 --- a/extensions/kusto/package.json +++ b/extensions/kusto/package.json @@ -431,7 +431,7 @@ "figures": "^2.0.0", "find-remove": "1.2.1", "@microsoft/ads-service-downloader": "^1.1.0", - "@microsoft/ads-extension-telemetry": "^1.3.4", + "@microsoft/ads-extension-telemetry": "^1.4.0", "vscode-languageclient": "5.2.1", "vscode-nls": "^4.0.0" }, diff --git a/extensions/kusto/yarn.lock b/extensions/kusto/yarn.lock index 8543b32770..76e83ffe13 100644 --- a/extensions/kusto/yarn.lock +++ b/extensions/kusto/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"@microsoft/ads-extension-telemetry@^1.3.4": - version "1.3.4" - resolved "https://registry.yarnpkg.com/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.3.4.tgz#25d34cff39171a79663816faa6ba889e07dfb5ab" - integrity sha512-XTkMUA4BsTVNETjrKE4M3xaXlmk7m93Xy/eQHxHhzf8POjtPTvlw+8i96W8lTiRPnN81yAVE7YOB3GExsur6RA== +"@microsoft/ads-extension-telemetry@^1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.4.0.tgz#73b156f399c810b58949e83021da9071335a29a0" + integrity sha512-uiPD12Jeu3/CGPCQctyZKE+2FLwn+/iXLoLn80EoJ0MTnonHo1AREvbtR1y6JpOjh8hJXBdh6LjCxs15giIESg== dependencies: "@vscode/extension-telemetry" "0.6.1" diff --git a/extensions/mssql/package.json b/extensions/mssql/package.json index 28064befaa..9b22c4835d 100644 --- a/extensions/mssql/package.json +++ b/extensions/mssql/package.json @@ -1315,7 +1315,7 @@ } }, "dependencies": { - "@microsoft/ads-extension-telemetry": "^1.3.4", + "@microsoft/ads-extension-telemetry": "^1.4.0", "@microsoft/ads-service-downloader": "^1.1.0", "dataprotocol-client": "github:Microsoft/sqlops-dataprotocolclient#1.3.2", "find-remove": "1.2.1", diff --git a/extensions/mssql/src/objectManagement/commands.ts b/extensions/mssql/src/objectManagement/commands.ts index 1f74b25eb6..3c54f39e88 100644 --- a/extensions/mssql/src/objectManagement/commands.ts +++ b/extensions/mssql/src/objectManagement/commands.ts @@ -49,7 +49,7 @@ async function handleNewLoginDialogCommand(context: azdata.ObjectExplorerContext await dialog.open(); } catch (err) { - TelemetryReporter.createErrorEvent(TelemetryViews.ObjectManagement, TelemetryActions.OpenNewObjectDialog).withAdditionalProperties({ + TelemetryReporter.createErrorEvent2(TelemetryViews.ObjectManagement, TelemetryActions.OpenNewObjectDialog, err).withAdditionalProperties({ objectType: NodeType.Login }).send(); await vscode.window.showErrorMessage(localizedConstants.OpenNewObjectDialogError(localizedConstants.LoginTypeDisplayName, getErrorMessage(err))); @@ -63,7 +63,7 @@ async function handleNewUserDialogCommand(context: azdata.ObjectExplorerContext, await dialog.open(); } catch (err) { - TelemetryReporter.createErrorEvent(TelemetryViews.ObjectManagement, TelemetryActions.OpenNewObjectDialog).withAdditionalProperties({ + TelemetryReporter.createErrorEvent2(TelemetryViews.ObjectManagement, TelemetryActions.OpenNewObjectDialog, err).withAdditionalProperties({ objectType: NodeType.User }).send(); await vscode.window.showErrorMessage(localizedConstants.OpenNewObjectDialogError(localizedConstants.UserTypeDisplayName, getErrorMessage(err))); @@ -90,7 +90,7 @@ async function handleObjectPropertiesDialogCommand(context: azdata.ObjectExplore } } catch (err) { - TelemetryReporter.createErrorEvent(TelemetryViews.ObjectManagement, TelemetryActions.OpenPropertiesDialog).withAdditionalProperties({ + TelemetryReporter.createErrorEvent2(TelemetryViews.ObjectManagement, TelemetryActions.OpenPropertiesDialog, err).withAdditionalProperties({ objectType: context.nodeInfo.nodeType }).send(); await vscode.window.showErrorMessage(localizedConstants.OpenObjectPropertiesDialogError(nodeTypeDisplayName, context.nodeInfo.label, getErrorMessage(err))); @@ -141,7 +141,7 @@ async function handleDeleteObjectCommand(context: azdata.ObjectExplorerContext, } catch (err) { operation.updateStatus(azdata.TaskStatus.Failed, localizedConstants.DeleteObjectError(nodeTypeDisplayName, context.nodeInfo.label, getErrorMessage(err))); - TelemetryReporter.createErrorEvent(TelemetryViews.ObjectManagement, TelemetryActions.DeleteObject).withAdditionalProperties({ + TelemetryReporter.createErrorEvent2(TelemetryViews.ObjectManagement, TelemetryActions.DeleteObject, err).withAdditionalProperties({ objectType: context.nodeInfo.nodeType }).send(); return; diff --git a/extensions/mssql/src/objectManagement/ui/objectManagementDialogBase.ts b/extensions/mssql/src/objectManagement/ui/objectManagementDialogBase.ts index 9024295407..602efd6067 100644 --- a/extensions/mssql/src/objectManagement/ui/objectManagementDialogBase.ts +++ b/extensions/mssql/src/objectManagement/ui/objectManagementDialogBase.ts @@ -158,7 +158,7 @@ export abstract class ObjectManagementDialogBase // Create the global storage folder now for storing the query history persistance file const storageUri = context.globalStorageUri; try { + throw new Error('Test'); await fs.mkdir(storageUri.fsPath); } catch (err) { if (err.code !== 'EEXIST') { - TelemetryReporter.sendErrorEvent(TelemetryViews.QueryHistory, 'CreatingStorageFolder'); + TelemetryReporter.sendErrorEvent2(TelemetryViews.QueryHistory, 'CreatingStorageFolder', err); console.error(`Error creating query history global storage folder ${context.globalStorageUri.fsPath}. ${err}`); } } @@ -114,7 +115,7 @@ async function openQuery(item: QueryHistoryItem): Promise { content: item.queryText }, item.connectionProfile?.providerId); } catch (err) { - TelemetryReporter.sendErrorEvent(TelemetryViews.QueryHistory, 'OpenQuery'); + TelemetryReporter.sendErrorEvent2(TelemetryViews.QueryHistory, 'OpenQuery'); } } @@ -136,7 +137,7 @@ async function runQuery(item: QueryHistoryItem): Promise { step = 'Run'; azdata.queryeditor.runQuery(doc.uri); } catch (err) { - TelemetryReporter.createErrorEvent(TelemetryViews.QueryHistory, 'RunQuery') + TelemetryReporter.createErrorEvent2(TelemetryViews.QueryHistory, 'RunQuery', err) .withAdditionalProperties({ step }) .send(); } diff --git a/extensions/query-history/src/queryHistoryProvider.ts b/extensions/query-history/src/queryHistoryProvider.ts index 724f9cb166..5eeef90f06 100644 --- a/extensions/query-history/src/queryHistoryProvider.ts +++ b/extensions/query-history/src/queryHistoryProvider.ts @@ -95,7 +95,7 @@ export class QueryHistoryProvider implements vscode.TreeDataProvider { exitReason = ExitReason.error; propertyBag.exitReason = exitReason; telemetryStep = CreateAzureFunctionStep.noAzureFunctionsExtension; - TelemetryReporter.createErrorEvent(TelemetryViews.CreateAzureFunctionWithSqlBinding, telemetryStep) + TelemetryReporter.createErrorEvent2(TelemetryViews.CreateAzureFunctionWithSqlBinding, telemetryStep) .withAdditionalProperties(propertyBag).send(); return; } @@ -275,7 +275,7 @@ export async function createAzureFunction(node?: ITreeNodeInfo): Promise { // an error occurred during createFunction exitReason = ExitReason.error; void vscode.window.showErrorMessage(constants.errorNewAzureFunction(error)); - TelemetryReporter.createErrorEvent(TelemetryViews.CreateAzureFunctionWithSqlBinding, TelemetryActions.exitCreateAzureFunctionQuickpick, undefined, errorType) + TelemetryReporter.createErrorEvent2(TelemetryViews.CreateAzureFunctionWithSqlBinding, TelemetryActions.exitCreateAzureFunctionQuickpick, error, undefined, errorType) .withAdditionalProperties(propertyBag).send(); return; } finally { diff --git a/extensions/sql-bindings/yarn.lock b/extensions/sql-bindings/yarn.lock index dd5ad58423..1b9bb5809e 100644 --- a/extensions/sql-bindings/yarn.lock +++ b/extensions/sql-bindings/yarn.lock @@ -222,10 +222,10 @@ "@jridgewell/resolve-uri" "^3.0.3" "@jridgewell/sourcemap-codec" "^1.4.10" -"@microsoft/ads-extension-telemetry@^1.3.4": - version "1.3.4" - resolved "https://registry.yarnpkg.com/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.3.4.tgz#25d34cff39171a79663816faa6ba889e07dfb5ab" - integrity sha512-XTkMUA4BsTVNETjrKE4M3xaXlmk7m93Xy/eQHxHhzf8POjtPTvlw+8i96W8lTiRPnN81yAVE7YOB3GExsur6RA== +"@microsoft/ads-extension-telemetry@^1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.4.0.tgz#73b156f399c810b58949e83021da9071335a29a0" + integrity sha512-uiPD12Jeu3/CGPCQctyZKE+2FLwn+/iXLoLn80EoJ0MTnonHo1AREvbtR1y6JpOjh8hJXBdh6LjCxs15giIESg== dependencies: "@vscode/extension-telemetry" "0.6.1" diff --git a/extensions/sql-database-projects/package.json b/extensions/sql-database-projects/package.json index d9cf65c723..b38cc1b1da 100644 --- a/extensions/sql-database-projects/package.json +++ b/extensions/sql-database-projects/package.json @@ -508,7 +508,7 @@ } }, "dependencies": { - "@microsoft/ads-extension-telemetry": "^1.3.4", + "@microsoft/ads-extension-telemetry": "^1.4.0", "@xmldom/xmldom": "0.8.4", "axios": "^0.27.2", "extract-zip": "^2.0.1", diff --git a/extensions/sql-database-projects/src/controllers/projectController.ts b/extensions/sql-database-projects/src/controllers/projectController.ts index 688abb54ac..77711a1fec 100644 --- a/extensions/sql-database-projects/src/controllers/projectController.ts +++ b/extensions/sql-database-projects/src/controllers/projectController.ts @@ -297,7 +297,7 @@ export class ProjectsController { this.buildInfo[currentBuildIndex].status = Status.failed; this.buildInfo[currentBuildIndex].timeToCompleteAction = utils.timeConversion(timeToFailureBuild); - TelemetryReporter.createErrorEvent(TelemetryViews.ProjectController, TelemetryActions.build) + TelemetryReporter.createErrorEvent2(TelemetryViews.ProjectController, TelemetryActions.build, err) .withAdditionalMeasurements({ duration: timeToFailureBuild }) .withAdditionalProperties({ databaseSource: utils.getWellKnownDatabaseSources(project.getDatabaseSourceValues()).join(';') }) .send(); @@ -346,7 +346,7 @@ export class ProjectsController { } } catch (error) { void utils.showErrorMessageWithOutputChannel(constants.publishToNewAzureServerFailed, error, this._outputChannel); - TelemetryReporter.sendErrorEvent(TelemetryViews.ProjectController, TelemetryActions.publishToNewAzureServer); + TelemetryReporter.sendErrorEvent2(TelemetryViews.ProjectController, TelemetryActions.publishToNewAzureServer, error); } } @@ -384,7 +384,7 @@ export class ProjectsController { } } catch (error) { void utils.showErrorMessageWithOutputChannel(constants.publishToContainerFailed, error, this._outputChannel); - TelemetryReporter.createErrorEvent(TelemetryViews.ProjectController, TelemetryActions.publishToContainer) + TelemetryReporter.createErrorEvent2(TelemetryViews.ProjectController, TelemetryActions.publishToContainer, error) .withAdditionalProperties({ dockerBaseImage: dockerImageNameForTelemetry }) .send(); } @@ -485,7 +485,7 @@ export class ProjectsController { telemetryProps.databaseSource = utils.getWellKnownDatabaseSources(project.getDatabaseSourceValues()).join(';'); if (!dacpacPath) { - TelemetryReporter.createErrorEvent(TelemetryViews.ProjectController, TelemetryActions.publishProject) + TelemetryReporter.createErrorEvent2(TelemetryViews.ProjectController, TelemetryActions.publishProject) .withAdditionalProperties(telemetryProps) .withAdditionalMeasurements(telemetryMeasures) .send(); @@ -538,7 +538,7 @@ export class ProjectsController { telemetryProps.actionDuration = timeToFailurePublish.toString(); telemetryProps.totalDuration = (actionEndTime - buildStartTime).toString(); - TelemetryReporter.createErrorEvent(TelemetryViews.ProjectController, TelemetryActions.publishProject) + TelemetryReporter.createErrorEvent2(TelemetryViews.ProjectController, TelemetryActions.publishProject, err) .withAdditionalProperties(telemetryProps) .send(); @@ -602,7 +602,7 @@ export class ProjectsController { props.errorMessage = message; } - TelemetryReporter.createErrorEvent(TelemetryViews.ProjectController, TelemetryActions.projectSchemaCompareCommandInvoked) + TelemetryReporter.createErrorEvent2(TelemetryViews.ProjectController, TelemetryActions.projectSchemaCompareCommandInvoked, err) .withAdditionalProperties(props) .send(); @@ -727,7 +727,7 @@ export class ProjectsController { } catch (err) { void vscode.window.showErrorMessage(utils.getErrorMessage(err)); - TelemetryReporter.createErrorEvent(TelemetryViews.ProjectTree, TelemetryActions.addItemFromTree) + TelemetryReporter.createErrorEvent2(TelemetryViews.ProjectTree, TelemetryActions.addItemFromTree, err) .withAdditionalProperties(telemetryProps) .withAdditionalMeasurements(telemetryMeasurements) .send(); @@ -755,7 +755,7 @@ export class ProjectsController { this.refreshProjectsTree(treeNode); } catch (err) { void vscode.window.showErrorMessage(utils.getErrorMessage(err)); - TelemetryReporter.sendErrorEvent(TelemetryViews.ProjectTree, TelemetryActions.addExistingItem); + TelemetryReporter.sendErrorEvent2(TelemetryViews.ProjectTree, TelemetryActions.addExistingItem, err); } } @@ -769,7 +769,7 @@ export class ProjectsController { TelemetryReporter.sendActionEvent(TelemetryViews.ProjectTree, TelemetryActions.excludeFromProject); await project.exclude(fileEntry); } else { - TelemetryReporter.sendErrorEvent(TelemetryViews.ProjectTree, TelemetryActions.excludeFromProject); + TelemetryReporter.sendErrorEvent2(TelemetryViews.ProjectTree, TelemetryActions.excludeFromProject); void vscode.window.showErrorMessage(constants.unableToPerformAction(constants.excludeAction, node.relativeProjectUri.path)); } @@ -826,7 +826,7 @@ export class ProjectsController { this.refreshProjectsTree(context); } else { - TelemetryReporter.createErrorEvent(TelemetryViews.ProjectTree, TelemetryActions.deleteObjectFromProject) + TelemetryReporter.createErrorEvent2(TelemetryViews.ProjectTree, TelemetryActions.deleteObjectFromProject) .withAdditionalProperties({ objectType: node.constructor.name }) .send(); @@ -1394,7 +1394,7 @@ export class ProjectsController { return project; } catch (err) { void vscode.window.showErrorMessage(constants.generatingProjectFailed(utils.getErrorMessage(err))); - TelemetryReporter.sendErrorEvent(TelemetryViews.ProjectController, TelemetryActions.generateProjectFromOpenApiSpec); + TelemetryReporter.sendErrorEvent2(TelemetryViews.ProjectController, TelemetryActions.generateProjectFromOpenApiSpec, err); this._outputChannel.show(); return; } @@ -1580,7 +1580,7 @@ export class ProjectsController { await workspaceApi.addProjectsToWorkspace([vscode.Uri.file(newProjFilePath)]); } catch (err) { void vscode.window.showErrorMessage(utils.getErrorMessage(err)); - TelemetryReporter.sendErrorEvent(TelemetryViews.ProjectController, TelemetryActions.createProjectFromDatabase); + TelemetryReporter.sendErrorEvent2(TelemetryViews.ProjectController, TelemetryActions.createProjectFromDatabase, err); } } @@ -1691,7 +1691,7 @@ export class ProjectsController { .send(); } catch (err) { void vscode.window.showErrorMessage(utils.getErrorMessage(err)); - TelemetryReporter.sendErrorEvent(TelemetryViews.ProjectController, TelemetryActions.updateProjectFromDatabase); + TelemetryReporter.sendErrorEvent2(TelemetryViews.ProjectController, TelemetryActions.updateProjectFromDatabase, err); } } @@ -1747,7 +1747,7 @@ export class ProjectsController { ); if (!comparisonResult || !comparisonResult.success) { - TelemetryReporter.createErrorEvent(TelemetryViews.ProjectController, 'SchemaComparisonFailed') + TelemetryReporter.createErrorEvent2(TelemetryViews.ProjectController, 'SchemaComparisonFailed') .withAdditionalProperties({ operationId: comparisonResult.operationId }).send(); diff --git a/extensions/sql-database-projects/yarn.lock b/extensions/sql-database-projects/yarn.lock index 8542ab2ea8..0c7c5f5714 100644 --- a/extensions/sql-database-projects/yarn.lock +++ b/extensions/sql-database-projects/yarn.lock @@ -222,10 +222,10 @@ "@jridgewell/resolve-uri" "^3.0.3" "@jridgewell/sourcemap-codec" "^1.4.10" -"@microsoft/ads-extension-telemetry@^1.3.4": - version "1.3.4" - resolved "https://registry.yarnpkg.com/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.3.4.tgz#25d34cff39171a79663816faa6ba889e07dfb5ab" - integrity sha512-XTkMUA4BsTVNETjrKE4M3xaXlmk7m93Xy/eQHxHhzf8POjtPTvlw+8i96W8lTiRPnN81yAVE7YOB3GExsur6RA== +"@microsoft/ads-extension-telemetry@^1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.4.0.tgz#73b156f399c810b58949e83021da9071335a29a0" + integrity sha512-uiPD12Jeu3/CGPCQctyZKE+2FLwn+/iXLoLn80EoJ0MTnonHo1AREvbtR1y6JpOjh8hJXBdh6LjCxs15giIESg== dependencies: "@vscode/extension-telemetry" "0.6.1" diff --git a/extensions/sql-migration/package.json b/extensions/sql-migration/package.json index f2b8450d84..a4fb825a46 100644 --- a/extensions/sql-migration/package.json +++ b/extensions/sql-migration/package.json @@ -155,7 +155,7 @@ "dependencies": { "dataprotocol-client": "github:Microsoft/sqlops-dataprotocolclient#1.3.1", "@microsoft/ads-service-downloader": "^1.1.0", - "@microsoft/ads-extension-telemetry": "^1.3.4", + "@microsoft/ads-extension-telemetry": "^1.4.0", "uuid": "^8.3.2", "vscode-nls": "^4.1.2" }, diff --git a/extensions/sql-migration/yarn.lock b/extensions/sql-migration/yarn.lock index e7bffa66cf..34f2d5a3c3 100644 --- a/extensions/sql-migration/yarn.lock +++ b/extensions/sql-migration/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"@microsoft/ads-extension-telemetry@^1.3.4": - version "1.3.4" - resolved "https://registry.yarnpkg.com/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.3.4.tgz#25d34cff39171a79663816faa6ba889e07dfb5ab" - integrity sha512-XTkMUA4BsTVNETjrKE4M3xaXlmk7m93Xy/eQHxHhzf8POjtPTvlw+8i96W8lTiRPnN81yAVE7YOB3GExsur6RA== +"@microsoft/ads-extension-telemetry@^1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.4.0.tgz#73b156f399c810b58949e83021da9071335a29a0" + integrity sha512-uiPD12Jeu3/CGPCQctyZKE+2FLwn+/iXLoLn80EoJ0MTnonHo1AREvbtR1y6JpOjh8hJXBdh6LjCxs15giIESg== dependencies: "@vscode/extension-telemetry" "0.6.1" @@ -28,16 +28,6 @@ resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf" integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A== -"@tootallnate/once@2": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf" - integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A== - -"@tootallnate/once@2": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf" - integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A== - "@types/uuid@^8.3.1": version "8.3.1" resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.3.1.tgz#1a32969cf8f0364b3d8c8af9cc3555b7805df14f" @@ -223,32 +213,6 @@ vscode-languageserver-types@3.14.0: resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.14.0.tgz#d3b5952246d30e5241592b6dde8280e03942e743" integrity sha512-lTmS6AlAlMHOvPQemVwo3CezxBp0sNB95KNPkqp3Nxd5VFEnuG1ByM0zlRWos0zjO3ZWtkvhal0COgiV1xIA4A== -vscode-jsonrpc@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-4.0.0.tgz#a7bf74ef3254d0a0c272fab15c82128e378b3be9" - integrity sha512-perEnXQdQOJMTDFNv+UF3h1Y0z4iSiaN9jIlb0OqIYgosPCZGYh/MCUlkFtV2668PL69lRDO32hmvL2yiidUYg== - -vscode-languageclient@5.2.1: - version "5.2.1" - resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-5.2.1.tgz#7cfc83a294c409f58cfa2b910a8cfeaad0397193" - integrity sha512-7jrS/9WnV0ruqPamN1nE7qCxn0phkH5LjSgSp9h6qoJGoeAKzwKz/PF6M+iGA/aklx4GLZg1prddhEPQtuXI1Q== - dependencies: - semver "^5.5.0" - vscode-languageserver-protocol "3.14.1" - -vscode-languageserver-protocol@3.14.1: - version "3.14.1" - resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.14.1.tgz#b8aab6afae2849c84a8983d39a1cf742417afe2f" - integrity sha512-IL66BLb2g20uIKog5Y2dQ0IiigW0XKrvmWiOvc0yXw80z3tMEzEnHjaGAb3ENuU7MnQqgnYJ1Cl2l9RvNgDi4g== - dependencies: - vscode-jsonrpc "^4.0.0" - vscode-languageserver-types "3.14.0" - -vscode-languageserver-types@3.14.0: - version "3.14.0" - resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.14.0.tgz#d3b5952246d30e5241592b6dde8280e03942e743" - integrity sha512-lTmS6AlAlMHOvPQemVwo3CezxBp0sNB95KNPkqp3Nxd5VFEnuG1ByM0zlRWos0zjO3ZWtkvhal0COgiV1xIA4A== - vscode-nls@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.1.2.tgz#ca8bf8bb82a0987b32801f9fddfdd2fb9fd3c167" @@ -266,16 +230,3 @@ yauzl@^2.10.0: dependencies: buffer-crc32 "~0.2.3" fd-slicer "~1.1.0" - -yallist@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" - integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== - -yauzl@^2.10.0: - version "2.10.0" - resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9" - integrity sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g== - dependencies: - buffer-crc32 "~0.2.3" - fd-slicer "~1.1.0"