diff --git a/src/vs/platform/telemetry/browser/workbenchCommonProperties.ts b/src/vs/platform/telemetry/browser/workbenchCommonProperties.ts index c597e9e9b7..a8a2a5e3ff 100644 --- a/src/vs/platform/telemetry/browser/workbenchCommonProperties.ts +++ b/src/vs/platform/telemetry/browser/workbenchCommonProperties.ts @@ -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; diff --git a/src/vs/platform/telemetry/node/commonProperties.ts b/src/vs/platform/telemetry/node/commonProperties.ts index 5ee9155cdd..5de092f787 100644 --- a/src/vs/platform/telemetry/node/commonProperties.ts +++ b/src/vs/platform/telemetry/node/commonProperties.ts @@ -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); -}*/ +}