diff --git a/extensions/admin-tool-ext-win/package.json b/extensions/admin-tool-ext-win/package.json index 736fc93393..c081eaabe1 100644 --- a/extensions/admin-tool-ext-win/package.json +++ b/extensions/admin-tool-ext-win/package.json @@ -7,7 +7,7 @@ "preview": true, "license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/extensions/admin-tool-ext-win/license/Azure%20Data%20Studio%20Extension%20-%20Standalone%20(free)%20Use%20Terms.txt", "icon": "images/sqlserver.png", - "aiKey": "AIF-444c3af9-8e69-4462-ab49-4191e6ad1916", + "aiKey": "AIF-5574968e-856d-40d2-af67-c89a14e76412", "engines": { "vscode": "^1.30.1", "azdata": ">=1.8.0" @@ -81,4 +81,4 @@ "publisherDisplayName": "Microsoft", "publisherId": "Microsoft" } -} +} \ No newline at end of file diff --git a/extensions/agent/package.json b/extensions/agent/package.json index e931831e0e..ba03c003c4 100644 --- a/extensions/agent/package.json +++ b/extensions/agent/package.json @@ -7,7 +7,7 @@ "preview": true, "license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/LICENSE.txt", "icon": "images/sqlserver.png", - "aiKey": "AIF-444c3af9-8e69-4462-ab49-4191e6ad1916", + "aiKey": "AIF-5574968e-856d-40d2-af67-c89a14e76412", "engines": { "vscode": "^1.25.0" }, diff --git a/extensions/dacpac/package.json b/extensions/dacpac/package.json index 02539dbdb5..6248dd245a 100644 --- a/extensions/dacpac/package.json +++ b/extensions/dacpac/package.json @@ -11,7 +11,7 @@ }, "license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/LICENSE.txt", "icon": "images/sqlserver.png", - "aiKey": "AIF-444c3af9-8e69-4462-ab49-4191e6ad1916", + "aiKey": "AIF-5574968e-856d-40d2-af67-c89a14e76412", "activationEvents": [ "*" ], @@ -66,4 +66,4 @@ "publisherDisplayName": "Microsoft", "publisherId": "Microsoft" } -} +} \ No newline at end of file diff --git a/extensions/import/package.json b/extensions/import/package.json index eefb2b618f..b2b38b9a3c 100644 --- a/extensions/import/package.json +++ b/extensions/import/package.json @@ -11,7 +11,7 @@ }, "license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/extensions/import/Microsoft_SQL_Server_Import_Extension_and_Tools_Import_Flat_File_Preview.docx", "icon": "images/sqlserver.png", - "aiKey": "AIF-444c3af9-8e69-4462-ab49-4191e6ad1916", + "aiKey": "AIF-5574968e-856d-40d2-af67-c89a14e76412", "activationEvents": [ "*" ], @@ -65,4 +65,4 @@ "publisherDisplayName": "Microsoft", "publisherId": "Microsoft" } -} +} \ No newline at end of file diff --git a/extensions/mssql/package.json b/extensions/mssql/package.json index 314b73c999..fa1ea0b42e 100644 --- a/extensions/mssql/package.json +++ b/extensions/mssql/package.json @@ -2,7 +2,7 @@ "name": "mssql", "version": "0.1.0", "publisher": "Microsoft", - "aiKey": "AIF-444c3af9-8e69-4462-ab49-4191e6ad1916", + "aiKey": "AIF-5574968e-856d-40d2-af67-c89a14e76412", "activationEvents": [ "*" ], @@ -943,4 +943,4 @@ ] } } -} +} \ No newline at end of file diff --git a/extensions/profiler/package.json b/extensions/profiler/package.json index bac6416f9a..f9e0b00c21 100644 --- a/extensions/profiler/package.json +++ b/extensions/profiler/package.json @@ -7,7 +7,7 @@ "preview": true, "license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/LICENSE.txt", "icon": "images/sqlserver.png", - "aiKey": "AIF-444c3af9-8e69-4462-ab49-4191e6ad1916", + "aiKey": "AIF-5574968e-856d-40d2-af67-c89a14e76412", "engines": { "vscode": "0.10.x" }, diff --git a/extensions/resource-deployment/package.json b/extensions/resource-deployment/package.json index 1a53acabd5..6d164a99f7 100644 --- a/extensions/resource-deployment/package.json +++ b/extensions/resource-deployment/package.json @@ -7,7 +7,7 @@ "preview": true, "license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/LICENSE.txt", "icon": "images/sqlserver.png", - "aiKey": "AIF-444c3af9-8e69-4462-ab49-4191e6ad1916", + "aiKey": "AIF-5574968e-856d-40d2-af67-c89a14e76412", "engines": { "vscode": "*", "azdata": ">=1.6.0" diff --git a/extensions/schema-compare/package.json b/extensions/schema-compare/package.json index 0efbe164c3..af2874ffaa 100644 --- a/extensions/schema-compare/package.json +++ b/extensions/schema-compare/package.json @@ -11,7 +11,7 @@ }, "license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/extensions/import/Microsoft_SQL_Server_Import_Extension_and_Tools_Import_Flat_File_Preview.docx", "icon": "images/sqlserver.png", - "aiKey": "AIF-444c3af9-8e69-4462-ab49-4191e6ad1916", + "aiKey": "AIF-5574968e-856d-40d2-af67-c89a14e76412", "activationEvents": [ "*" ], diff --git a/product.json b/product.json index 43b3bf938e..f27e1ab8d9 100644 --- a/product.json +++ b/product.json @@ -25,7 +25,7 @@ "urlProtocol": "azuredatastudio", "enableTelemetry": true, "aiConfig": { - "asimovKey": "AIF-444c3af9-8e69-4462-ab49-4191e6ad1916" + "asimovKey": "AIF-5574968e-856d-40d2-af67-c89a14e76412" }, "sendASmile": { "reportIssueUrl": "https://github.com/Microsoft/azuredatastudio/issues/new?labels=customer%20reported%20issue", diff --git a/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts b/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts index 3a15ecb467..0a2b94413f 100644 --- a/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts +++ b/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts @@ -72,7 +72,7 @@ interface ISharedProcessInitData { logLevel: LogLevel; } -const eventPrefix = 'adsworkbench'; // {{SQL CARBON EDIT}} Use custom event prefix to differentiate from VS Code telemetry events +const eventPrefix = 'monacoworkbench'; class MainProcessService implements IMainProcessService { constructor(private server: Server, private mainRouter: StaticRouter) { } diff --git a/src/vs/code/node/cliProcessMain.ts b/src/vs/code/node/cliProcessMain.ts index fb20e28062..6ddf0125e8 100644 --- a/src/vs/code/node/cliProcessMain.ts +++ b/src/vs/code/node/cliProcessMain.ts @@ -303,7 +303,7 @@ export class Main { } } -const eventPrefix = 'adsworkbench'; // {{SQL CARBON EDIT}} Use custom event prefix to differentiate from VS Code telemetry events +const eventPrefix = 'monacoworkbench'; export async function main(argv: ParsedArgs): Promise { const services = new ServiceCollection(); diff --git a/src/vs/workbench/services/telemetry/browser/telemetryService.ts b/src/vs/workbench/services/telemetry/browser/telemetryService.ts index 3da39beded..27c2c51c7e 100644 --- a/src/vs/workbench/services/telemetry/browser/telemetryService.ts +++ b/src/vs/workbench/services/telemetry/browser/telemetryService.ts @@ -101,7 +101,7 @@ export class WebTelemetryAppender implements ITelemetryAppender { data = validateTelemetryData(data); this._logService.trace(`telemetry/${eventName}`, data); - this._aiClient.trackEvent('adsworkbench/' + eventName, data.properties, data.measurements); // {{SQL CARBON EDIT}} Use custom event prefix to differentiate from VS Code telemetry events + this._aiClient.trackEvent('monacoworkbench/' + eventName, data.properties, data.measurements); } flush(): Promise | undefined { @@ -167,4 +167,4 @@ export class TelemetryService extends Disposable implements ITelemetryService { } } -registerSingleton(ITelemetryService, TelemetryService); +registerSingleton(ITelemetryService, TelemetryService); \ No newline at end of file