Skip to content

Commit d5e5981

Browse files
authored
debt - use ITelemetryAppender interface (microsoft#167067)
//cc @lramos15
1 parent 45b5568 commit d5e5981

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

src/vs/code/node/cliProcessMain.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ import { StateService } from 'vs/platform/state/node/stateService';
5353
import { resolveCommonProperties } from 'vs/platform/telemetry/common/commonProperties';
5454
import { ITelemetryService, machineIdKey } from 'vs/platform/telemetry/common/telemetry';
5555
import { ITelemetryServiceConfig, TelemetryService } from 'vs/platform/telemetry/common/telemetryService';
56-
import { supportsTelemetry, NullTelemetryService, getPiiPathsFromEnvironment, isInternalTelemetry } from 'vs/platform/telemetry/common/telemetryUtils';
56+
import { supportsTelemetry, NullTelemetryService, getPiiPathsFromEnvironment, isInternalTelemetry, ITelemetryAppender } from 'vs/platform/telemetry/common/telemetryUtils';
5757
import { OneDataSystemAppender } from 'vs/platform/telemetry/node/1dsAppender';
5858
import { buildTelemetryMessage } from 'vs/platform/telemetry/node/telemetry';
5959
import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
@@ -105,7 +105,7 @@ class CliMain extends Disposable {
105105
});
106106
}
107107

108-
private async initServices(): Promise<[IInstantiationService, OneDataSystemAppender[]]> {
108+
private async initServices(): Promise<[IInstantiationService, ITelemetryAppender[]]> {
109109
const services = new ServiceCollection();
110110

111111
// Product
@@ -190,7 +190,7 @@ class CliMain extends Disposable {
190190
services.set(ILanguagePackService, new SyncDescriptor(NativeLanguagePackService, undefined, false));
191191

192192
// Telemetry
193-
const appenders: OneDataSystemAppender[] = [];
193+
const appenders: ITelemetryAppender[] = [];
194194
const isInternal = isInternalTelemetry(productService, configurationService);
195195
if (supportsTelemetry(productService, environmentService)) {
196196
if (productService.aiConfig && productService.aiConfig.ariaKey) {

src/vs/platform/windows/electron-main/windowImpl.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ import { IUserDataProfilesMainService } from 'vs/platform/userDataProfile/electr
4646
import { INativeHostMainService } from 'vs/platform/native/electron-main/nativeHostMainService';
4747
import { OneDataSystemAppender } from 'vs/platform/telemetry/node/1dsAppender';
4848
import { ITelemetryServiceConfig, TelemetryService } from 'vs/platform/telemetry/common/telemetryService';
49-
import { getPiiPathsFromEnvironment, isInternalTelemetry, supportsTelemetry } from 'vs/platform/telemetry/common/telemetryUtils';
49+
import { getPiiPathsFromEnvironment, isInternalTelemetry, ITelemetryAppender, supportsTelemetry } from 'vs/platform/telemetry/common/telemetryUtils';
5050
import { Promises } from 'vs/base/node/pfs';
5151
import { resolveCommonProperties } from 'vs/platform/telemetry/common/commonProperties';
5252
import { hostname, release } from 'os';
@@ -772,7 +772,7 @@ export class CodeWindow extends Disposable implements ICodeWindow {
772772
private async handleWindowsAdminCrash(details: { reason: string; exitCode: number }) {
773773

774774
// Prepare telemetry event (TODO@bpasero remove me eventually)
775-
const appenders: OneDataSystemAppender[] = [];
775+
const appenders: ITelemetryAppender[] = [];
776776
const isInternal = isInternalTelemetry(this.productService, this.configurationService);
777777
if (supportsTelemetry(this.productService, this.environmentMainService)) {
778778
if (this.productService.aiConfig && this.productService.aiConfig.ariaKey) {

src/vs/workbench/services/telemetry/browser/telemetryService.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ export class TelemetryService extends Disposable implements ITelemetryService {
6363
const telemetrySupported = supportsTelemetry(productService, environmentService) && productService.aiConfig?.ariaKey;
6464
if (telemetrySupported && getTelemetryLevel(configurationService) !== TelemetryLevel.NONE && this.impl === NullTelemetryService) {
6565
// If remote server is present send telemetry through that, else use the client side appender
66-
const appenders = [];
66+
const appenders: ITelemetryAppender[] = [];
6767
const isInternal = isInternalTelemetry(productService, configurationService);
6868
const telemetryProvider: ITelemetryAppender = remoteAgentService.getConnection() !== null ? { log: remoteAgentService.logTelemetry.bind(remoteAgentService), flush: remoteAgentService.flushTelemetry.bind(remoteAgentService) } : new OneDataSystemWebAppender(isInternal, 'monacoworkbench', null, productService.aiConfig?.ariaKey);
6969
appenders.push(telemetryProvider);

0 commit comments

Comments
 (0)