diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-08 15:11:27 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-08 15:11:27 +0000 |
| commit | f3bcaf9f88aad2c423ebcd61121562f9834187d4 (patch) | |
| tree | f22238c29b57707b645a350940e3e9bdf3ce1f5d /toolkit/components/telemetry | |
| parent | Adding debian version 115.7.0esr-1~deb12u1. (diff) | |
| download | firefox-esr-f3bcaf9f88aad2c423ebcd61121562f9834187d4.tar.xz firefox-esr-f3bcaf9f88aad2c423ebcd61121562f9834187d4.zip | |
Merging upstream version 115.8.0esr.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'toolkit/components/telemetry')
3 files changed, 13 insertions, 1 deletions
diff --git a/toolkit/components/telemetry/app/TelemetryEnvironment.sys.mjs b/toolkit/components/telemetry/app/TelemetryEnvironment.sys.mjs index 26c4847770..c5d99acf60 100644 --- a/toolkit/components/telemetry/app/TelemetryEnvironment.sys.mjs +++ b/toolkit/components/telemetry/app/TelemetryEnvironment.sys.mjs @@ -1907,6 +1907,13 @@ EnvironmentCache.prototype = { this._osData.kernelVersion = forceToStringOrNull( getSysinfoProperty("kernel_version", null) ); + } else if (AppConstants.platform == "linux") { + this._osData.distro = forceToStringOrNull( + getSysinfoProperty("distro", null) + ); + this._osData.distroVersion = forceToStringOrNull( + getSysinfoProperty("distroVersion", null) + ); } else if (AppConstants.platform === "win") { // The path to the "UBR" key, queried to get additional version details on Windows. const WINDOWS_UBR_KEY_PATH = diff --git a/toolkit/components/telemetry/docs/data/environment.rst b/toolkit/components/telemetry/docs/data/environment.rst index b61c2a35e4..8b7c38ef89 100644 --- a/toolkit/components/telemetry/docs/data/environment.rst +++ b/toolkit/components/telemetry/docs/data/environment.rst @@ -160,7 +160,9 @@ Structure: installYear: <number>, // windows only or null on failure locale: <string>, // "en" or null on failure hasPrefetch: <bool>, // windows only, or null on failure - hasSuperfetch: <bool>, // windows only, or nul on failure + hasSuperfetch: <bool>, // windows only, or null on failure + distro: <string>, // linux only, or null on failure + distroVersion: <string>, // linux only, or null on failure }, hdd: { profile: { // hdd where the profile folder is located diff --git a/toolkit/components/telemetry/tests/unit/TelemetryEnvironmentTesting.sys.mjs b/toolkit/components/telemetry/tests/unit/TelemetryEnvironmentTesting.sys.mjs index da12fb74f5..3d07ae3e84 100644 --- a/toolkit/components/telemetry/tests/unit/TelemetryEnvironmentTesting.sys.mjs +++ b/toolkit/components/telemetry/tests/unit/TelemetryEnvironmentTesting.sys.mjs @@ -605,6 +605,9 @@ export var TelemetryEnvironmentTesting = { } } else if (gIsAndroid) { lazy.Assert.ok(this.checkNullOrString(osData.kernelVersion)); + } else if (gIsLinux) { + lazy.Assert.ok(this.checkNullOrString(osData.distro)); + lazy.Assert.ok(this.checkNullOrString(osData.distroVersion)); } for (let disk of EXPECTED_HDD_FIELDS) { |