ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-17 11:01:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Cherry pick 3773487012c98ef7974a0182771ea19178f2a525

Browse Source
This commit is contained in:
Joao Moreno
2019-04-02 15:34:27 +02:00
committed by Karl Burtram
parent 82b8750b63
commit 605160a1ba
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/vs/code/electron-browser/issue/issueReporterMain.ts
View File

@@ -79,11 +79,12 @@ export class IssueReporter extends Disposable {
this.initServices(configuration); this.initServices(configuration);
const isSnap = process.platform === 'linux' && process.env.SNAP && process.env.SNAP_REVISION;
this.issueReporterModel = new IssueReporterModel({ this.issueReporterModel = new IssueReporterModel({
issueType: configuration.data.issueType || IssueType.Bug, issueType: configuration.data.issueType || IssueType.Bug,
versionInfo: { versionInfo: {
vscodeVersion: `${pkg.name} ${pkg.version} (${product.commit || 'Commit unknown'}, ${product.date || 'Date unknown'})`, 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, extensionsDisabled: !!this.environmentService.disableExtensions,
}); });

5
src/vs/platform/telemetry/node/commonProperties.ts
View File

@@ -59,6 +59,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 => { return readFile(installSourcePath, 'utf8').then(contents => {
// __GDPR__COMMON__ "common.source" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" } // __GDPR__COMMON__ "common.source" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }

4
src/vs/platform/windows/electron-main/windowsService.ts
View File

@@ -380,9 +380,9 @@ export class WindowsService implements IWindowsService, IURLHandler, IDisposable
version = `${version} (${product.target} setup)`; version = `${version} (${product.target} setup)`;
} }
// {{SQL CARBON EDIT}} const isSnap = process.platform === 'linux' && process.env.SNAP && process.env.SNAP_REVISION;
const detail = nls.localize('aboutDetail', const detail = nls.localize('aboutDetail',
"Version: {0}\nCommit: {1}\nDate: {2}\nVS Code {8}\nElectron: {3}\nChrome: {4}\nNode.js: {5}\nV8: {6}\nOS: {7}", "Version: {0}\nCommit: {1}\nDate: {2}\nElectron: {3}\nChrome: {4}\nNode.js: {5}\nV8: {6}\nOS: {7}",
version, version,
product.commit || 'Unknown', product.commit || 'Unknown',
product.date || 'Unknown', product.date || 'Unknown',