diff --git a/src/vs/platform/telemetry/common/serverTelemetryService.ts b/src/vs/platform/telemetry/common/serverTelemetryService.ts index f6fc225a..8839ecf7 100644 --- a/src/vs/platform/telemetry/common/serverTelemetryService.ts +++ b/src/vs/platform/telemetry/common/serverTelemetryService.ts @@ -31,25 +31,29 @@ export class ServerTelemetryService extends TelemetryService implements IServerT } override publicLog(eventName: string, data?: ITelemetryData) { - if (this._injectedTelemetryLevel < TelemetryLevel.USAGE) { - return; - } - return super.publicLog(eventName, data); + // Void commented this out + // if (this._injectedTelemetryLevel < TelemetryLevel.USAGE) { + // return; + // } + // return super.publicLog(eventName, data); } override publicLog2> = never, T extends IGDPRProperty = never>(eventName: string, data?: StrictPropertyCheck) { - return this.publicLog(eventName, data as ITelemetryData | undefined); + // Void commented this out + // return this.publicLog(eventName, data as ITelemetryData | undefined); } override publicLogError(errorEventName: string, data?: ITelemetryData) { - if (this._injectedTelemetryLevel < TelemetryLevel.ERROR) { - return Promise.resolve(undefined); - } - return super.publicLogError(errorEventName, data); + // Void commented this out + // if (this._injectedTelemetryLevel < TelemetryLevel.ERROR) { + // return Promise.resolve(undefined); + // } + // return super.publicLogError(errorEventName, data); } override publicLogError2> = never, T extends IGDPRProperty = never>(eventName: string, data?: StrictPropertyCheck) { - return this.publicLogError(eventName, data as ITelemetryData | undefined); + // Void commented this out + // return this.publicLogError(eventName, data as ITelemetryData | undefined); } async updateInjectedTelemetryLevel(telemetryLevel: TelemetryLevel): Promise { diff --git a/src/vs/platform/telemetry/common/telemetryService.ts b/src/vs/platform/telemetry/common/telemetryService.ts index 51fbb8fa..c3e05eb2 100644 --- a/src/vs/platform/telemetry/common/telemetryService.ts +++ b/src/vs/platform/telemetry/common/telemetryService.ts @@ -4,7 +4,6 @@ *--------------------------------------------------------------------------------------------*/ import { DisposableStore } from '../../../base/common/lifecycle.js'; -import { mixin } from '../../../base/common/objects.js'; import { isWeb } from '../../../base/common/platform.js'; import { escapeRegExpCharacters } from '../../../base/common/strings.js'; import { localize } from '../../../nls.js'; @@ -15,7 +14,7 @@ import { IProductService } from '../../product/common/productService.js'; import { Registry } from '../../registry/common/platform.js'; import { ClassifiedEvent, IGDPRProperty, OmitMetadata, StrictPropertyCheck } from './gdprTypings.js'; import { ITelemetryData, ITelemetryService, TelemetryConfiguration, TelemetryLevel, TELEMETRY_CRASH_REPORTER_SETTING_ID, TELEMETRY_OLD_SETTING_ID, TELEMETRY_SECTION_ID, TELEMETRY_SETTING_ID, ICommonProperties } from './telemetry.js'; -import { cleanData, getTelemetryLevel, ITelemetryAppender } from './telemetryUtils.js'; +import { getTelemetryLevel, ITelemetryAppender } from './telemetryUtils.js'; export interface ITelemetryServiceConfig { appenders: ITelemetryAppender[]; @@ -38,7 +37,7 @@ export class TelemetryService implements ITelemetryService { readonly firstSessionDate: string; readonly msftInternal: boolean | undefined; - private _appenders: ITelemetryAppender[]; + // private _appenders: ITelemetryAppender[]; private _commonProperties: ICommonProperties; private _experimentProperties: { [name: string]: string } = {}; private _piiPaths: string[]; @@ -53,7 +52,7 @@ export class TelemetryService implements ITelemetryService { @IConfigurationService private _configurationService: IConfigurationService, @IProductService private _productService: IProductService ) { - this._appenders = config.appenders; + // this._appenders = config.appenders; this._commonProperties = config.commonProperties ?? Object.create(null); this.sessionId = this._commonProperties['sessionID'] as string; @@ -121,44 +120,47 @@ export class TelemetryService implements ITelemetryService { this._disposables.dispose(); } - private _log(eventName: string, eventLevel: TelemetryLevel, data?: ITelemetryData) { - // don't send events when the user is optout - if (this._telemetryLevel < eventLevel) { - return; - } + // Void commented this out + // private _log(eventName: string, eventLevel: TelemetryLevel, data?: ITelemetryData) { + // // don't send events when the user is optout + // if (this._telemetryLevel < eventLevel) { + // return; + // } - // add experiment properties - data = mixin(data, this._experimentProperties); + // // add experiment properties + // data = mixin(data, this._experimentProperties); - // remove all PII from data - data = cleanData(data as Record, this._cleanupPatterns); + // // remove all PII from data + // data = cleanData(data as Record, this._cleanupPatterns); - // add common properties - data = mixin(data, this._commonProperties); + // // add common properties + // data = mixin(data, this._commonProperties); - // Log to the appenders of sufficient level - this._appenders.forEach(a => a.log(eventName, data)); - } + // // Log to the appenders of sufficient level + // this._appenders.forEach(a => a.log(eventName, data)); + // } publicLog(eventName: string, data?: ITelemetryData) { - this._log(eventName, TelemetryLevel.USAGE, data); + // this._log(eventName, TelemetryLevel.USAGE, data); } publicLog2> = never, T extends IGDPRProperty = never>(eventName: string, data?: StrictPropertyCheck) { - this.publicLog(eventName, data as ITelemetryData); + // this.publicLog(eventName, data as ITelemetryData); } publicLogError(errorEventName: string, data?: ITelemetryData) { - if (!this._sendErrorTelemetry) { - return; - } + // Void commented this out + // if (!this._sendErrorTelemetry) { + // return; + // } - // Send error event and anonymize paths - this._log(errorEventName, TelemetryLevel.ERROR, data); + // // Send error event and anonymize paths + // this._log(errorEventName, TelemetryLevel.ERROR, data); } publicLogError2> = never, T extends IGDPRProperty = never>(eventName: string, data?: StrictPropertyCheck) { - this.publicLogError(eventName, data as ITelemetryData); + // Void commented this out + // this.publicLogError(eventName, data as ITelemetryData); } }