diff options
| author | Logan Ramos <lramos15@gmail.com> | 2022-11-09 23:52:08 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-09 23:52:08 +0300 |
| commit | 78f6c8cdd31e1b90a99c2c2034041a0cea0e2767 (patch) | |
| tree | 4ab98ceff5740828866af8047764953646a74a8a | |
| parent | ad9a4ab198b21de2fa2eff563a45ec1e1a6f6a8a (diff) | |
More telemetry cleanup (#165952)
| -rw-r--r-- | src/vs/workbench/api/common/extHostTelemetry.ts | 6 | ||||
| -rw-r--r-- | src/vs/workbench/contrib/telemetry/browser/telemetry.contribution.ts | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/vs/workbench/api/common/extHostTelemetry.ts b/src/vs/workbench/api/common/extHostTelemetry.ts index 99cc577fe4c..08e1df2e991 100644 --- a/src/vs/workbench/api/common/extHostTelemetry.ts +++ b/src/vs/workbench/api/common/extHostTelemetry.ts @@ -145,13 +145,13 @@ export class ExtHostTelemetryLogger { // TODO @lramos15 should this be up to the implementer and not done here? let updatedData = data.properties ?? data; + // We don't clean measurements since they are just numbers + updatedData = cleanData(updatedData, []); + if (this._appender.additionalCommonProperties) { updatedData = mixin(updatedData, this._appender.additionalCommonProperties); } - // We don't clean measurements since they are just numbers - updatedData = cleanData(updatedData, []); - if (!this._appender.ignoreBuiltInCommonProperties) { updatedData = mixin(updatedData, this._commonProperties); } diff --git a/src/vs/workbench/contrib/telemetry/browser/telemetry.contribution.ts b/src/vs/workbench/contrib/telemetry/browser/telemetry.contribution.ts index ad17e2c08ac..f44c01d97a7 100644 --- a/src/vs/workbench/contrib/telemetry/browser/telemetry.contribution.ts +++ b/src/vs/workbench/contrib/telemetry/browser/telemetry.contribution.ts @@ -77,7 +77,6 @@ export class TelemetryContribution extends Disposable implements IWorkbenchContr type WorkspaceLoadClassification = { owner: 'bpasero'; - userAgent: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The user agent as reported by `navigator.userAgent` by Electron or the web browser.' }; emptyWorkbench: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'Whether a folder or workspace is opened or not.' }; windowSize: WindowSizeFragment; 'workbench.filesToOpenOrCreate': { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'Number of files that should open or be created.' }; @@ -94,7 +93,6 @@ export class TelemetryContribution extends Disposable implements IWorkbenchContr }; type WorkspaceLoadEvent = { - userAgent: string; windowSize: { innerHeight: number; innerWidth: number; outerHeight: number; outerWidth: number }; emptyWorkbench: boolean; 'workbench.filesToOpenOrCreate': number; @@ -110,7 +108,6 @@ export class TelemetryContribution extends Disposable implements IWorkbenchContr }; telemetryService.publicLog2<WorkspaceLoadEvent, WorkspaceLoadClassification>('workspaceLoad', { - userAgent: navigator.userAgent, windowSize: { innerHeight: window.innerHeight, innerWidth: window.innerWidth, outerHeight: window.outerHeight, outerWidth: window.outerWidth }, emptyWorkbench: contextService.getWorkbenchState() === WorkbenchState.EMPTY, 'workbench.filesToOpenOrCreate': filesToOpenOrCreate && filesToOpenOrCreate.length || 0, |