From 60c1c8a89f64d02d2777e074d75bc917f23db97b Mon Sep 17 00:00:00 2001 From: Charles Gagnon Date: Tue, 4 Oct 2022 23:06:53 -0700 Subject: [PATCH] Update ads-extension-telemetry to 1.3.1 (#20724) * Update ads-extension-telemetry to 1.3.0 * fix --- extensions/admin-tool-ext-win/package.json | 2 +- .../admin-tool-ext-win/src/telemetry.ts | 2 +- extensions/admin-tool-ext-win/yarn.lock | 8 ++-- extensions/dacpac/package.json | 2 +- extensions/dacpac/src/telemetry.ts | 6 ++- .../src/wizard/dataTierApplicationWizard.ts | 6 +-- extensions/dacpac/yarn.lock | 8 ++-- extensions/data-workspace/package.json | 2 +- .../data-workspace/src/common/telemetry.ts | 2 +- extensions/data-workspace/yarn.lock | 8 ++-- extensions/notebook/package.json | 2 +- extensions/notebook/src/telemetry.ts | 2 +- extensions/notebook/yarn.lock | 8 ++-- extensions/query-history/package.json | 2 +- .../query-history/src/queryHistoryProvider.ts | 16 +++---- extensions/query-history/src/telemetry.ts | 46 +------------------ extensions/query-history/yarn.lock | 8 ++-- extensions/resource-deployment/package.json | 2 +- .../src/services/telemetryService.ts | 2 +- extensions/resource-deployment/yarn.lock | 8 ++-- extensions/schema-compare/package.json | 2 +- extensions/schema-compare/src/telemetry.ts | 2 +- extensions/schema-compare/yarn.lock | 8 ++-- extensions/sql-assessment/package.json | 2 +- extensions/sql-assessment/src/telemetry.ts | 2 +- extensions/sql-assessment/yarn.lock | 8 ++-- extensions/sql-bindings/package.json | 2 +- .../sql-bindings/src/common/telemetry.ts | 4 +- .../src/services/azureFunctionsService.ts | 10 ++-- extensions/sql-bindings/yarn.lock | 8 ++-- extensions/sql-database-projects/package.json | 2 +- .../src/common/telemetry.ts | 6 ++- .../src/controllers/projectController.ts | 4 +- extensions/sql-database-projects/yarn.lock | 8 ++-- extensions/sql-migration/package.json | 2 +- extensions/sql-migration/src/telemtery.ts | 2 +- extensions/sql-migration/yarn.lock | 8 ++-- 37 files changed, 92 insertions(+), 130 deletions(-) diff --git a/extensions/admin-tool-ext-win/package.json b/extensions/admin-tool-ext-win/package.json index e89a634d4d..b0d67540f3 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.2.0", + "@microsoft/ads-extension-telemetry": "^1.3.1", "@microsoft/ads-service-downloader": "1.0.4", "vscode-nls": "^4.1.2" }, diff --git a/extensions/admin-tool-ext-win/src/telemetry.ts b/extensions/admin-tool-ext-win/src/telemetry.ts index 70d6848b0a..1165d3b396 100644 --- a/extensions/admin-tool-ext-win/src/telemetry.ts +++ b/extensions/admin-tool-ext-win/src/telemetry.ts @@ -11,7 +11,7 @@ const packageJson = require('../package.json'); let packageInfo = Utils.getPackageInfo(packageJson); -export const TelemetryReporter = new AdsTelemetryReporter(packageInfo.name, packageInfo.version, packageInfo.aiKey); +export const TelemetryReporter = new AdsTelemetryReporter(packageInfo.name, packageInfo.version, packageInfo.aiKey); export enum TelemetryViews { SsmsMinProperties = 'SsmsMinProperties', diff --git a/extensions/admin-tool-ext-win/yarn.lock b/extensions/admin-tool-ext-win/yarn.lock index 701aa51298..0a43d2e2b1 100644 --- a/extensions/admin-tool-ext-win/yarn.lock +++ b/extensions/admin-tool-ext-win/yarn.lock @@ -200,10 +200,10 @@ "@microsoft/applicationinsights-shims" "^2.0.1" "@microsoft/dynamicproto-js" "^1.1.6" -"@microsoft/ads-extension-telemetry@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.2.0.tgz#f54e464ac887440727fe9862f8ff32be17aeab3a" - integrity sha512-dEp+RVJYo4uebMLvBJqJF8IABufJRp+PWHZx+3xe6SgAC37oYhcwR/glExhp3Nj3A2v3vjso6YQ/Wd5TG27FPQ== +"@microsoft/ads-extension-telemetry@^1.3.1": + version "1.3.1" + resolved "https://registry.yarnpkg.com/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.3.1.tgz#fa757ee88eac91b21c3a68562da6441c2ad15c39" + integrity sha512-8Zd7RwwN7ZufMoWFmc1bwzmQc1RV7/jf/Ua33YL1+P0ZwHoWFOhf/b0lwvAVzi9TB/7oD5zA5yv7A/i2sSTn6Q== dependencies: "@vscode/extension-telemetry" "^0.6.2" diff --git a/extensions/dacpac/package.json b/extensions/dacpac/package.json index d845f29006..5364fe19a9 100644 --- a/extensions/dacpac/package.json +++ b/extensions/dacpac/package.json @@ -92,7 +92,7 @@ } }, "dependencies": { - "@microsoft/ads-extension-telemetry": "^1.2.0", + "@microsoft/ads-extension-telemetry": "^1.3.1", "htmlparser2": "^3.10.1", "vscode-nls": "^4.0.0" }, diff --git a/extensions/dacpac/src/telemetry.ts b/extensions/dacpac/src/telemetry.ts index cd47b39420..a9ec600a06 100644 --- a/extensions/dacpac/src/telemetry.ts +++ b/extensions/dacpac/src/telemetry.ts @@ -11,7 +11,7 @@ const packageJson = require('../package.json'); let packageInfo = Utils.getPackageInfo(packageJson); -export const TelemetryReporter = new AdsTelemetryReporter(packageInfo.name, packageInfo.version, packageInfo.aiKey); +export const TelemetryReporter = new AdsTelemetryReporter(packageInfo.name, packageInfo.version, packageInfo.aiKey); export enum TelemetryViews { DataTierApplicationWizard = 'DataTierApplicationWizard' @@ -23,5 +23,7 @@ export enum TelemetryAction { GenerateDeployPlan = 'GenerateDeployPlan', ExtractDacpac = 'ExtractDacpacOperation', ExportBacpac = 'ExportBacpacOperation', - ImportBacpac = 'ImportBacpacOperation' + ImportBacpac = 'ImportBacpacOperation', + ConnectionDialogCancelled = 'ConnectionDialogCancelled', + WizardCanceled = 'WizardCanceled' } diff --git a/extensions/dacpac/src/wizard/dataTierApplicationWizard.ts b/extensions/dacpac/src/wizard/dataTierApplicationWizard.ts index a0d142c78c..39a5d175fc 100644 --- a/extensions/dacpac/src/wizard/dataTierApplicationWizard.ts +++ b/extensions/dacpac/src/wizard/dataTierApplicationWizard.ts @@ -115,7 +115,7 @@ export class DataTierApplicationWizard { // don't open the wizard if connection dialog is cancelled if (!this.connection) { //Reporting Dacpac wizard cancelled event to Telemetry - TelemetryReporter.sendActionEvent(TelemetryViews.DataTierApplicationWizard, 'ConnectionDialogCancelled'); + TelemetryReporter.sendActionEvent(TelemetryViews.DataTierApplicationWizard, TelemetryAction.ConnectionDialogCancelled); return false; } } @@ -305,7 +305,7 @@ export class DataTierApplicationWizard { // Cancel button on click event is using to send the data loss information to telemetry private cancelDataTierApplicationWizard(): void { - TelemetryReporter.createActionEvent(TelemetryViews.DataTierApplicationWizard, 'WizardCanceled') + TelemetryReporter.createActionEvent(TelemetryViews.DataTierApplicationWizard, TelemetryAction.WizardCanceled) .withAdditionalProperties({ isPotentialDataLoss: this.model.potentialDataLoss?.toString(), page: this.wizard.currentPage.toString(), @@ -477,7 +477,7 @@ export class DataTierApplicationWizard { return this.dacfxService; } - private sendDacFxOperationTelemetryEvent(result: azdata.ResultStatus, telemetryAction: string, additionalProps: TelemetryEventProperties, additionalMeasurements: TelemetryEventMeasures): void { + private sendDacFxOperationTelemetryEvent(result: azdata.ResultStatus, telemetryAction: TelemetryAction, additionalProps: TelemetryEventProperties, additionalMeasurements: TelemetryEventMeasures): void { if (result?.success) { TelemetryReporter.createActionEvent(TelemetryViews.DataTierApplicationWizard, telemetryAction) .withAdditionalProperties(additionalProps) diff --git a/extensions/dacpac/yarn.lock b/extensions/dacpac/yarn.lock index 2dadd2825c..ccbfffb9e3 100644 --- a/extensions/dacpac/yarn.lock +++ b/extensions/dacpac/yarn.lock @@ -200,10 +200,10 @@ "@microsoft/applicationinsights-shims" "^2.0.1" "@microsoft/dynamicproto-js" "^1.1.6" -"@microsoft/ads-extension-telemetry@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.2.0.tgz#f54e464ac887440727fe9862f8ff32be17aeab3a" - integrity sha512-dEp+RVJYo4uebMLvBJqJF8IABufJRp+PWHZx+3xe6SgAC37oYhcwR/glExhp3Nj3A2v3vjso6YQ/Wd5TG27FPQ== +"@microsoft/ads-extension-telemetry@^1.3.1": + version "1.3.1" + resolved "https://registry.yarnpkg.com/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.3.1.tgz#fa757ee88eac91b21c3a68562da6441c2ad15c39" + integrity sha512-8Zd7RwwN7ZufMoWFmc1bwzmQc1RV7/jf/Ua33YL1+P0ZwHoWFOhf/b0lwvAVzi9TB/7oD5zA5yv7A/i2sSTn6Q== dependencies: "@vscode/extension-telemetry" "^0.6.2" diff --git a/extensions/data-workspace/package.json b/extensions/data-workspace/package.json index 38a43be76c..907beee6f4 100644 --- a/extensions/data-workspace/package.json +++ b/extensions/data-workspace/package.json @@ -178,7 +178,7 @@ }, "dependencies": { "fast-glob": "^3.2.7", - "@microsoft/ads-extension-telemetry": "^1.2.0", + "@microsoft/ads-extension-telemetry": "^1.3.1", "vscode-nls": "^4.0.0" }, "devDependencies": { diff --git a/extensions/data-workspace/src/common/telemetry.ts b/extensions/data-workspace/src/common/telemetry.ts index 4d3d948a30..95c1afb810 100644 --- a/extensions/data-workspace/src/common/telemetry.ts +++ b/extensions/data-workspace/src/common/telemetry.ts @@ -10,7 +10,7 @@ const packageJson = require('../../package.json'); let packageInfo = utils.getPackageInfo(packageJson)!; -export const TelemetryReporter = new AdsTelemetryReporter(packageInfo.name, packageInfo.version, packageInfo.aiKey); +export const TelemetryReporter = new AdsTelemetryReporter(packageInfo.name, packageInfo.version, packageInfo.aiKey); export enum TelemetryViews { diff --git a/extensions/data-workspace/yarn.lock b/extensions/data-workspace/yarn.lock index 1fb1da14df..437bce940e 100644 --- a/extensions/data-workspace/yarn.lock +++ b/extensions/data-workspace/yarn.lock @@ -200,10 +200,10 @@ "@microsoft/applicationinsights-shims" "^2.0.1" "@microsoft/dynamicproto-js" "^1.1.6" -"@microsoft/ads-extension-telemetry@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.2.0.tgz#f54e464ac887440727fe9862f8ff32be17aeab3a" - integrity sha512-dEp+RVJYo4uebMLvBJqJF8IABufJRp+PWHZx+3xe6SgAC37oYhcwR/glExhp3Nj3A2v3vjso6YQ/Wd5TG27FPQ== +"@microsoft/ads-extension-telemetry@^1.3.1": + version "1.3.1" + resolved "https://registry.yarnpkg.com/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.3.1.tgz#fa757ee88eac91b21c3a68562da6441c2ad15c39" + integrity sha512-8Zd7RwwN7ZufMoWFmc1bwzmQc1RV7/jf/Ua33YL1+P0ZwHoWFOhf/b0lwvAVzi9TB/7oD5zA5yv7A/i2sSTn6Q== dependencies: "@vscode/extension-telemetry" "^0.6.2" diff --git a/extensions/notebook/package.json b/extensions/notebook/package.json index 77db5ac5c0..0838400a84 100644 --- a/extensions/notebook/package.json +++ b/extensions/notebook/package.json @@ -761,7 +761,7 @@ }, "dependencies": { "@jupyterlab/services": "^3.2.1", - "@microsoft/ads-extension-telemetry": "^1.2.0", + "@microsoft/ads-extension-telemetry": "^1.3.1", "adm-zip": "^0.4.14", "error-ex": "^1.3.1", "fast-glob": "^3.1.0", diff --git a/extensions/notebook/src/telemetry.ts b/extensions/notebook/src/telemetry.ts index e03c88faf0..135b485db0 100644 --- a/extensions/notebook/src/telemetry.ts +++ b/extensions/notebook/src/telemetry.ts @@ -6,7 +6,7 @@ import AdsTelemetryReporter, { TelemetryEventMeasures, TelemetryEventProperties } from '@microsoft/ads-extension-telemetry'; const packageJson = require('../package.json'); -export const TelemetryReporter = new AdsTelemetryReporter(packageJson.name, packageJson.version, packageJson.aiKey); +export const TelemetryReporter = new AdsTelemetryReporter(packageJson.name, packageJson.version, packageJson.aiKey); export enum NbTelemetryView { Book = 'Book', diff --git a/extensions/notebook/yarn.lock b/extensions/notebook/yarn.lock index 4573404b21..b4c525ece8 100644 --- a/extensions/notebook/yarn.lock +++ b/extensions/notebook/yarn.lock @@ -239,10 +239,10 @@ "@microsoft/applicationinsights-shims" "^2.0.1" "@microsoft/dynamicproto-js" "^1.1.6" -"@microsoft/ads-extension-telemetry@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.2.0.tgz#f54e464ac887440727fe9862f8ff32be17aeab3a" - integrity sha512-dEp+RVJYo4uebMLvBJqJF8IABufJRp+PWHZx+3xe6SgAC37oYhcwR/glExhp3Nj3A2v3vjso6YQ/Wd5TG27FPQ== +"@microsoft/ads-extension-telemetry@^1.3.1": + version "1.3.1" + resolved "https://registry.yarnpkg.com/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.3.1.tgz#fa757ee88eac91b21c3a68562da6441c2ad15c39" + integrity sha512-8Zd7RwwN7ZufMoWFmc1bwzmQc1RV7/jf/Ua33YL1+P0ZwHoWFOhf/b0lwvAVzi9TB/7oD5zA5yv7A/i2sSTn6Q== dependencies: "@vscode/extension-telemetry" "^0.6.2" diff --git a/extensions/query-history/package.json b/extensions/query-history/package.json index aa642488c2..0f7d320132 100644 --- a/extensions/query-history/package.json +++ b/extensions/query-history/package.json @@ -209,7 +209,7 @@ } }, "dependencies": { - "@microsoft/ads-extension-telemetry": "1.2.0", + "@microsoft/ads-extension-telemetry": "^1.3.1", "vscode-nls": "^4.1.2" }, "devDependencies": { diff --git a/extensions/query-history/src/queryHistoryProvider.ts b/extensions/query-history/src/queryHistoryProvider.ts index cb510dbc9d..210d5af2a3 100644 --- a/extensions/query-history/src/queryHistoryProvider.ts +++ b/extensions/query-history/src/queryHistoryProvider.ts @@ -12,7 +12,7 @@ import * as fs from 'fs'; import * as path from 'path'; import * as crypto from 'crypto'; import * as loc from './localizedConstants'; -import { sendSettingChangedEvent, TelemetryActions, TelemetryReporter, TelemetryViews, TimedAction } from './telemetry'; +import { sendSettingChangedEvent, TelemetryActions, TelemetryReporter, TelemetryViews } from './telemetry'; const STORAGE_IV_KEY = 'queryHistory.storage-iv'; const STORAGE_KEY_KEY = 'queryHistory.storage-key'; @@ -51,7 +51,7 @@ export class QueryHistoryProvider implements vscode.TreeDataProvider initializeAction.send()); this._disposables.push(vscode.workspace.onDidChangeConfiguration(async e => { if (e.affectsConfiguration(QUERY_HISTORY_CONFIG_SECTION) || e.affectsConfiguration(MAX_ENTRIES_CONFIG_SECTION)) { @@ -147,12 +147,10 @@ export class QueryHistoryProvider implements vscode.TreeDataProvider(packageInfo.name, packageInfo.version, packageInfo.aiKey); /** * Send an event indicating that a setting changed along with the new and old values. Core has a setting changed diff --git a/extensions/query-history/yarn.lock b/extensions/query-history/yarn.lock index 777db5d660..772f4d722a 100644 --- a/extensions/query-history/yarn.lock +++ b/extensions/query-history/yarn.lock @@ -246,10 +246,10 @@ "@microsoft/applicationinsights-shims" "^2.0.1" "@microsoft/dynamicproto-js" "^1.1.6" -"@microsoft/ads-extension-telemetry@1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.2.0.tgz#f54e464ac887440727fe9862f8ff32be17aeab3a" - integrity sha512-dEp+RVJYo4uebMLvBJqJF8IABufJRp+PWHZx+3xe6SgAC37oYhcwR/glExhp3Nj3A2v3vjso6YQ/Wd5TG27FPQ== +"@microsoft/ads-extension-telemetry@^1.3.1": + version "1.3.1" + resolved "https://registry.yarnpkg.com/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.3.1.tgz#fa757ee88eac91b21c3a68562da6441c2ad15c39" + integrity sha512-8Zd7RwwN7ZufMoWFmc1bwzmQc1RV7/jf/Ua33YL1+P0ZwHoWFOhf/b0lwvAVzi9TB/7oD5zA5yv7A/i2sSTn6Q== dependencies: "@vscode/extension-telemetry" "^0.6.2" diff --git a/extensions/resource-deployment/package.json b/extensions/resource-deployment/package.json index cfec961c47..504abebc17 100644 --- a/extensions/resource-deployment/package.json +++ b/extensions/resource-deployment/package.json @@ -524,7 +524,7 @@ ] }, "dependencies": { - "@microsoft/ads-extension-telemetry": "^1.2.0", + "@microsoft/ads-extension-telemetry": "^1.3.1", "axios": "^0.27.2", "linux-release-info": "^2.0.0", "promisify-child-process": "^3.1.1", diff --git a/extensions/resource-deployment/src/services/telemetryService.ts b/extensions/resource-deployment/src/services/telemetryService.ts index 17adb7e491..52ae023f1a 100644 --- a/extensions/resource-deployment/src/services/telemetryService.ts +++ b/extensions/resource-deployment/src/services/telemetryService.ts @@ -8,7 +8,7 @@ import AdsTelemetryReporter from '@microsoft/ads-extension-telemetry'; const packageJson = vscode.extensions.getExtension('Microsoft.resource-deployment')!.packageJSON; -export const TelemetryReporter = new AdsTelemetryReporter(packageJson.name, packageJson.version, packageJson.aiKey); +export const TelemetryReporter = new AdsTelemetryReporter(packageJson.name, packageJson.version, packageJson.aiKey); export enum TelemetryView { ResourceTypeWizard = 'ResourceTypeWizard' diff --git a/extensions/resource-deployment/yarn.lock b/extensions/resource-deployment/yarn.lock index aaf3f55f48..e0c52888a7 100644 --- a/extensions/resource-deployment/yarn.lock +++ b/extensions/resource-deployment/yarn.lock @@ -207,10 +207,10 @@ "@microsoft/applicationinsights-shims" "^2.0.1" "@microsoft/dynamicproto-js" "^1.1.6" -"@microsoft/ads-extension-telemetry@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.2.0.tgz#f54e464ac887440727fe9862f8ff32be17aeab3a" - integrity sha512-dEp+RVJYo4uebMLvBJqJF8IABufJRp+PWHZx+3xe6SgAC37oYhcwR/glExhp3Nj3A2v3vjso6YQ/Wd5TG27FPQ== +"@microsoft/ads-extension-telemetry@^1.3.1": + version "1.3.1" + resolved "https://registry.yarnpkg.com/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.3.1.tgz#fa757ee88eac91b21c3a68562da6441c2ad15c39" + integrity sha512-8Zd7RwwN7ZufMoWFmc1bwzmQc1RV7/jf/Ua33YL1+P0ZwHoWFOhf/b0lwvAVzi9TB/7oD5zA5yv7A/i2sSTn6Q== dependencies: "@vscode/extension-telemetry" "^0.6.2" diff --git a/extensions/schema-compare/package.json b/extensions/schema-compare/package.json index addc89484a..e52e03cf0c 100644 --- a/extensions/schema-compare/package.json +++ b/extensions/schema-compare/package.json @@ -111,7 +111,7 @@ } }, "dependencies": { - "@microsoft/ads-extension-telemetry": "^1.2.0", + "@microsoft/ads-extension-telemetry": "^1.3.1", "vscode-nls": "^4.0.0" }, "devDependencies": { diff --git a/extensions/schema-compare/src/telemetry.ts b/extensions/schema-compare/src/telemetry.ts index 2de5d50c05..5ea879b772 100644 --- a/extensions/schema-compare/src/telemetry.ts +++ b/extensions/schema-compare/src/telemetry.ts @@ -11,7 +11,7 @@ const packageJson = require('../package.json'); let packageInfo = Utils.getPackageInfo(packageJson); -export const TelemetryReporter = new AdsTelemetryReporter(packageInfo.name, packageInfo.version, packageInfo.aiKey); +export const TelemetryReporter = new AdsTelemetryReporter(packageInfo.name, packageInfo.version, packageInfo.aiKey); export enum TelemetryViews { SchemaCompareMainWindow = 'SchemaCompareMainWindow', diff --git a/extensions/schema-compare/yarn.lock b/extensions/schema-compare/yarn.lock index 600a001a2e..1679a2c7b3 100644 --- a/extensions/schema-compare/yarn.lock +++ b/extensions/schema-compare/yarn.lock @@ -200,10 +200,10 @@ "@microsoft/applicationinsights-shims" "^2.0.1" "@microsoft/dynamicproto-js" "^1.1.6" -"@microsoft/ads-extension-telemetry@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.2.0.tgz#f54e464ac887440727fe9862f8ff32be17aeab3a" - integrity sha512-dEp+RVJYo4uebMLvBJqJF8IABufJRp+PWHZx+3xe6SgAC37oYhcwR/glExhp3Nj3A2v3vjso6YQ/Wd5TG27FPQ== +"@microsoft/ads-extension-telemetry@^1.3.1": + version "1.3.1" + resolved "https://registry.yarnpkg.com/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.3.1.tgz#fa757ee88eac91b21c3a68562da6441c2ad15c39" + integrity sha512-8Zd7RwwN7ZufMoWFmc1bwzmQc1RV7/jf/Ua33YL1+P0ZwHoWFOhf/b0lwvAVzi9TB/7oD5zA5yv7A/i2sSTn6Q== dependencies: "@vscode/extension-telemetry" "^0.6.2" diff --git a/extensions/sql-assessment/package.json b/extensions/sql-assessment/package.json index c6de03871b..92fb07432a 100644 --- a/extensions/sql-assessment/package.json +++ b/extensions/sql-assessment/package.json @@ -45,7 +45,7 @@ }, "dependencies": { "vscode-nls": "^4.1.2", - "@microsoft/ads-extension-telemetry": "^1.2.0", + "@microsoft/ads-extension-telemetry": "^1.3.1", "vscode-languageclient": "^5.3.0-next.1" }, "__metadata": { diff --git a/extensions/sql-assessment/src/telemetry.ts b/extensions/sql-assessment/src/telemetry.ts index 1920692ec3..86ef1b63ca 100644 --- a/extensions/sql-assessment/src/telemetry.ts +++ b/extensions/sql-assessment/src/telemetry.ts @@ -6,7 +6,7 @@ import AdsTelemetryReporter from '@microsoft/ads-extension-telemetry'; const packageJson = require('../package.json'); -export const TelemetryReporter = new AdsTelemetryReporter(packageJson.name, packageJson.version, packageJson.aiKey); +export const TelemetryReporter = new AdsTelemetryReporter(packageJson.name, packageJson.version, packageJson.aiKey); export const SqlAssessmentTelemetryView = 'SqlAssessmentTab'; diff --git a/extensions/sql-assessment/yarn.lock b/extensions/sql-assessment/yarn.lock index 2dae35ff5a..3038eb57b3 100644 --- a/extensions/sql-assessment/yarn.lock +++ b/extensions/sql-assessment/yarn.lock @@ -20,10 +20,10 @@ "@microsoft/applicationinsights-shims" "^2.0.1" "@microsoft/dynamicproto-js" "^1.1.6" -"@microsoft/ads-extension-telemetry@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.2.0.tgz#f54e464ac887440727fe9862f8ff32be17aeab3a" - integrity sha512-dEp+RVJYo4uebMLvBJqJF8IABufJRp+PWHZx+3xe6SgAC37oYhcwR/glExhp3Nj3A2v3vjso6YQ/Wd5TG27FPQ== +"@microsoft/ads-extension-telemetry@^1.3.1": + version "1.3.1" + resolved "https://registry.yarnpkg.com/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.3.1.tgz#fa757ee88eac91b21c3a68562da6441c2ad15c39" + integrity sha512-8Zd7RwwN7ZufMoWFmc1bwzmQc1RV7/jf/Ua33YL1+P0ZwHoWFOhf/b0lwvAVzi9TB/7oD5zA5yv7A/i2sSTn6Q== dependencies: "@vscode/extension-telemetry" "^0.6.2" diff --git a/extensions/sql-bindings/package.json b/extensions/sql-bindings/package.json index 8f3d9536ea..03f0ff1f1e 100644 --- a/extensions/sql-bindings/package.json +++ b/extensions/sql-bindings/package.json @@ -63,7 +63,7 @@ } }, "dependencies": { - "@microsoft/ads-extension-telemetry": "^1.2.0", + "@microsoft/ads-extension-telemetry": "^1.3.1", "@microsoft/vscode-azext-utils": "^0.1.1", "fast-glob": "^3.2.7", "promisify-child-process": "^3.1.1", diff --git a/extensions/sql-bindings/src/common/telemetry.ts b/extensions/sql-bindings/src/common/telemetry.ts index 1df12de347..a17869e00d 100644 --- a/extensions/sql-bindings/src/common/telemetry.ts +++ b/extensions/sql-bindings/src/common/telemetry.ts @@ -7,7 +7,7 @@ import { getPackageInfo } from './utils'; const packageInfo = getPackageInfo()!; -export const TelemetryReporter = new AdsTelemetryReporter(packageInfo.name, packageInfo.version, packageInfo.aiKey); +export const TelemetryReporter = new AdsTelemetryReporter(packageInfo.name, packageInfo.version, packageInfo.aiKey); export enum TelemetryViews { SqlBindingsQuickPick = 'SqlBindingsQuickPick', @@ -51,6 +51,8 @@ export enum CreateAzureFunctionStep { getTemplateId = 'getTemplateId', getConnectionStringSettingName = 'getConnectionStringSettingName', promptForIncludePassword = 'promptForIncludePassword', + createFunctionAPI = 'createFunctionAPI', + finishCreateFunction = 'finishCreateFunction' } export enum ExitReason { diff --git a/extensions/sql-bindings/src/services/azureFunctionsService.ts b/extensions/sql-bindings/src/services/azureFunctionsService.ts index b5550a17bc..4c25c5204a 100644 --- a/extensions/sql-bindings/src/services/azureFunctionsService.ts +++ b/extensions/sql-bindings/src/services/azureFunctionsService.ts @@ -21,7 +21,7 @@ export async function createAzureFunction(node?: ITreeNodeInfo): Promise { // telemetry properties for create azure function let sessionId: string = uuid.v4(); let propertyBag: { [key: string]: string } = { sessionId: sessionId }; - let telemetryStep: string = ''; + let telemetryStep: CreateAzureFunctionStep | undefined = undefined; let exitReason: string = ExitReason.cancelled; TelemetryReporter.sendActionEvent(TelemetryViews.CreateAzureFunctionWithSqlBinding, TelemetryActions.startCreateAzureFunctionWithSqlBinding); let connectionInfo: IConnectionInfo | undefined; @@ -239,7 +239,7 @@ export async function createAzureFunction(node?: ITreeNodeInfo): Promise { let connectionStringExecuteStep = createAddConnectionStringStep(projectFolder, connectionInfo, connectionStringInfo.connectionStringSettingName); // create C# Azure Function with SQL Binding - telemetryStep = 'createFunctionAPI'; + telemetryStep = CreateAzureFunctionStep.createFunctionAPI; await azureFunctionApi.createFunction({ language: 'C#', targetFramework: 'netcoreapp3.1', @@ -263,7 +263,7 @@ export async function createAzureFunction(node?: ITreeNodeInfo): Promise { .withAdditionalProperties(propertyBag) .withConnectionInfo(connectionInfo).send(); - telemetryStep = 'finishCreateFunction'; + telemetryStep = CreateAzureFunctionStep.finishCreateFunction; propertyBag.telemetryStep = telemetryStep; exitReason = ExitReason.finishCreate; TelemetryReporter.createActionEvent(TelemetryViews.CreateAzureFunctionWithSqlBinding, TelemetryActions.finishCreateAzureFunctionWithSqlBinding) @@ -271,7 +271,7 @@ export async function createAzureFunction(node?: ITreeNodeInfo): Promise { .withConnectionInfo(connectionInfo).send(); } catch (error) { let errorType = utils.getErrorType(error); - propertyBag.telemetryStep = telemetryStep; + propertyBag.telemetryStep = telemetryStep ?? ''; // an error occurred during createFunction exitReason = ExitReason.error; void vscode.window.showErrorMessage(constants.errorNewAzureFunction(error)); @@ -279,7 +279,7 @@ export async function createAzureFunction(node?: ITreeNodeInfo): Promise { .withAdditionalProperties(propertyBag).send(); return; } finally { - propertyBag.telemetryStep = telemetryStep; + propertyBag.telemetryStep = telemetryStep ?? ''; propertyBag.exitReason = exitReason; TelemetryReporter.createActionEvent(TelemetryViews.CreateAzureFunctionWithSqlBinding, TelemetryActions.exitCreateAzureFunctionQuickpick) .withAdditionalProperties(propertyBag).send(); diff --git a/extensions/sql-bindings/yarn.lock b/extensions/sql-bindings/yarn.lock index 40bbbe15e5..d920f2f966 100644 --- a/extensions/sql-bindings/yarn.lock +++ b/extensions/sql-bindings/yarn.lock @@ -240,10 +240,10 @@ "@microsoft/applicationinsights-shims" "^2.0.1" "@microsoft/dynamicproto-js" "^1.1.6" -"@microsoft/ads-extension-telemetry@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.2.0.tgz#f54e464ac887440727fe9862f8ff32be17aeab3a" - integrity sha512-dEp+RVJYo4uebMLvBJqJF8IABufJRp+PWHZx+3xe6SgAC37oYhcwR/glExhp3Nj3A2v3vjso6YQ/Wd5TG27FPQ== +"@microsoft/ads-extension-telemetry@^1.3.1": + version "1.3.1" + resolved "https://registry.yarnpkg.com/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.3.1.tgz#fa757ee88eac91b21c3a68562da6441c2ad15c39" + integrity sha512-8Zd7RwwN7ZufMoWFmc1bwzmQc1RV7/jf/Ua33YL1+P0ZwHoWFOhf/b0lwvAVzi9TB/7oD5zA5yv7A/i2sSTn6Q== dependencies: "@vscode/extension-telemetry" "^0.6.2" diff --git a/extensions/sql-database-projects/package.json b/extensions/sql-database-projects/package.json index 75abfc1ff9..e38a923007 100644 --- a/extensions/sql-database-projects/package.json +++ b/extensions/sql-database-projects/package.json @@ -478,7 +478,7 @@ } }, "dependencies": { - "@microsoft/ads-extension-telemetry": "^1.2.0", + "@microsoft/ads-extension-telemetry": "^1.3.1", "@xmldom/xmldom": "^0.8.2", "axios": "^0.27.2", "extract-zip": "^2.0.1", diff --git a/extensions/sql-database-projects/src/common/telemetry.ts b/extensions/sql-database-projects/src/common/telemetry.ts index 03adf29b6a..54af081a2c 100644 --- a/extensions/sql-database-projects/src/common/telemetry.ts +++ b/extensions/sql-database-projects/src/common/telemetry.ts @@ -9,7 +9,7 @@ import { getPackageInfo } from './utils'; const packageInfo = getPackageInfo()!; -export const TelemetryReporter = new AdsTelemetryReporter(packageInfo.name, packageInfo.version, packageInfo.aiKey); +export const TelemetryReporter = new AdsTelemetryReporter(packageInfo.name, packageInfo.version, packageInfo.aiKey); export enum TelemetryViews { @@ -45,5 +45,7 @@ export enum TelemetryActions { publishOptionsOpened = 'publishOptionsOpened', resetOptions = 'resetOptions', optionsChanged = 'optionsChanged', - profileLoaded = 'profileLoaded' + profileLoaded = 'profileLoaded', + SchemaComparisonFinished = 'SchemaComparisonFinished', + SchemaComparisonStarted = 'SchemaComparisonStarted' } diff --git a/extensions/sql-database-projects/src/controllers/projectController.ts b/extensions/sql-database-projects/src/controllers/projectController.ts index 1cfa1be064..3adea58d64 100644 --- a/extensions/sql-database-projects/src/controllers/projectController.ts +++ b/extensions/sql-database-projects/src/controllers/projectController.ts @@ -1602,7 +1602,7 @@ export class ProjectsController { target.targetScripts = await this.getProjectScriptFiles(target.projectFilePath); target.dataSchemaProvider = await this.getProjectDatabaseSchemaProvider(target.projectFilePath); - TelemetryReporter.sendActionEvent(TelemetryViews.ProjectController, 'SchemaComparisonStarted'); + TelemetryReporter.sendActionEvent(TelemetryViews.ProjectController, TelemetryActions.SchemaComparisonStarted); // Perform schema comparison. Results are cached in SqlToolsService under the operationId const comparisonResult: mssql.SchemaCompareResult = await service.schemaCompare( @@ -1618,7 +1618,7 @@ export class ProjectsController { return; } - TelemetryReporter.createActionEvent(TelemetryViews.ProjectController, 'SchemaComparisonFinished') + TelemetryReporter.createActionEvent(TelemetryViews.ProjectController, TelemetryActions.SchemaComparisonFinished) .withAdditionalProperties({ 'endTime': Date.now().toString(), 'operationId': comparisonResult.operationId diff --git a/extensions/sql-database-projects/yarn.lock b/extensions/sql-database-projects/yarn.lock index f49d7eb201..dd8f33424f 100644 --- a/extensions/sql-database-projects/yarn.lock +++ b/extensions/sql-database-projects/yarn.lock @@ -240,10 +240,10 @@ "@microsoft/applicationinsights-shims" "^2.0.1" "@microsoft/dynamicproto-js" "^1.1.6" -"@microsoft/ads-extension-telemetry@^1.2.0": - version "1.2.0" - resolved "https://registry.npmjs.org/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.2.0.tgz" - integrity sha512-dEp+RVJYo4uebMLvBJqJF8IABufJRp+PWHZx+3xe6SgAC37oYhcwR/glExhp3Nj3A2v3vjso6YQ/Wd5TG27FPQ== +"@microsoft/ads-extension-telemetry@^1.3.1": + version "1.3.1" + resolved "https://registry.yarnpkg.com/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.3.1.tgz#fa757ee88eac91b21c3a68562da6441c2ad15c39" + integrity sha512-8Zd7RwwN7ZufMoWFmc1bwzmQc1RV7/jf/Ua33YL1+P0ZwHoWFOhf/b0lwvAVzi9TB/7oD5zA5yv7A/i2sSTn6Q== dependencies: "@vscode/extension-telemetry" "^0.6.2" diff --git a/extensions/sql-migration/package.json b/extensions/sql-migration/package.json index 2b7a871219..3a9363c600 100644 --- a/extensions/sql-migration/package.json +++ b/extensions/sql-migration/package.json @@ -153,7 +153,7 @@ ] }, "dependencies": { - "@microsoft/ads-extension-telemetry": "^1.2.0", + "@microsoft/ads-extension-telemetry": "^1.3.1", "uuid": "^8.3.2", "vscode-nls": "^4.1.2" }, diff --git a/extensions/sql-migration/src/telemtery.ts b/extensions/sql-migration/src/telemtery.ts index 575055d4f9..b0e58c9d15 100644 --- a/extensions/sql-migration/src/telemtery.ts +++ b/extensions/sql-migration/src/telemtery.ts @@ -11,7 +11,7 @@ let packageInfo = { aiKey: packageJson.aiKey }; -export const TelemetryReporter = new AdsTelemetryReporter(packageInfo.name, packageInfo.version, packageInfo.aiKey); +export const TelemetryReporter = new AdsTelemetryReporter(packageInfo.name, packageInfo.version, packageInfo.aiKey); export enum TelemetryViews { SqlServerDashboard = 'SqlServerDashboard', diff --git a/extensions/sql-migration/yarn.lock b/extensions/sql-migration/yarn.lock index 977fc10e0f..bba38c8a05 100644 --- a/extensions/sql-migration/yarn.lock +++ b/extensions/sql-migration/yarn.lock @@ -20,10 +20,10 @@ "@microsoft/applicationinsights-shims" "^2.0.1" "@microsoft/dynamicproto-js" "^1.1.6" -"@microsoft/ads-extension-telemetry@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.2.0.tgz#f54e464ac887440727fe9862f8ff32be17aeab3a" - integrity sha512-dEp+RVJYo4uebMLvBJqJF8IABufJRp+PWHZx+3xe6SgAC37oYhcwR/glExhp3Nj3A2v3vjso6YQ/Wd5TG27FPQ== +"@microsoft/ads-extension-telemetry@^1.3.1": + version "1.3.1" + resolved "https://registry.yarnpkg.com/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.3.1.tgz#fa757ee88eac91b21c3a68562da6441c2ad15c39" + integrity sha512-8Zd7RwwN7ZufMoWFmc1bwzmQc1RV7/jf/Ua33YL1+P0ZwHoWFOhf/b0lwvAVzi9TB/7oD5zA5yv7A/i2sSTn6Q== dependencies: "@vscode/extension-telemetry" "^0.6.2"