diff --git a/src/vs/platform/telemetry/node/commonProperties.ts b/src/vs/platform/telemetry/node/commonProperties.ts index e52d037aba..6fa9d1ee28 100644 --- a/src/vs/platform/telemetry/node/commonProperties.ts +++ b/src/vs/platform/telemetry/node/commonProperties.ts @@ -15,12 +15,16 @@ const productObject = product; export async function resolveCommonProperties(commit: string | undefined, version: string | undefined, machineId: string | undefined, installSourcePath: string, product?: string): Promise<{ [name: string]: string | undefined; }> { const result: { [name: string]: string | undefined; } = Object.create(null); + // {{SQL CARBON EDIT}} // __GDPR__COMMON__ "common.machineId" : { "endPoint": "MacAddressHash", "classification": "EndUserPseudonymizedInformation", "purpose": "FeatureInsight" } - result['common.machineId'] = machineId; - // __GDPR__COMMON__ "sessionID" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" } - result['sessionID'] = uuid.generateUuid() + Date.now(); - // __GDPR__COMMON__ "commitHash" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" } - result['commitHash'] = commit; + // result['common.machineId'] = machineId; + result['common.machineId'] = ''; + // // __GDPR__COMMON__ "sessionID" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" } + // result['sessionID'] = uuid.generateUuid() + Date.now(); + result['sessionID'] = ''; + + // __GDPR__COMMON__ "commitHash" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" } + result['commitHash'] = ''; // __GDPR__COMMON__ "version" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" } result['version'] = version; // __GDPR__COMMON__ "common.platformVersion" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" } @@ -32,8 +36,9 @@ export async function resolveCommonProperties(commit: string | undefined, versio // __GDPR__COMMON__ "common.nodeArch" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" } result['common.nodeArch'] = process.arch; // __GDPR__COMMON__ "common.product" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" } - result['common.product'] = productObject.nameShort || 'desktop'; // {{SQL CARBON EDIT}} - result['common.application.name'] = productObject.nameLong; // {{SQL CARBON EDIT}} + // {{SQL CARBON EDIT}} + result['common.product'] = productObject.nameShort || 'desktop'; + result['common.application.name'] = productObject.nameLong; // dynamic properties which value differs on each call let seq = 0; diff --git a/src/vs/platform/telemetry/node/workbenchCommonProperties.ts b/src/vs/platform/telemetry/node/workbenchCommonProperties.ts index 6038756558..1797217f20 100644 --- a/src/vs/platform/telemetry/node/workbenchCommonProperties.ts +++ b/src/vs/platform/telemetry/node/workbenchCommonProperties.ts @@ -7,7 +7,8 @@ import { IStorageService, StorageScope } from 'vs/platform/storage/common/storag import { resolveCommonProperties } from 'vs/platform/telemetry/node/commonProperties'; import { instanceStorageKey, firstSessionDateStorageKey, lastSessionDateStorageKey } from 'vs/platform/telemetry/common/telemetry'; -import product from 'vs/platform/product/node/product'; // {{ SQL CARBON EDIT }} +// {{ SQL CARBON EDIT }} +import product from 'vs/platform/product/node/product'; export async function resolveWorkbenchCommonProperties(storageService: IStorageService, commit: string | undefined, version: string | undefined, machineId: string, installSourcePath: string, remoteAuthority?: string): Promise<{ [name: string]: string | undefined }> { const result = await resolveCommonProperties(commit, version, machineId, installSourcePath); @@ -16,21 +17,26 @@ export async function resolveWorkbenchCommonProperties(storageService: IStorageS const lastSessionDate = storageService.get(lastSessionDateStorageKey, StorageScope.GLOBAL)!; // __GDPR__COMMON__ "common.version.shell" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" } - result['common.version.shell'] = process.versions && process.versions['electron']; + // result['common.version.shell'] = process.versions && process.versions['electron']; // __GDPR__COMMON__ "common.version.renderer" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" } - result['common.version.renderer'] = process.versions && process.versions['chrome']; + // result['common.version.renderer'] = process.versions && process.versions['chrome']; // __GDPR__COMMON__ "common.firstSessionDate" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" } - result['common.firstSessionDate'] = firstSessionDate; + // result['common.firstSessionDate'] = firstSessionDate; // __GDPR__COMMON__ "common.lastSessionDate" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" } - result['common.lastSessionDate'] = lastSessionDate || ''; + // result['common.lastSessionDate'] = lastSessionDate || ''; // __GDPR__COMMON__ "common.isNewSession" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" } - result['common.isNewSession'] = !lastSessionDate ? '1' : '0'; + // result['common.isNewSession'] = !lastSessionDate ? '1' : '0'; // __GDPR__COMMON__ "common.instanceId" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" } - result['common.instanceId'] = instanceId; + // result['common.instanceId'] = instanceId; // __GDPR__COMMON__ "common.remoteAuthority" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" } - result['common.remoteAuthority'] = cleanRemoteAuthority(remoteAuthority); + // result['common.remoteAuthority'] = cleanRemoteAuthority(remoteAuthority); - result['common.application.name'] = product.nameLong; // {{SQL CARBON EDIT}} + // {{SQL CARBON EDIT}} + result['common.application.name'] = product.nameLong; + // {{SQL CARBON EDIT}} + result['common.userId'] = ''; + + // {{SQL CARBON EDIT}} setUsageDates(storageService); return result;