mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-17 02:51:36 -05:00
This reverts commit 7adb8dd74b.
This commit is contained in:
@@ -7,7 +7,7 @@
|
|||||||
"preview": true,
|
"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",
|
"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",
|
"icon": "images/sqlserver.png",
|
||||||
"aiKey": "AIF-444c3af9-8e69-4462-ab49-4191e6ad1916",
|
"aiKey": "AIF-5574968e-856d-40d2-af67-c89a14e76412",
|
||||||
"engines": {
|
"engines": {
|
||||||
"vscode": "^1.30.1",
|
"vscode": "^1.30.1",
|
||||||
"azdata": ">=1.8.0"
|
"azdata": ">=1.8.0"
|
||||||
@@ -81,4 +81,4 @@
|
|||||||
"publisherDisplayName": "Microsoft",
|
"publisherDisplayName": "Microsoft",
|
||||||
"publisherId": "Microsoft"
|
"publisherId": "Microsoft"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -7,7 +7,7 @@
|
|||||||
"preview": true,
|
"preview": true,
|
||||||
"license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/LICENSE.txt",
|
"license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/LICENSE.txt",
|
||||||
"icon": "images/sqlserver.png",
|
"icon": "images/sqlserver.png",
|
||||||
"aiKey": "AIF-444c3af9-8e69-4462-ab49-4191e6ad1916",
|
"aiKey": "AIF-5574968e-856d-40d2-af67-c89a14e76412",
|
||||||
"engines": {
|
"engines": {
|
||||||
"vscode": "^1.25.0"
|
"vscode": "^1.25.0"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
},
|
},
|
||||||
"license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/LICENSE.txt",
|
"license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/LICENSE.txt",
|
||||||
"icon": "images/sqlserver.png",
|
"icon": "images/sqlserver.png",
|
||||||
"aiKey": "AIF-444c3af9-8e69-4462-ab49-4191e6ad1916",
|
"aiKey": "AIF-5574968e-856d-40d2-af67-c89a14e76412",
|
||||||
"activationEvents": [
|
"activationEvents": [
|
||||||
"*"
|
"*"
|
||||||
],
|
],
|
||||||
@@ -66,4 +66,4 @@
|
|||||||
"publisherDisplayName": "Microsoft",
|
"publisherDisplayName": "Microsoft",
|
||||||
"publisherId": "Microsoft"
|
"publisherId": "Microsoft"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -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",
|
"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",
|
"icon": "images/sqlserver.png",
|
||||||
"aiKey": "AIF-444c3af9-8e69-4462-ab49-4191e6ad1916",
|
"aiKey": "AIF-5574968e-856d-40d2-af67-c89a14e76412",
|
||||||
"activationEvents": [
|
"activationEvents": [
|
||||||
"*"
|
"*"
|
||||||
],
|
],
|
||||||
@@ -65,4 +65,4 @@
|
|||||||
"publisherDisplayName": "Microsoft",
|
"publisherDisplayName": "Microsoft",
|
||||||
"publisherId": "Microsoft"
|
"publisherId": "Microsoft"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2,7 +2,7 @@
|
|||||||
"name": "mssql",
|
"name": "mssql",
|
||||||
"version": "0.1.0",
|
"version": "0.1.0",
|
||||||
"publisher": "Microsoft",
|
"publisher": "Microsoft",
|
||||||
"aiKey": "AIF-444c3af9-8e69-4462-ab49-4191e6ad1916",
|
"aiKey": "AIF-5574968e-856d-40d2-af67-c89a14e76412",
|
||||||
"activationEvents": [
|
"activationEvents": [
|
||||||
"*"
|
"*"
|
||||||
],
|
],
|
||||||
@@ -943,4 +943,4 @@
|
|||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -7,7 +7,7 @@
|
|||||||
"preview": true,
|
"preview": true,
|
||||||
"license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/LICENSE.txt",
|
"license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/LICENSE.txt",
|
||||||
"icon": "images/sqlserver.png",
|
"icon": "images/sqlserver.png",
|
||||||
"aiKey": "AIF-444c3af9-8e69-4462-ab49-4191e6ad1916",
|
"aiKey": "AIF-5574968e-856d-40d2-af67-c89a14e76412",
|
||||||
"engines": {
|
"engines": {
|
||||||
"vscode": "0.10.x"
|
"vscode": "0.10.x"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
"preview": true,
|
"preview": true,
|
||||||
"license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/LICENSE.txt",
|
"license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/LICENSE.txt",
|
||||||
"icon": "images/sqlserver.png",
|
"icon": "images/sqlserver.png",
|
||||||
"aiKey": "AIF-444c3af9-8e69-4462-ab49-4191e6ad1916",
|
"aiKey": "AIF-5574968e-856d-40d2-af67-c89a14e76412",
|
||||||
"engines": {
|
"engines": {
|
||||||
"vscode": "*",
|
"vscode": "*",
|
||||||
"azdata": ">=1.6.0"
|
"azdata": ">=1.6.0"
|
||||||
|
|||||||
@@ -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",
|
"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",
|
"icon": "images/sqlserver.png",
|
||||||
"aiKey": "AIF-444c3af9-8e69-4462-ab49-4191e6ad1916",
|
"aiKey": "AIF-5574968e-856d-40d2-af67-c89a14e76412",
|
||||||
"activationEvents": [
|
"activationEvents": [
|
||||||
"*"
|
"*"
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -25,7 +25,7 @@
|
|||||||
"urlProtocol": "azuredatastudio",
|
"urlProtocol": "azuredatastudio",
|
||||||
"enableTelemetry": true,
|
"enableTelemetry": true,
|
||||||
"aiConfig": {
|
"aiConfig": {
|
||||||
"asimovKey": "AIF-444c3af9-8e69-4462-ab49-4191e6ad1916"
|
"asimovKey": "AIF-5574968e-856d-40d2-af67-c89a14e76412"
|
||||||
},
|
},
|
||||||
"sendASmile": {
|
"sendASmile": {
|
||||||
"reportIssueUrl": "https://github.com/Microsoft/azuredatastudio/issues/new?labels=customer%20reported%20issue",
|
"reportIssueUrl": "https://github.com/Microsoft/azuredatastudio/issues/new?labels=customer%20reported%20issue",
|
||||||
|
|||||||
@@ -72,7 +72,7 @@ interface ISharedProcessInitData {
|
|||||||
logLevel: LogLevel;
|
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 {
|
class MainProcessService implements IMainProcessService {
|
||||||
constructor(private server: Server, private mainRouter: StaticRouter) { }
|
constructor(private server: Server, private mainRouter: StaticRouter) { }
|
||||||
|
|||||||
@@ -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<void> {
|
export async function main(argv: ParsedArgs): Promise<void> {
|
||||||
const services = new ServiceCollection();
|
const services = new ServiceCollection();
|
||||||
|
|||||||
@@ -101,7 +101,7 @@ export class WebTelemetryAppender implements ITelemetryAppender {
|
|||||||
data = validateTelemetryData(data);
|
data = validateTelemetryData(data);
|
||||||
this._logService.trace(`telemetry/${eventName}`, 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<any> | undefined {
|
flush(): Promise<any> | undefined {
|
||||||
@@ -167,4 +167,4 @@ export class TelemetryService extends Disposable implements ITelemetryService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
registerSingleton(ITelemetryService, TelemetryService);
|
registerSingleton(ITelemetryService, TelemetryService);
|
||||||
Reference in New Issue
Block a user