chore(nimbus): Update External Configs

mozilla · Jan 27, 2025 · 428f678 · 428f678
1 parent 8a64f4f
commit 428f678
Show file tree

Hide file tree

Showing 6 changed files with 124 additions and 172 deletions.
diff --git a/experimenter/experimenter/features/manifests/fenix/.ref-cache.yaml b/experimenter/experimenter/features/manifests/fenix/.ref-cache.yaml
@@ -1,3 +1,3 @@
 beta: 5bb06fdfad35f98d35cd307c20822d93e91a56f7
-master: 55706b888f91fffa6f045f7cbc1a7b1c34598292
-release: 3cc654dd02eff9b74658b3490ac464bb4bda9f13
+master: f38e5d15931048869d01abb553039c3080ca1977
+release: 3efad01d4d655794185d1513f309eaab58675469
diff --git a/experimenter/experimenter/features/manifests/firefox-desktop/.ref-cache.yaml b/experimenter/experimenter/features/manifests/firefox-desktop/.ref-cache.yaml
@@ -1,5 +1,5 @@
 beta: e9f7308cf6466d96c79a08298fe21832aff77a05
-central: 0da4e2f4d975fa56cabcc3efecf60f3faca30b29
-esr115: f7052f0044cf69ce7bb8e13b21b7a5e691ac4b0e
-esr128: 6006471e52ac03e06f6352fd7ab4baca5a04b36b
-release: 07c786debc1db83dab60c09ed206b27dd44d7e7f
+central: 2c456ff06c722d1fa5c2820233da0db19b72b5c3
+esr115: ddfd872425d03ecb89860f62f8f03c737728f501
+esr128: 511bb195b833e379d8d534a90dc26e06b7b254e7
+release: 25a4dff11cd02d1b76157d942aa8b51119a32802
diff --git a/experimenter/experimenter/features/manifests/firefox-desktop/experimenter.yaml b/experimenter/experimenter/features/manifests/firefox-desktop/experimenter.yaml
@@ -78,57 +78,11 @@ prefFlips:
     path: toolkit/components/nimbus/schemas/PrefFlipsFeature.schema.json
 
 
-# `search` is for search engine experimentation features which do not require
-# isEarlyStartup to be set.
 search:
-  description: Search engine experimentation support and testing features.
+  description: Search service related features.
   owner: [email protected]
   hasExposure: false
   variables:
-    extraParams:
-      type: json
-      description: >-
-        This allows extra parameters to be set for search engines requests including,
-        where calls to the suggestions API, the search engine configuration defines
-        those parameters.
-
-        The use of this field should be coordinated with the Search team.
-
-        The field value is an array of objects with key/value fields. For example:
-
-        [
-          {"key": "google_channel_row", "value": "foo"}
-        ]
-
-        This is matched to a section in the search configuration:
-
-        "extraParams": [
-          {
-            "name": "channel",
-            "pref": "google_channel_row",
-            "condition": "pref"
-          }
-        ],
-
-        In this case, the resulting URL for the appropriate search engine would have
-        `&channel=foo` added to the URL when doing searches.
-
-        If the key is not referenced in the search configuration, then no parameter
-        will be added. Only the search team can update the configuration.
-    logEnabled:
-      type: boolean
-      setPref:
-        branch: default
-        pref: browser.search.log
-      description: >-
-        Whether or not enable search log in their console.
-    richSuggestionsFeatureGate:
-      type: boolean
-      setPref:
-        branch: default
-        pref: browser.urlbar.richSuggestions.featureGate
-      description: >-
-        Feature gate that controls whether Rich Suggestions are enabled.
     scotchBonnetEnableOverride:
       type: boolean
       setPref:
@@ -142,18 +96,6 @@ search:
         * Search term persistence
         * Intuitive search keywords
         * HTTP swap
-    serpEventTelemetryCategorizationEnabled:
-      type: boolean
-      setPref:
-        branch: default
-        pref: browser.search.serpEventTelemetryCategorization.enabled
-      description: Whether the Glean SERP event telemetry for SERP categorization is enabled.
-    trendingEnabled:
-      type: boolean
-      setPref:
-        branch: default
-        pref: browser.urlbar.trending.featureGate
-      description: Feature gate that controls whether trending suggestions are enabled.
     trendingRequireSearchMode:
       type: boolean
       setPref:
@@ -166,43 +108,72 @@ search:
         branch: default
         pref: browser.urlbar.trending.maxResultsNoSearchMode
       description: The maximum number of trending results mode outside search mode.
-    newSearchConfigEnabled:
-      type: boolean
-      setPref:
-        branch: user
-        pref: browser.search.newSearchConfig.enabled
-      description: >-
-        Whether search-config-v2 is enabled for the user. This will only take
-        effect when the user restarts.
-        Obsolete. This is kept until all multi-feature roll-outs using it are
-        ended to prevent un-enrollment.
     targetExperiment:
       type: string
       description: >-
-        The slug of the experiment someone is requesting enrollment and branch
-        information for. (Note that the featureId needs to be set to "search".)
+        Recorded in SERP telemetry, this is the slug of the experiment someone
+        is requesting enrollment and branch information for. (Note that the
+        featureId needs to be set to "search".)
 
-# `searchConfiguration` is for search experiment features for items that require
-# isEarlyStartup to be true. These items may require a reload of the search
-# engine configuration, and an additional reload may happen during the startup
-# process.
 searchConfiguration:
-  description: Search experimentation support for the engine configuration
+  description: >-
+    Search experimentation support for the engine configuration. Some of these
+    options may cause an additional reload to occur during the startup phase.
   owner: [email protected]
-  isEarlyStartup: true
   hasExposure: false
   variables:
     experiment:
       type: string
-      fallbackPref: browser.search.experiment
+      setPref:
+        branch: user
+        pref: browser.search.experiment
       description: >-
         Used to activate only matching configurations that contain the value in
         `experiment`
-    seperatePrivateDefaultUIEnabled:
+    extraParams:
+      type: json
+      description: >-
+        This allows extra parameters to be set for search engines requests including,
+        where calls to the suggestions API, the search engine configuration defines
+        those parameters.
+
+        The use of this field should be coordinated with the Search team.
+
+        The field value is an array of objects with key/value fields. For example:
+
+        [
+          {"key": "google_channel_row", "value": "foo"}
+        ]
+
+        This is matched to a section in the search configuration:
+
+        "params": [
+          {
+            "name": "channel",
+            "experimentConfig": "google_channel_row"
+          }
+        ],
+
+        In this case, the resulting URL for the appropriate search engine would have
+        `&channel=foo` added to the URL when doing searches.
+
+        If the key is not referenced in the search configuration, then no parameter
+        will be added. If the parameter is in the search configuration, but there
+        is no experiment, or the experiment does not set a value, then the
+        parameter will not be included in the search url.
+
+        Only the search team can update the configuration.
+    separatePrivateDefaultUIEnabled:
       type: boolean
+      setPref:
+        branch: user
+        pref: browser.search.separatePrivateDefault.ui.enabled
       description: Whether the UI for the separate private default feature is enabled.
-    seperatePrivateDefaultUrlbarResultEnabled:
+    separatePrivateDefaultUrlbarResultEnabled:
       type: boolean
+      setPref:
+        branch: user
+        pref: browser.search.separatePrivateDefault.urlbarResult.enabled
       description: Whether the urlbar result for the separate private default is shown.
 
 urlbar:
@@ -4077,7 +4048,12 @@ certCompression:
 bounceTrackingProtection:
   description: Controls the Bounce Tracking Protection feature.
   owner: [email protected]
-  hasExposure: false
+  isEarlyStartup: true
+  hasExposure: true
+  exposureDescription: >-
+    Exposure is recored after every purge run which purged at least one tracker.
+    Exposure is only recorded when the feature is fully enabled and not in
+    dry-run mode.
   variables:
     mode:
       type: int

diff --git a/experimenter/experimenter/features/manifests/firefox-desktop/v136.0.0/experimenter.yaml b/experimenter/experimenter/features/manifests/firefox-desktop/v136.0.0/experimenter.yaml
@@ -78,57 +78,11 @@ prefFlips:
     path: toolkit/components/nimbus/schemas/PrefFlipsFeature.schema.json
 
 
-# `search` is for search engine experimentation features which do not require
-# isEarlyStartup to be set.
 search:
-  description: Search engine experimentation support and testing features.
+  description: Search service related features.
   owner: [email protected]
   hasExposure: false
   variables:
-    extraParams:
-      type: json
-      description: >-
-        This allows extra parameters to be set for search engines requests including,
-        where calls to the suggestions API, the search engine configuration defines
-        those parameters.
-
-        The use of this field should be coordinated with the Search team.
-
-        The field value is an array of objects with key/value fields. For example:
-
-        [
-          {"key": "google_channel_row", "value": "foo"}
-        ]
-
-        This is matched to a section in the search configuration:
-
-        "extraParams": [
-          {
-            "name": "channel",
-            "pref": "google_channel_row",
-            "condition": "pref"
-          }
-        ],
-
-        In this case, the resulting URL for the appropriate search engine would have
-        `&channel=foo` added to the URL when doing searches.
-
-        If the key is not referenced in the search configuration, then no parameter
-        will be added. Only the search team can update the configuration.
-    logEnabled:
-      type: boolean
-      setPref:
-        branch: default
-        pref: browser.search.log
-      description: >-
-        Whether or not enable search log in their console.
-    richSuggestionsFeatureGate:
-      type: boolean
-      setPref:
-        branch: default
-        pref: browser.urlbar.richSuggestions.featureGate
-      description: >-
-        Feature gate that controls whether Rich Suggestions are enabled.
     scotchBonnetEnableOverride:
       type: boolean
       setPref:
@@ -142,18 +96,6 @@ search:
         * Search term persistence
         * Intuitive search keywords
         * HTTP swap
-    serpEventTelemetryCategorizationEnabled:
-      type: boolean
-      setPref:
-        branch: default
-        pref: browser.search.serpEventTelemetryCategorization.enabled
-      description: Whether the Glean SERP event telemetry for SERP categorization is enabled.
-    trendingEnabled:
-      type: boolean
-      setPref:
-        branch: default
-        pref: browser.urlbar.trending.featureGate
-      description: Feature gate that controls whether trending suggestions are enabled.
     trendingRequireSearchMode:
       type: boolean
       setPref:
@@ -166,43 +108,72 @@ search:
         branch: default
         pref: browser.urlbar.trending.maxResultsNoSearchMode
       description: The maximum number of trending results mode outside search mode.
-    newSearchConfigEnabled:
-      type: boolean
-      setPref:
-        branch: user
-        pref: browser.search.newSearchConfig.enabled
-      description: >-
-        Whether search-config-v2 is enabled for the user. This will only take
-        effect when the user restarts.
-        Obsolete. This is kept until all multi-feature roll-outs using it are
-        ended to prevent un-enrollment.
     targetExperiment:
       type: string
       description: >-
-        The slug of the experiment someone is requesting enrollment and branch
-        information for. (Note that the featureId needs to be set to "search".)
+        Recorded in SERP telemetry, this is the slug of the experiment someone
+        is requesting enrollment and branch information for. (Note that the
+        featureId needs to be set to "search".)
 
-# `searchConfiguration` is for search experiment features for items that require
-# isEarlyStartup to be true. These items may require a reload of the search
-# engine configuration, and an additional reload may happen during the startup
-# process.
 searchConfiguration:
-  description: Search experimentation support for the engine configuration
+  description: >-
+    Search experimentation support for the engine configuration. Some of these
+    options may cause an additional reload to occur during the startup phase.
   owner: [email protected]
-  isEarlyStartup: true
   hasExposure: false
   variables:
     experiment:
       type: string
-      fallbackPref: browser.search.experiment
+      setPref:
+        branch: user
+        pref: browser.search.experiment
       description: >-
         Used to activate only matching configurations that contain the value in
         `experiment`
-    seperatePrivateDefaultUIEnabled:
+    extraParams:
+      type: json
+      description: >-
+        This allows extra parameters to be set for search engines requests including,
+        where calls to the suggestions API, the search engine configuration defines
+        those parameters.
+
+        The use of this field should be coordinated with the Search team.
+
+        The field value is an array of objects with key/value fields. For example:
+
+        [
+          {"key": "google_channel_row", "value": "foo"}
+        ]
+
+        This is matched to a section in the search configuration:
+
+        "params": [
+          {
+            "name": "channel",
+            "experimentConfig": "google_channel_row"
+          }
+        ],
+
+        In this case, the resulting URL for the appropriate search engine would have
+        `&channel=foo` added to the URL when doing searches.
+
+        If the key is not referenced in the search configuration, then no parameter
+        will be added. If the parameter is in the search configuration, but there
+        is no experiment, or the experiment does not set a value, then the
+        parameter will not be included in the search url.
+
+        Only the search team can update the configuration.
+    separatePrivateDefaultUIEnabled:
       type: boolean
+      setPref:
+        branch: user
+        pref: browser.search.separatePrivateDefault.ui.enabled
       description: Whether the UI for the separate private default feature is enabled.
-    seperatePrivateDefaultUrlbarResultEnabled:
+    separatePrivateDefaultUrlbarResultEnabled:
       type: boolean
+      setPref:
+        branch: user
+        pref: browser.search.separatePrivateDefault.urlbarResult.enabled
       description: Whether the urlbar result for the separate private default is shown.
 
 urlbar:
@@ -4077,7 +4048,12 @@ certCompression:
 bounceTrackingProtection:
   description: Controls the Bounce Tracking Protection feature.
   owner: [email protected]
-  hasExposure: false
+  isEarlyStartup: true
+  hasExposure: true
+  exposureDescription: >-
+    Exposure is recored after every purge run which purged at least one tracker.
+    Exposure is only recorded when the feature is fully enabled and not in
+    dry-run mode.
   variables:
     mode:
       type: int