ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 18:46:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update ads-extension-telemetry to 1.3.1 (#20724)

Browse Source 
* Update ads-extension-telemetry to 1.3.0

* fix
This commit is contained in:
Charles Gagnon
2022-10-04 23:06:53 -07:00
committed by GitHub
parent 08341c70fd
commit 60c1c8a89f
37 changed files with 92 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/admin-tool-ext-win/package.json
View File

@@ -107,7 +107,7 @@
] ]
}, },
"dependencies": { "dependencies": {
"@microsoft/ads-extension-telemetry": "^1.2.0", "@microsoft/ads-extension-telemetry": "^1.3.1",
"@microsoft/ads-service-downloader": "1.0.4", "@microsoft/ads-service-downloader": "1.0.4",
"vscode-nls": "^4.1.2" "vscode-nls": "^4.1.2"
}, },

2
extensions/admin-tool-ext-win/src/telemetry.ts
View File

@@ -11,7 +11,7 @@ const packageJson = require('../package.json');
let packageInfo = Utils.getPackageInfo(packageJson); let packageInfo = Utils.getPackageInfo(packageJson);
export const TelemetryReporter = new AdsTelemetryReporter(packageInfo.name, packageInfo.version, packageInfo.aiKey); export const TelemetryReporter = new AdsTelemetryReporter<TelemetryViews>(packageInfo.name, packageInfo.version, packageInfo.aiKey);
export enum TelemetryViews { export enum TelemetryViews {
SsmsMinProperties = 'SsmsMinProperties', SsmsMinProperties = 'SsmsMinProperties',

8
extensions/admin-tool-ext-win/yarn.lock
View File

@@ -200,10 +200,10 @@
"@microsoft/applicationinsights-shims" "^2.0.1" "@microsoft/applicationinsights-shims" "^2.0.1"
"@microsoft/dynamicproto-js" "^1.1.6" "@microsoft/dynamicproto-js" "^1.1.6"
"@microsoft/ads-extension-telemetry@^1.2.0": "@microsoft/ads-extension-telemetry@^1.3.1":
version "1.2.0" version "1.3.1"
resolved "https://registry.yarnpkg.com/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.2.0.tgz#f54e464ac887440727fe9862f8ff32be17aeab3a" resolved "https://registry.yarnpkg.com/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.3.1.tgz#fa757ee88eac91b21c3a68562da6441c2ad15c39"
integrity sha512-dEp+RVJYo4uebMLvBJqJF8IABufJRp+PWHZx+3xe6SgAC37oYhcwR/glExhp3Nj3A2v3vjso6YQ/Wd5TG27FPQ== integrity sha512-8Zd7RwwN7ZufMoWFmc1bwzmQc1RV7/jf/Ua33YL1+P0ZwHoWFOhf/b0lwvAVzi9TB/7oD5zA5yv7A/i2sSTn6Q==
dependencies: dependencies:
"@vscode/extension-telemetry" "^0.6.2" "@vscode/extension-telemetry" "^0.6.2"

2
extensions/dacpac/package.json
View File

@@ -92,7 +92,7 @@
} }
}, },
"dependencies": { "dependencies": {
"@microsoft/ads-extension-telemetry": "^1.2.0", "@microsoft/ads-extension-telemetry": "^1.3.1",
"htmlparser2": "^3.10.1", "htmlparser2": "^3.10.1",
"vscode-nls": "^4.0.0" "vscode-nls": "^4.0.0"
}, },

6
extensions/dacpac/src/telemetry.ts
View File

@@ -11,7 +11,7 @@ const packageJson = require('../package.json');
let packageInfo = Utils.getPackageInfo(packageJson); let packageInfo = Utils.getPackageInfo(packageJson);
export const TelemetryReporter = new AdsTelemetryReporter(packageInfo.name, packageInfo.version, packageInfo.aiKey); export const TelemetryReporter = new AdsTelemetryReporter<TelemetryViews, TelemetryAction>(packageInfo.name, packageInfo.version, packageInfo.aiKey);
export enum TelemetryViews { export enum TelemetryViews {
DataTierApplicationWizard = 'DataTierApplicationWizard' DataTierApplicationWizard = 'DataTierApplicationWizard'
@@ -23,5 +23,7 @@ export enum TelemetryAction {
GenerateDeployPlan = 'GenerateDeployPlan', GenerateDeployPlan = 'GenerateDeployPlan',
ExtractDacpac = 'ExtractDacpacOperation', ExtractDacpac = 'ExtractDacpacOperation',
ExportBacpac = 'ExportBacpacOperation', ExportBacpac = 'ExportBacpacOperation',
ImportBacpac = 'ImportBacpacOperation' ImportBacpac = 'ImportBacpacOperation',
ConnectionDialogCancelled = 'ConnectionDialogCancelled',
WizardCanceled = 'WizardCanceled'
} }

6
extensions/dacpac/src/wizard/dataTierApplicationWizard.ts
View File

@@ -115,7 +115,7 @@ export class DataTierApplicationWizard {
// don't open the wizard if connection dialog is cancelled // don't open the wizard if connection dialog is cancelled
if (!this.connection) { if (!this.connection) {
//Reporting Dacpac wizard cancelled event to Telemetry //Reporting Dacpac wizard cancelled event to Telemetry
TelemetryReporter.sendActionEvent(TelemetryViews.DataTierApplicationWizard, 'ConnectionDialogCancelled'); TelemetryReporter.sendActionEvent(TelemetryViews.DataTierApplicationWizard, TelemetryAction.ConnectionDialogCancelled);
return false; return false;
} }
} }
@@ -305,7 +305,7 @@ export class DataTierApplicationWizard {
// Cancel button on click event is using to send the data loss information to telemetry // Cancel button on click event is using to send the data loss information to telemetry
private cancelDataTierApplicationWizard(): void { private cancelDataTierApplicationWizard(): void {
TelemetryReporter.createActionEvent(TelemetryViews.DataTierApplicationWizard, 'WizardCanceled') TelemetryReporter.createActionEvent(TelemetryViews.DataTierApplicationWizard, TelemetryAction.WizardCanceled)
.withAdditionalProperties({ .withAdditionalProperties({
isPotentialDataLoss: this.model.potentialDataLoss?.toString(), isPotentialDataLoss: this.model.potentialDataLoss?.toString(),
page: this.wizard.currentPage.toString(), page: this.wizard.currentPage.toString(),
@@ -477,7 +477,7 @@ export class DataTierApplicationWizard {
return this.dacfxService; 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) { if (result?.success) {
TelemetryReporter.createActionEvent(TelemetryViews.DataTierApplicationWizard, telemetryAction) TelemetryReporter.createActionEvent(TelemetryViews.DataTierApplicationWizard, telemetryAction)
.withAdditionalProperties(additionalProps) .withAdditionalProperties(additionalProps)

8
extensions/dacpac/yarn.lock
View File

@@ -200,10 +200,10 @@
"@microsoft/applicationinsights-shims" "^2.0.1" "@microsoft/applicationinsights-shims" "^2.0.1"
"@microsoft/dynamicproto-js" "^1.1.6" "@microsoft/dynamicproto-js" "^1.1.6"
"@microsoft/ads-extension-telemetry@^1.2.0": "@microsoft/ads-extension-telemetry@^1.3.1":
version "1.2.0" version "1.3.1"
resolved "https://registry.yarnpkg.com/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.2.0.tgz#f54e464ac887440727fe9862f8ff32be17aeab3a" resolved "https://registry.yarnpkg.com/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.3.1.tgz#fa757ee88eac91b21c3a68562da6441c2ad15c39"
integrity sha512-dEp+RVJYo4uebMLvBJqJF8IABufJRp+PWHZx+3xe6SgAC37oYhcwR/glExhp3Nj3A2v3vjso6YQ/Wd5TG27FPQ== integrity sha512-8Zd7RwwN7ZufMoWFmc1bwzmQc1RV7/jf/Ua33YL1+P0ZwHoWFOhf/b0lwvAVzi9TB/7oD5zA5yv7A/i2sSTn6Q==
dependencies: dependencies:
"@vscode/extension-telemetry" "^0.6.2" "@vscode/extension-telemetry" "^0.6.2"

2
extensions/data-workspace/package.json
View File

@@ -178,7 +178,7 @@
}, },
"dependencies": { "dependencies": {
"fast-glob": "^3.2.7", "fast-glob": "^3.2.7",
"@microsoft/ads-extension-telemetry": "^1.2.0", "@microsoft/ads-extension-telemetry": "^1.3.1",
"vscode-nls": "^4.0.0" "vscode-nls": "^4.0.0"
}, },
"devDependencies": { "devDependencies": {

2
extensions/data-workspace/src/common/telemetry.ts
View File

@@ -10,7 +10,7 @@ const packageJson = require('../../package.json');
let packageInfo = utils.getPackageInfo(packageJson)!; let packageInfo = utils.getPackageInfo(packageJson)!;
export const TelemetryReporter = new AdsTelemetryReporter(packageInfo.name, packageInfo.version, packageInfo.aiKey); export const TelemetryReporter = new AdsTelemetryReporter<TelemetryViews, TelemetryActions>(packageInfo.name, packageInfo.version, packageInfo.aiKey);
export enum TelemetryViews { export enum TelemetryViews {

8
extensions/data-workspace/yarn.lock
View File

@@ -200,10 +200,10 @@
"@microsoft/applicationinsights-shims" "^2.0.1" "@microsoft/applicationinsights-shims" "^2.0.1"
"@microsoft/dynamicproto-js" "^1.1.6" "@microsoft/dynamicproto-js" "^1.1.6"
"@microsoft/ads-extension-telemetry@^1.2.0": "@microsoft/ads-extension-telemetry@^1.3.1":
version "1.2.0" version "1.3.1"
resolved "https://registry.yarnpkg.com/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.2.0.tgz#f54e464ac887440727fe9862f8ff32be17aeab3a" resolved "https://registry.yarnpkg.com/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.3.1.tgz#fa757ee88eac91b21c3a68562da6441c2ad15c39"
integrity sha512-dEp+RVJYo4uebMLvBJqJF8IABufJRp+PWHZx+3xe6SgAC37oYhcwR/glExhp3Nj3A2v3vjso6YQ/Wd5TG27FPQ== integrity sha512-8Zd7RwwN7ZufMoWFmc1bwzmQc1RV7/jf/Ua33YL1+P0ZwHoWFOhf/b0lwvAVzi9TB/7oD5zA5yv7A/i2sSTn6Q==
dependencies: dependencies:
"@vscode/extension-telemetry" "^0.6.2" "@vscode/extension-telemetry" "^0.6.2"

2
extensions/notebook/package.json
View File

@@ -761,7 +761,7 @@
}, },
"dependencies": { "dependencies": {
"@jupyterlab/services": "^3.2.1", "@jupyterlab/services": "^3.2.1",
"@microsoft/ads-extension-telemetry": "^1.2.0", "@microsoft/ads-extension-telemetry": "^1.3.1",
"adm-zip": "^0.4.14", "adm-zip": "^0.4.14",
"error-ex": "^1.3.1", "error-ex": "^1.3.1",
"fast-glob": "^3.1.0", "fast-glob": "^3.1.0",

2
extensions/notebook/src/telemetry.ts
View File

@@ -6,7 +6,7 @@
import AdsTelemetryReporter, { TelemetryEventMeasures, TelemetryEventProperties } from '@microsoft/ads-extension-telemetry'; import AdsTelemetryReporter, { TelemetryEventMeasures, TelemetryEventProperties } from '@microsoft/ads-extension-telemetry';
const packageJson = require('../package.json'); const packageJson = require('../package.json');
export const TelemetryReporter = new AdsTelemetryReporter(packageJson.name, packageJson.version, packageJson.aiKey); export const TelemetryReporter = new AdsTelemetryReporter<NbTelemetryView, NbTelemetryAction>(packageJson.name, packageJson.version, packageJson.aiKey);
export enum NbTelemetryView { export enum NbTelemetryView {
Book = 'Book', Book = 'Book',

8
extensions/notebook/yarn.lock
View File

@@ -239,10 +239,10 @@
"@microsoft/applicationinsights-shims" "^2.0.1" "@microsoft/applicationinsights-shims" "^2.0.1"
"@microsoft/dynamicproto-js" "^1.1.6" "@microsoft/dynamicproto-js" "^1.1.6"
"@microsoft/ads-extension-telemetry@^1.2.0": "@microsoft/ads-extension-telemetry@^1.3.1":
version "1.2.0" version "1.3.1"
resolved "https://registry.yarnpkg.com/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.2.0.tgz#f54e464ac887440727fe9862f8ff32be17aeab3a" resolved "https://registry.yarnpkg.com/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.3.1.tgz#fa757ee88eac91b21c3a68562da6441c2ad15c39"
integrity sha512-dEp+RVJYo4uebMLvBJqJF8IABufJRp+PWHZx+3xe6SgAC37oYhcwR/glExhp3Nj3A2v3vjso6YQ/Wd5TG27FPQ== integrity sha512-8Zd7RwwN7ZufMoWFmc1bwzmQc1RV7/jf/Ua33YL1+P0ZwHoWFOhf/b0lwvAVzi9TB/7oD5zA5yv7A/i2sSTn6Q==
dependencies: dependencies:
"@vscode/extension-telemetry" "^0.6.2" "@vscode/extension-telemetry" "^0.6.2"

2
extensions/query-history/package.json
View File

@@ -209,7 +209,7 @@
} }
}, },
"dependencies": { "dependencies": {
"@microsoft/ads-extension-telemetry": "1.2.0", "@microsoft/ads-extension-telemetry": "^1.3.1",
"vscode-nls": "^4.1.2" "vscode-nls": "^4.1.2"
}, },
"devDependencies": { "devDependencies": {

10
extensions/query-history/src/queryHistoryProvider.ts
View File

@@ -12,7 +12,7 @@ import * as fs from 'fs';
import * as path from 'path'; import * as path from 'path';
import * as crypto from 'crypto'; import * as crypto from 'crypto';
import * as loc from './localizedConstants'; 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_IV_KEY = 'queryHistory.storage-iv';
const STORAGE_KEY_KEY = 'queryHistory.storage-key'; const STORAGE_KEY_KEY = 'queryHistory.storage-key';
@@ -51,7 +51,7 @@ export class QueryHistoryProvider implements vscode.TreeDataProvider<QueryHistor
constructor(private _context: vscode.ExtensionContext, storageUri: vscode.Uri) { constructor(private _context: vscode.ExtensionContext, storageUri: vscode.Uri) {
this._historyStorageFile = path.join(storageUri.fsPath, HISTORY_STORAGE_FILE_NAME); this._historyStorageFile = path.join(storageUri.fsPath, HISTORY_STORAGE_FILE_NAME);
// Kick off initialization but then continue on since that may take a while and we don't want to block extension activation // Kick off initialization but then continue on since that may take a while and we don't want to block extension activation
const initializeAction = new TimedAction(TelemetryViews.QueryHistoryProvider, TelemetryActions.Initialize); const initializeAction = TelemetryReporter.createTimedAction(TelemetryViews.QueryHistoryProvider, TelemetryActions.Initialize);
this._initPromise = this.initialize().then(() => initializeAction.send()); this._initPromise = this.initialize().then(() => initializeAction.send());
this._disposables.push(vscode.workspace.onDidChangeConfiguration(async e => { this._disposables.push(vscode.workspace.onDidChangeConfiguration(async e => {
if (e.affectsConfiguration(QUERY_HISTORY_CONFIG_SECTION) || e.affectsConfiguration(MAX_ENTRIES_CONFIG_SECTION)) { if (e.affectsConfiguration(QUERY_HISTORY_CONFIG_SECTION) || e.affectsConfiguration(MAX_ENTRIES_CONFIG_SECTION)) {
@@ -147,9 +147,7 @@ export class QueryHistoryProvider implements vscode.TreeDataProvider<QueryHistor
const cipher = crypto.createCipheriv(STORAGE_ENCRYPTION_ALGORITHM, key!, iv!); const cipher = crypto.createCipheriv(STORAGE_ENCRYPTION_ALGORITHM, key!, iv!);
const stringifiedItems = JSON.stringify(this._queryHistoryItems); const stringifiedItems = JSON.stringify(this._queryHistoryItems);
const encryptedText = Buffer.concat([cipher.update(Buffer.from(stringifiedItems)), cipher.final()]); const encryptedText = Buffer.concat([cipher.update(Buffer.from(stringifiedItems)), cipher.final()]);
const writeStorageFileAction = new TimedAction(TelemetryViews.QueryHistoryProvider, TelemetryActions.WriteStorageFile, const writeStorageFileAction = TelemetryReporter.createTimedAction(TelemetryViews.QueryHistoryProvider, TelemetryActions.WriteStorageFile).withAdditionalMeasures({
{},
{
ItemCount: this._queryHistoryItems.length, ItemCount: this._queryHistoryItems.length,
ItemLengthChars: stringifiedItems.length ItemLengthChars: stringifiedItems.length
}); });
@@ -171,7 +169,7 @@ export class QueryHistoryProvider implements vscode.TreeDataProvider<QueryHistor
try { try {
const readStorageFileAction = new TimedAction(TelemetryViews.QueryHistoryProvider, TelemetryActions.ReadStorageFile); const readStorageFileAction = TelemetryReporter.createTimedAction(TelemetryViews.QueryHistoryProvider, TelemetryActions.ReadStorageFile);
// Read and decrypt any previous history items // Read and decrypt any previous history items
const encryptedItems = await fs.promises.readFile(this._historyStorageFile); const encryptedItems = await fs.promises.readFile(this._historyStorageFile);
readStorageFileAction.send(); readStorageFileAction.send();

46
extensions/query-history/src/telemetry.ts
View File

@@ -3,7 +3,7 @@
* Licensed under the Source EULA. See License.txt in the project root for license information. * Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/ *--------------------------------------------------------------------------------------------*/
import AdsTelemetryReporter, { TelemetryEventMeasures, TelemetryEventProperties } from '@microsoft/ads-extension-telemetry'; import AdsTelemetryReporter from '@microsoft/ads-extension-telemetry';
export interface PackageInfo { export interface PackageInfo {
name: string; name: string;
@@ -13,49 +13,7 @@ export interface PackageInfo {
const packageInfo = require('../package.json') as PackageInfo; const packageInfo = require('../package.json') as PackageInfo;
export const TelemetryReporter = new AdsTelemetryReporter(packageInfo.name, packageInfo.version, packageInfo.aiKey); export const TelemetryReporter = new AdsTelemetryReporter<TelemetryViews, TelemetryActions>(packageInfo.name, packageInfo.version, packageInfo.aiKey);
/**
* A helper class to send an Action event with a duration, timer starts on construction and ends when send() is called.
*/
export class TimedAction {
/**
* Additional properties to send along with the final message once send is called.
*/
public readonly additionalProperties: TelemetryEventProperties = {};
/**
* Additional measures to send along with the final message once send is called.
*/
public readonly additionalMeasures: TelemetryEventMeasures = {};
private _start: number = Date.now();
/**
* Creates a new TimedAction and sets the start time to Date.now().
* @param _view The view this action originates from
* @param _action The name of the action
* @param properties Additional properties to send along with the final message once send is called
* @param measures Additional measures to send along with the final message once send is called
*/
constructor(private _view: TelemetryViews, private _action: TelemetryActions, properties: TelemetryEventProperties = {}, measures: TelemetryEventMeasures = {}) {
Object.assign(this.additionalProperties, properties);
Object.assign(this.additionalMeasures, measures);
}
/**
* Sends the event with the duration being the difference between when this TimedAction was created and now.
* @param properties Additional properties to send along with the event
* @param measures Additional measures to send along with the event
*/
public send(properties: TelemetryEventProperties = {}, measures: TelemetryEventMeasures = {}): void {
Object.assign(this.additionalProperties, properties);
Object.assign(this.additionalMeasures, measures);
TelemetryReporter.createActionEvent(this._view, this._action, undefined, undefined, Date.now() - this._start)
.withAdditionalProperties(this.additionalProperties)
.withAdditionalMeasurements(this.additionalMeasures)
.send();
}
}
/** /**
* Send an event indicating that a setting changed along with the new and old values. Core has a setting changed * Send an event indicating that a setting changed along with the new and old values. Core has a setting changed

8
extensions/query-history/yarn.lock
View File

@@ -246,10 +246,10 @@
"@microsoft/applicationinsights-shims" "^2.0.1" "@microsoft/applicationinsights-shims" "^2.0.1"
"@microsoft/dynamicproto-js" "^1.1.6" "@microsoft/dynamicproto-js" "^1.1.6"
"@microsoft/ads-extension-telemetry@1.2.0": "@microsoft/ads-extension-telemetry@^1.3.1":
version "1.2.0" version "1.3.1"
resolved "https://registry.yarnpkg.com/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.2.0.tgz#f54e464ac887440727fe9862f8ff32be17aeab3a" resolved "https://registry.yarnpkg.com/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.3.1.tgz#fa757ee88eac91b21c3a68562da6441c2ad15c39"
integrity sha512-dEp+RVJYo4uebMLvBJqJF8IABufJRp+PWHZx+3xe6SgAC37oYhcwR/glExhp3Nj3A2v3vjso6YQ/Wd5TG27FPQ== integrity sha512-8Zd7RwwN7ZufMoWFmc1bwzmQc1RV7/jf/Ua33YL1+P0ZwHoWFOhf/b0lwvAVzi9TB/7oD5zA5yv7A/i2sSTn6Q==
dependencies: dependencies:
"@vscode/extension-telemetry" "^0.6.2" "@vscode/extension-telemetry" "^0.6.2"

2
extensions/resource-deployment/package.json
View File

@@ -524,7 +524,7 @@
] ]
}, },
"dependencies": { "dependencies": {
"@microsoft/ads-extension-telemetry": "^1.2.0", "@microsoft/ads-extension-telemetry": "^1.3.1",
"axios": "^0.27.2", "axios": "^0.27.2",
"linux-release-info": "^2.0.0", "linux-release-info": "^2.0.0",
"promisify-child-process": "^3.1.1", "promisify-child-process": "^3.1.1",

2
extensions/resource-deployment/src/services/telemetryService.ts
View File

@@ -8,7 +8,7 @@ import AdsTelemetryReporter from '@microsoft/ads-extension-telemetry';
const packageJson = vscode.extensions.getExtension('Microsoft.resource-deployment')!.packageJSON; 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<TelemetryView, TelemetryAction>(packageJson.name, packageJson.version, packageJson.aiKey);
export enum TelemetryView { export enum TelemetryView {
ResourceTypeWizard = 'ResourceTypeWizard' ResourceTypeWizard = 'ResourceTypeWizard'

8
extensions/resource-deployment/yarn.lock
View File

@@ -207,10 +207,10 @@
"@microsoft/applicationinsights-shims" "^2.0.1" "@microsoft/applicationinsights-shims" "^2.0.1"
"@microsoft/dynamicproto-js" "^1.1.6" "@microsoft/dynamicproto-js" "^1.1.6"
"@microsoft/ads-extension-telemetry@^1.2.0": "@microsoft/ads-extension-telemetry@^1.3.1":
version "1.2.0" version "1.3.1"
resolved "https://registry.yarnpkg.com/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.2.0.tgz#f54e464ac887440727fe9862f8ff32be17aeab3a" resolved "https://registry.yarnpkg.com/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.3.1.tgz#fa757ee88eac91b21c3a68562da6441c2ad15c39"
integrity sha512-dEp+RVJYo4uebMLvBJqJF8IABufJRp+PWHZx+3xe6SgAC37oYhcwR/glExhp3Nj3A2v3vjso6YQ/Wd5TG27FPQ== integrity sha512-8Zd7RwwN7ZufMoWFmc1bwzmQc1RV7/jf/Ua33YL1+P0ZwHoWFOhf/b0lwvAVzi9TB/7oD5zA5yv7A/i2sSTn6Q==
dependencies: dependencies:
"@vscode/extension-telemetry" "^0.6.2" "@vscode/extension-telemetry" "^0.6.2"

2
extensions/schema-compare/package.json
View File

@@ -111,7 +111,7 @@
} }
}, },
"dependencies": { "dependencies": {
"@microsoft/ads-extension-telemetry": "^1.2.0", "@microsoft/ads-extension-telemetry": "^1.3.1",
"vscode-nls": "^4.0.0" "vscode-nls": "^4.0.0"
}, },
"devDependencies": { "devDependencies": {

2
extensions/schema-compare/src/telemetry.ts
View File

@@ -11,7 +11,7 @@ const packageJson = require('../package.json');
let packageInfo = Utils.getPackageInfo(packageJson); let packageInfo = Utils.getPackageInfo(packageJson);
export const TelemetryReporter = new AdsTelemetryReporter(packageInfo.name, packageInfo.version, packageInfo.aiKey); export const TelemetryReporter = new AdsTelemetryReporter<TelemetryViews>(packageInfo.name, packageInfo.version, packageInfo.aiKey);
export enum TelemetryViews { export enum TelemetryViews {
SchemaCompareMainWindow = 'SchemaCompareMainWindow', SchemaCompareMainWindow = 'SchemaCompareMainWindow',

8
extensions/schema-compare/yarn.lock
View File

@@ -200,10 +200,10 @@
"@microsoft/applicationinsights-shims" "^2.0.1" "@microsoft/applicationinsights-shims" "^2.0.1"
"@microsoft/dynamicproto-js" "^1.1.6" "@microsoft/dynamicproto-js" "^1.1.6"
"@microsoft/ads-extension-telemetry@^1.2.0": "@microsoft/ads-extension-telemetry@^1.3.1":
version "1.2.0" version "1.3.1"
resolved "https://registry.yarnpkg.com/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.2.0.tgz#f54e464ac887440727fe9862f8ff32be17aeab3a" resolved "https://registry.yarnpkg.com/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.3.1.tgz#fa757ee88eac91b21c3a68562da6441c2ad15c39"
integrity sha512-dEp+RVJYo4uebMLvBJqJF8IABufJRp+PWHZx+3xe6SgAC37oYhcwR/glExhp3Nj3A2v3vjso6YQ/Wd5TG27FPQ== integrity sha512-8Zd7RwwN7ZufMoWFmc1bwzmQc1RV7/jf/Ua33YL1+P0ZwHoWFOhf/b0lwvAVzi9TB/7oD5zA5yv7A/i2sSTn6Q==
dependencies: dependencies:
"@vscode/extension-telemetry" "^0.6.2" "@vscode/extension-telemetry" "^0.6.2"

2
extensions/sql-assessment/package.json
View File

@@ -45,7 +45,7 @@
}, },
"dependencies": { "dependencies": {
"vscode-nls": "^4.1.2", "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" "vscode-languageclient": "^5.3.0-next.1"
}, },
"__metadata": { "__metadata": {

2
extensions/sql-assessment/src/telemetry.ts
View File

@@ -6,7 +6,7 @@
import AdsTelemetryReporter from '@microsoft/ads-extension-telemetry'; import AdsTelemetryReporter from '@microsoft/ads-extension-telemetry';
const packageJson = require('../package.json'); const packageJson = require('../package.json');
export const TelemetryReporter = new AdsTelemetryReporter(packageJson.name, packageJson.version, packageJson.aiKey); export const TelemetryReporter = new AdsTelemetryReporter<string, SqlTelemetryActions>(packageJson.name, packageJson.version, packageJson.aiKey);
export const SqlAssessmentTelemetryView = 'SqlAssessmentTab'; export const SqlAssessmentTelemetryView = 'SqlAssessmentTab';

8
extensions/sql-assessment/yarn.lock
View File

@@ -20,10 +20,10 @@
"@microsoft/applicationinsights-shims" "^2.0.1" "@microsoft/applicationinsights-shims" "^2.0.1"
"@microsoft/dynamicproto-js" "^1.1.6" "@microsoft/dynamicproto-js" "^1.1.6"
"@microsoft/ads-extension-telemetry@^1.2.0": "@microsoft/ads-extension-telemetry@^1.3.1":
version "1.2.0" version "1.3.1"
resolved "https://registry.yarnpkg.com/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.2.0.tgz#f54e464ac887440727fe9862f8ff32be17aeab3a" resolved "https://registry.yarnpkg.com/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.3.1.tgz#fa757ee88eac91b21c3a68562da6441c2ad15c39"
integrity sha512-dEp+RVJYo4uebMLvBJqJF8IABufJRp+PWHZx+3xe6SgAC37oYhcwR/glExhp3Nj3A2v3vjso6YQ/Wd5TG27FPQ== integrity sha512-8Zd7RwwN7ZufMoWFmc1bwzmQc1RV7/jf/Ua33YL1+P0ZwHoWFOhf/b0lwvAVzi9TB/7oD5zA5yv7A/i2sSTn6Q==
dependencies: dependencies:
"@vscode/extension-telemetry" "^0.6.2" "@vscode/extension-telemetry" "^0.6.2"

2
extensions/sql-bindings/package.json
View File

@@ -63,7 +63,7 @@
} }
}, },
"dependencies": { "dependencies": {
"@microsoft/ads-extension-telemetry": "^1.2.0", "@microsoft/ads-extension-telemetry": "^1.3.1",
"@microsoft/vscode-azext-utils": "^0.1.1", "@microsoft/vscode-azext-utils": "^0.1.1",
"fast-glob": "^3.2.7", "fast-glob": "^3.2.7",
"promisify-child-process": "^3.1.1", "promisify-child-process": "^3.1.1",

4
extensions/sql-bindings/src/common/telemetry.ts
View File

@@ -7,7 +7,7 @@ import { getPackageInfo } from './utils';
const packageInfo = getPackageInfo()!; const packageInfo = getPackageInfo()!;
export const TelemetryReporter = new AdsTelemetryReporter(packageInfo.name, packageInfo.version, packageInfo.aiKey); export const TelemetryReporter = new AdsTelemetryReporter<TelemetryViews, TelemetryActions | CreateAzureFunctionStep>(packageInfo.name, packageInfo.version, packageInfo.aiKey);
export enum TelemetryViews { export enum TelemetryViews {
SqlBindingsQuickPick = 'SqlBindingsQuickPick', SqlBindingsQuickPick = 'SqlBindingsQuickPick',
@@ -51,6 +51,8 @@ export enum CreateAzureFunctionStep {
getTemplateId = 'getTemplateId', getTemplateId = 'getTemplateId',
getConnectionStringSettingName = 'getConnectionStringSettingName', getConnectionStringSettingName = 'getConnectionStringSettingName',
promptForIncludePassword = 'promptForIncludePassword', promptForIncludePassword = 'promptForIncludePassword',
createFunctionAPI = 'createFunctionAPI',
finishCreateFunction = 'finishCreateFunction'
} }
export enum ExitReason { export enum ExitReason {

10
extensions/sql-bindings/src/services/azureFunctionsService.ts
View File

@@ -21,7 +21,7 @@ export async function createAzureFunction(node?: ITreeNodeInfo): Promise<void> {
// telemetry properties for create azure function // telemetry properties for create azure function
let sessionId: string = uuid.v4(); let sessionId: string = uuid.v4();
let propertyBag: { [key: string]: string } = { sessionId: sessionId }; let propertyBag: { [key: string]: string } = { sessionId: sessionId };
let telemetryStep: string = ''; let telemetryStep: CreateAzureFunctionStep | undefined = undefined;
let exitReason: string = ExitReason.cancelled; let exitReason: string = ExitReason.cancelled;
TelemetryReporter.sendActionEvent(TelemetryViews.CreateAzureFunctionWithSqlBinding, TelemetryActions.startCreateAzureFunctionWithSqlBinding); TelemetryReporter.sendActionEvent(TelemetryViews.CreateAzureFunctionWithSqlBinding, TelemetryActions.startCreateAzureFunctionWithSqlBinding);
let connectionInfo: IConnectionInfo | undefined; let connectionInfo: IConnectionInfo | undefined;
@@ -239,7 +239,7 @@ export async function createAzureFunction(node?: ITreeNodeInfo): Promise<void> {
let connectionStringExecuteStep = createAddConnectionStringStep(projectFolder, connectionInfo, connectionStringInfo.connectionStringSettingName); let connectionStringExecuteStep = createAddConnectionStringStep(projectFolder, connectionInfo, connectionStringInfo.connectionStringSettingName);
// create C# Azure Function with SQL Binding // create C# Azure Function with SQL Binding
telemetryStep = 'createFunctionAPI'; telemetryStep = CreateAzureFunctionStep.createFunctionAPI;
await azureFunctionApi.createFunction({ await azureFunctionApi.createFunction({
language: 'C#', language: 'C#',
targetFramework: 'netcoreapp3.1', targetFramework: 'netcoreapp3.1',
@@ -263,7 +263,7 @@ export async function createAzureFunction(node?: ITreeNodeInfo): Promise<void> {
.withAdditionalProperties(propertyBag) .withAdditionalProperties(propertyBag)
.withConnectionInfo(connectionInfo).send(); .withConnectionInfo(connectionInfo).send();
telemetryStep = 'finishCreateFunction'; telemetryStep = CreateAzureFunctionStep.finishCreateFunction;
propertyBag.telemetryStep = telemetryStep; propertyBag.telemetryStep = telemetryStep;
exitReason = ExitReason.finishCreate; exitReason = ExitReason.finishCreate;
TelemetryReporter.createActionEvent(TelemetryViews.CreateAzureFunctionWithSqlBinding, TelemetryActions.finishCreateAzureFunctionWithSqlBinding) TelemetryReporter.createActionEvent(TelemetryViews.CreateAzureFunctionWithSqlBinding, TelemetryActions.finishCreateAzureFunctionWithSqlBinding)
@@ -271,7 +271,7 @@ export async function createAzureFunction(node?: ITreeNodeInfo): Promise<void> {
.withConnectionInfo(connectionInfo).send(); .withConnectionInfo(connectionInfo).send();
} catch (error) { } catch (error) {
let errorType = utils.getErrorType(error); let errorType = utils.getErrorType(error);
propertyBag.telemetryStep = telemetryStep; propertyBag.telemetryStep = telemetryStep ?? '';
// an error occurred during createFunction // an error occurred during createFunction
exitReason = ExitReason.error; exitReason = ExitReason.error;
void vscode.window.showErrorMessage(constants.errorNewAzureFunction(error)); void vscode.window.showErrorMessage(constants.errorNewAzureFunction(error));
@@ -279,7 +279,7 @@ export async function createAzureFunction(node?: ITreeNodeInfo): Promise<void> {
.withAdditionalProperties(propertyBag).send(); .withAdditionalProperties(propertyBag).send();
return; return;
} finally { } finally {
propertyBag.telemetryStep = telemetryStep; propertyBag.telemetryStep = telemetryStep ?? '';
propertyBag.exitReason = exitReason; propertyBag.exitReason = exitReason;
TelemetryReporter.createActionEvent(TelemetryViews.CreateAzureFunctionWithSqlBinding, TelemetryActions.exitCreateAzureFunctionQuickpick) TelemetryReporter.createActionEvent(TelemetryViews.CreateAzureFunctionWithSqlBinding, TelemetryActions.exitCreateAzureFunctionQuickpick)
.withAdditionalProperties(propertyBag).send(); .withAdditionalProperties(propertyBag).send();

8
extensions/sql-bindings/yarn.lock
View File

@@ -240,10 +240,10 @@
"@microsoft/applicationinsights-shims" "^2.0.1" "@microsoft/applicationinsights-shims" "^2.0.1"
"@microsoft/dynamicproto-js" "^1.1.6" "@microsoft/dynamicproto-js" "^1.1.6"
"@microsoft/ads-extension-telemetry@^1.2.0": "@microsoft/ads-extension-telemetry@^1.3.1":
version "1.2.0" version "1.3.1"
resolved "https://registry.yarnpkg.com/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.2.0.tgz#f54e464ac887440727fe9862f8ff32be17aeab3a" resolved "https://registry.yarnpkg.com/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.3.1.tgz#fa757ee88eac91b21c3a68562da6441c2ad15c39"
integrity sha512-dEp+RVJYo4uebMLvBJqJF8IABufJRp+PWHZx+3xe6SgAC37oYhcwR/glExhp3Nj3A2v3vjso6YQ/Wd5TG27FPQ== integrity sha512-8Zd7RwwN7ZufMoWFmc1bwzmQc1RV7/jf/Ua33YL1+P0ZwHoWFOhf/b0lwvAVzi9TB/7oD5zA5yv7A/i2sSTn6Q==
dependencies: dependencies:
"@vscode/extension-telemetry" "^0.6.2" "@vscode/extension-telemetry" "^0.6.2"

2
extensions/sql-database-projects/package.json
View File

@@ -478,7 +478,7 @@
} }
}, },
"dependencies": { "dependencies": {
"@microsoft/ads-extension-telemetry": "^1.2.0", "@microsoft/ads-extension-telemetry": "^1.3.1",
"@xmldom/xmldom": "^0.8.2", "@xmldom/xmldom": "^0.8.2",
"axios": "^0.27.2", "axios": "^0.27.2",
"extract-zip": "^2.0.1", "extract-zip": "^2.0.1",

6
extensions/sql-database-projects/src/common/telemetry.ts
View File

@@ -9,7 +9,7 @@ import { getPackageInfo } from './utils';
const packageInfo = getPackageInfo()!; const packageInfo = getPackageInfo()!;
export const TelemetryReporter = new AdsTelemetryReporter(packageInfo.name, packageInfo.version, packageInfo.aiKey); export const TelemetryReporter = new AdsTelemetryReporter<TelemetryViews, TelemetryActions>(packageInfo.name, packageInfo.version, packageInfo.aiKey);
export enum TelemetryViews { export enum TelemetryViews {
@@ -45,5 +45,7 @@ export enum TelemetryActions {
publishOptionsOpened = 'publishOptionsOpened', publishOptionsOpened = 'publishOptionsOpened',
resetOptions = 'resetOptions', resetOptions = 'resetOptions',
optionsChanged = 'optionsChanged', optionsChanged = 'optionsChanged',
profileLoaded = 'profileLoaded' profileLoaded = 'profileLoaded',
SchemaComparisonFinished = 'SchemaComparisonFinished',
SchemaComparisonStarted = 'SchemaComparisonStarted'
} }

4
extensions/sql-database-projects/src/controllers/projectController.ts
View File

@@ -1602,7 +1602,7 @@ export class ProjectsController {
target.targetScripts = await this.getProjectScriptFiles(target.projectFilePath); target.targetScripts = await this.getProjectScriptFiles(target.projectFilePath);
target.dataSchemaProvider = await this.getProjectDatabaseSchemaProvider(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 // Perform schema comparison. Results are cached in SqlToolsService under the operationId
const comparisonResult: mssql.SchemaCompareResult = await service.schemaCompare( const comparisonResult: mssql.SchemaCompareResult = await service.schemaCompare(
@@ -1618,7 +1618,7 @@ export class ProjectsController {
return; return;
} }
TelemetryReporter.createActionEvent(TelemetryViews.ProjectController, 'SchemaComparisonFinished') TelemetryReporter.createActionEvent(TelemetryViews.ProjectController, TelemetryActions.SchemaComparisonFinished)
.withAdditionalProperties({ .withAdditionalProperties({
'endTime': Date.now().toString(), 'endTime': Date.now().toString(),
'operationId': comparisonResult.operationId 'operationId': comparisonResult.operationId

8
extensions/sql-database-projects/yarn.lock
View File

@@ -240,10 +240,10 @@
"@microsoft/applicationinsights-shims" "^2.0.1" "@microsoft/applicationinsights-shims" "^2.0.1"
"@microsoft/dynamicproto-js" "^1.1.6" "@microsoft/dynamicproto-js" "^1.1.6"
"@microsoft/ads-extension-telemetry@^1.2.0": "@microsoft/ads-extension-telemetry@^1.3.1":
version "1.2.0" version "1.3.1"
resolved "https://registry.npmjs.org/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.2.0.tgz" resolved "https://registry.yarnpkg.com/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.3.1.tgz#fa757ee88eac91b21c3a68562da6441c2ad15c39"
integrity sha512-dEp+RVJYo4uebMLvBJqJF8IABufJRp+PWHZx+3xe6SgAC37oYhcwR/glExhp3Nj3A2v3vjso6YQ/Wd5TG27FPQ== integrity sha512-8Zd7RwwN7ZufMoWFmc1bwzmQc1RV7/jf/Ua33YL1+P0ZwHoWFOhf/b0lwvAVzi9TB/7oD5zA5yv7A/i2sSTn6Q==
dependencies: dependencies:
"@vscode/extension-telemetry" "^0.6.2" "@vscode/extension-telemetry" "^0.6.2"

2
extensions/sql-migration/package.json
View File

@@ -153,7 +153,7 @@
] ]
}, },
"dependencies": { "dependencies": {
"@microsoft/ads-extension-telemetry": "^1.2.0", "@microsoft/ads-extension-telemetry": "^1.3.1",
"uuid": "^8.3.2", "uuid": "^8.3.2",
"vscode-nls": "^4.1.2" "vscode-nls": "^4.1.2"
}, },

2
extensions/sql-migration/src/telemtery.ts
View File

@@ -11,7 +11,7 @@ let packageInfo = {
aiKey: packageJson.aiKey aiKey: packageJson.aiKey
}; };
export const TelemetryReporter = new AdsTelemetryReporter(packageInfo.name, packageInfo.version, packageInfo.aiKey); export const TelemetryReporter = new AdsTelemetryReporter<TelemetryViews, TelemetryAction>(packageInfo.name, packageInfo.version, packageInfo.aiKey);
export enum TelemetryViews { export enum TelemetryViews {
SqlServerDashboard = 'SqlServerDashboard', SqlServerDashboard = 'SqlServerDashboard',

8
extensions/sql-migration/yarn.lock
View File

@@ -20,10 +20,10 @@
"@microsoft/applicationinsights-shims" "^2.0.1" "@microsoft/applicationinsights-shims" "^2.0.1"
"@microsoft/dynamicproto-js" "^1.1.6" "@microsoft/dynamicproto-js" "^1.1.6"
"@microsoft/ads-extension-telemetry@^1.2.0": "@microsoft/ads-extension-telemetry@^1.3.1":
version "1.2.0" version "1.3.1"
resolved "https://registry.yarnpkg.com/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.2.0.tgz#f54e464ac887440727fe9862f8ff32be17aeab3a" resolved "https://registry.yarnpkg.com/@microsoft/ads-extension-telemetry/-/ads-extension-telemetry-1.3.1.tgz#fa757ee88eac91b21c3a68562da6441c2ad15c39"
integrity sha512-dEp+RVJYo4uebMLvBJqJF8IABufJRp+PWHZx+3xe6SgAC37oYhcwR/glExhp3Nj3A2v3vjso6YQ/Wd5TG27FPQ== integrity sha512-8Zd7RwwN7ZufMoWFmc1bwzmQc1RV7/jf/Ua33YL1+P0ZwHoWFOhf/b0lwvAVzi9TB/7oD5zA5yv7A/i2sSTn6Q==
dependencies: dependencies:
"@vscode/extension-telemetry" "^0.6.2" "@vscode/extension-telemetry" "^0.6.2"