diff --git a/src/vs/code/electron-browser/issue/issueReporterMain.ts b/src/vs/code/electron-browser/issue/issueReporterMain.ts index 23bbcf74ff2704e0b565f7eda031d89603523885..f08c9963674739cd3cda57110f2ea34509643ec9 100644 --- a/src/vs/code/electron-browser/issue/issueReporterMain.ts +++ b/src/vs/code/electron-browser/issue/issueReporterMain.ts @@ -79,11 +79,12 @@ export class IssueReporter extends Disposable { this.initServices(configuration); + const isSnap = process.platform === 'linux' && process.env.SNAP && process.env.SNAP_REVISION; this.issueReporterModel = new IssueReporterModel({ issueType: configuration.data.issueType || IssueType.Bug, versionInfo: { vscodeVersion: `${pkg.name} ${pkg.version} (${product.commit || 'Commit unknown'}, ${product.date || 'Date unknown'})`, - os: `${os.type()} ${os.arch()} ${os.release()}` + os: `${os.type()} ${os.arch()} ${os.release()}${isSnap ? ' snap' : ''}` }, extensionsDisabled: !!this.environmentService.disableExtensions, }); diff --git a/src/vs/platform/telemetry/node/commonProperties.ts b/src/vs/platform/telemetry/node/commonProperties.ts index 623c88bd86b9fd1273d89c0c9e9f8411642f24ec..ff0be73da234c7b340781ea9710a2b0cb88def2f 100644 --- a/src/vs/platform/telemetry/node/commonProperties.ts +++ b/src/vs/platform/telemetry/node/commonProperties.ts @@ -48,6 +48,11 @@ export function resolveCommonProperties(commit: string | undefined, version: str } }); + if (process.platform === 'linux' && process.env.SNAP && process.env.SNAP_REVISION) { + // __GDPR__COMMON__ "common.nodeArch" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" } + result['common.snap'] = 'true'; + } + return readFile(installSourcePath, 'utf8').then(contents => { // __GDPR__COMMON__ "common.source" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" } diff --git a/src/vs/platform/windows/electron-main/windowsService.ts b/src/vs/platform/windows/electron-main/windowsService.ts index 27e58e241425f34749bada6d7d7493dc8a5b19f6..c0555f9c64a35020185ecdaa215917400c419fdd 100644 --- a/src/vs/platform/windows/electron-main/windowsService.ts +++ b/src/vs/platform/windows/electron-main/windowsService.ts @@ -380,6 +380,7 @@ export class WindowsService implements IWindowsService, IURLHandler, IDisposable version = `${version} (${product.target} setup)`; } + const isSnap = process.platform === 'linux' && process.env.SNAP && process.env.SNAP_REVISION; const detail = nls.localize('aboutDetail', "Version: {0}\nCommit: {1}\nDate: {2}\nElectron: {3}\nChrome: {4}\nNode.js: {5}\nV8: {6}\nOS: {7}", version, @@ -389,7 +390,7 @@ export class WindowsService implements IWindowsService, IURLHandler, IDisposable process.versions['chrome'], process.versions['node'], process.versions['v8'], - `${os.type()} ${os.arch()} ${os.release()}` + `${os.type()} ${os.arch()} ${os.release()}${isSnap ? ' snap' : ''}` ); const ok = nls.localize('okButton', "OK");