Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-25 11:08:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

send telemetry info as initData, fixes #14632

Browse Source
This commit is contained in:
Johannes Rieken
2016-10-28 09:25:29 +02:00
parent 626c863501
commit 31d39b0a37
4 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/vs/workbench/api/node/extHost.api.impl.ts
View File

@@ -42,7 +42,7 @@ import { CancellationTokenSource } from 'vs/base/common/cancellation';
import * as vscode from 'vscode';
import * as paths from 'vs/base/common/paths';
import { realpathSync } from 'fs';
import { ITelemetryService, ITelemetryInfo } from 'vs/platform/telemetry/common/telemetry';
import { ITelemetryInfo } from 'vs/platform/telemetry/common/telemetry';
import { MainContext, ExtHostContext, InstanceCollection, IInitConfiguration } from './extHost.protocol';
@@ -53,7 +53,7 @@ export interface IExtensionApiFactory {
/**
* This method instantiates and returns the extension API surface
*/
export function createApiFactory(initDataConfiguration: IInitConfiguration, threadService: IThreadService, extensionService: ExtHostExtensionService, contextService: IWorkspaceContextService, telemetryService: ITelemetryService): IExtensionApiFactory {
export function createApiFactory(initDataConfiguration: IInitConfiguration, initTelemetryInfo: ITelemetryInfo, threadService: IThreadService, extensionService: ExtHostExtensionService, contextService: IWorkspaceContextService): IExtensionApiFactory {
@@ -90,11 +90,6 @@ export function createApiFactory(initDataConfiguration: IInitConfiguration, thre
// Register API-ish commands
ExtHostApiCommands.register(extHostCommands);
// TODO@joh,alex - this is lifecycle critical
// fetch and store telemetry info
let telemetryInfo: ITelemetryInfo;
telemetryService.getTelemetryInfo().then(info => telemetryInfo = info, errors.onUnexpectedError);
return function (extension: IExtensionDescription): typeof vscode {
// namespace: commands
@@ -133,8 +128,8 @@ export function createApiFactory(initDataConfiguration: IInitConfiguration, thre
// namespace: env
const env: typeof vscode.env = Object.freeze({
get machineId() { return telemetryInfo.machineId; },
get sessionId() { return telemetryInfo.sessionId; },
get machineId() { return initTelemetryInfo.machineId; },
get sessionId() { return initTelemetryInfo.sessionId; },
get language() { return Platform.language; },
get appName() { return product.nameLong; }
});

1
src/vs/workbench/api/node/extHost.protocol.ts
View File

@@ -55,6 +55,7 @@ export interface IInitData {
};
extensions: IExtensionDescription[];
configuration: IInitConfiguration;
telemetryInfo: ITelemetryInfo;
}
export interface InstanceSetter<T> {