tor-browser

The Tor Browser
git clone https://git.dasho.dev/tor-browser.git
Log | Files | Refs | README | LICENSE

commit 6c6669e1f2676765138bcff2b2b58aa0d6c68a19
parent ce2bdcd89bf27fe8323747279b503f608cd92375
Author: Cristina Horotan <chorotan@mozilla.com>
Date:   Fri, 12 Dec 2025 22:40:23 +0200

Revert "Bug 2005640 - Do not attempt to record nimbus_targeting_environment.nimbus_targeting_environment when the metric is disabled r=nimbus-reviewers,relud" for causing xpcshell failures on test_TargetingContextRecorder.js

This reverts commit ce2bdcd89bf27fe8323747279b503f608cd92375.

Diffstat:
Mtoolkit/components/nimbus/lib/TargetingContextRecorder.sys.mjs | 27++++++++-------------------
1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/toolkit/components/nimbus/lib/TargetingContextRecorder.sys.mjs b/toolkit/components/nimbus/lib/TargetingContextRecorder.sys.mjs @@ -359,12 +359,6 @@ async function recordTargetingContextAttributes() { ) ).ctx; - const recordAttrsEnabled = - lazy.NimbusFeatures.nimbusTelemetry.getVariable("gleanMetricConfiguration") - ?.metrics_enabled?.[ - "nimbus_targeting_environment.targeting_context_value" - ] ?? false; - const recordAttrs = lazy.NimbusFeatures.nimbusTelemetry.getVariable( "nimbusTargetingEnvironment" @@ -376,10 +370,7 @@ async function recordTargetingContextAttributes() { try { const value = await transform(await context[attr]); - if ( - recordAttrsEnabled && - (recordAttrs === null || recordAttrs.includes(attr)) - ) { + if (recordAttrs === null || recordAttrs.includes(attr)) { values[metric] = value; } @@ -390,16 +381,14 @@ async function recordTargetingContextAttributes() { } } - if (recordAttrsEnabled) { - let stringifiedCtx; - try { - stringifiedCtx = JSON.stringify(values); - } catch (ex) { - stringifiedCtx = "(JSON.stringify error)"; - } - - Glean.nimbusTargetingEnvironment.targetingContextValue.set(stringifiedCtx); + let stringifiedCtx; + try { + stringifiedCtx = JSON.stringify(values); + } catch (ex) { + stringifiedCtx = "(JSON.stringify error)"; } + + Glean.nimbusTargetingEnvironment.targetingContextValue.set(stringifiedCtx); } /**