Add some more event properties (#9793)

This commit is contained in:
Charles Gagnon
2020-04-02 11:56:42 -07:00
committed by GitHub
parent fae73fe6ff
commit a39792af17
2 changed files with 10 additions and 7 deletions

View File

@@ -9,6 +9,7 @@ import * as uuid from 'vs/base/common/uuid';
import { cleanRemoteAuthority } from 'vs/platform/telemetry/common/telemetryUtils';
import { mixin } from 'vs/base/common/objects';
import { firstSessionDateStorageKey, lastSessionDateStorageKey, machineIdKey } from 'vs/platform/telemetry/common/telemetry';
import product from 'vs/platform/product/common/product'; // {{SQL CARBON EDIT}}
export async function resolveWorkbenchCommonProperties(
storageService: IStorageService,
@@ -54,6 +55,7 @@ export async function resolveWorkbenchCommonProperties(
result['common.product'] = 'web';
// __GDPR__COMMON__ "common.userAgent" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
result['common.userAgent'] = Platform.userAgent;
result['quality'] = product.quality || 'dev'; // {{SQL CARBON EDIT}} Add quality
// dynamic properties which value differs on each call
let seq = 0;

View File

@@ -39,12 +39,13 @@ export async function resolveCommonProperties(
// __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}}
result['quality'] = productObject.quality || 'dev'; // {{SQL CARBON EDIT}} Add quality
// const msftInternal = verifyMicrosoftInternalDomain(msftInternalDomains || []); {{SQL CARBON EDIT}} remove msftinternal
// if (msftInternal) {
// // __GDPR__COMMON__ "common.msftInternal" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }
// result['common.msftInternal'] = msftInternal;
// }
const msftInternal = verifyMicrosoftInternalDomain(msftInternalDomains || []);
if (msftInternal) {
// __GDPR__COMMON__ "common.msftInternal" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }
result['common.msftInternal'] = msftInternal;
}
// dynamic properties which value differs on each call
let seq = 0;
@@ -84,11 +85,11 @@ export async function resolveCommonProperties(
return result;
}
/*function verifyMicrosoftInternalDomain(domainList: readonly string[]): boolean { {{SQL CARBON EDIT}} comment out for no unused
function verifyMicrosoftInternalDomain(domainList: readonly string[]): boolean {
if (!process || !process.env || !process.env['USERDNSDOMAIN']) {
return false;
}
const domain = process.env['USERDNSDOMAIN']!.toLowerCase();
return domainList.some(msftDomain => domain === msftDomain);
}*/
}