From 7c63b488bdfdd73500f8d4d7ec48718a5f7a3637 Mon Sep 17 00:00:00 2001 From: dataops-ci-bot Date: Wed, 18 Dec 2024 13:16:29 +0000 Subject: [PATCH] chore(nimbus): Update External Configs --- .../features/manifests/fenix/.ref-cache.yaml | 6 ++-- .../manifests/firefox-desktop/.ref-cache.yaml | 10 +++--- .../firefox-desktop/experimenter.yaml | 25 ++++++++++--- .../NimbusTelemetryFeature.schema.json | 35 +++++++++++++++++++ .../v135.0.0/experimenter.yaml | 25 ++++++++++--- .../NimbusTelemetryFeature.schema.json | 35 +++++++++++++++++++ .../manifests/focus-ios/.ref-cache.yaml | 6 ++-- .../features/manifests/ios/.ref-cache.yaml | 6 ++-- 8 files changed, 124 insertions(+), 24 deletions(-) create mode 100644 experimenter/experimenter/features/manifests/firefox-desktop/schemas/toolkit/components/nimbus/schemas/NimbusTelemetryFeature.schema.json create mode 100644 experimenter/experimenter/features/manifests/firefox-desktop/v135.0.0/schemas/toolkit/components/nimbus/schemas/NimbusTelemetryFeature.schema.json diff --git a/experimenter/experimenter/features/manifests/fenix/.ref-cache.yaml b/experimenter/experimenter/features/manifests/fenix/.ref-cache.yaml index 0ba69abc4e..4a6b857b0a 100644 --- a/experimenter/experimenter/features/manifests/fenix/.ref-cache.yaml +++ b/experimenter/experimenter/features/manifests/fenix/.ref-cache.yaml @@ -1,3 +1,3 @@ -beta: 1d2c49699acaffa690961417d5ddb7f332264db5 -master: 66aaf96f955d9bdc4bdb087a5075d5fbff2b9c8d -release: c204af1d49b724b88bc289ea38c4d50a78d133ef +beta: 55133241ef7a7ba6cf5b98af4ca9b8d74e06396e +master: 70fb2d2a702db4cb455d282be77ecfe9bdcea589 +release: af473f7473be7a851b294b3bb9edd7ca8968895e diff --git a/experimenter/experimenter/features/manifests/firefox-desktop/.ref-cache.yaml b/experimenter/experimenter/features/manifests/firefox-desktop/.ref-cache.yaml index f2eaa6d7d7..0ccdd83987 100644 --- 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: 87c5950960511db3f64a06208ea24bf212638a23 -central: f4d133d6555bf90b949f8d138bb32c88a55c1ceb -esr115: 7b461b7d80acc34e0193fa0fbed98f71242b388a -esr128: 38b1579734e224bc72cddd532877d3b864d7d910 -release: 6ad91dc44daed9cacf53946523ebf99649f04ef5 +beta: 8d362d0dd6ca9f65ab0e73d8609c4236cbd222f4 +central: d01b815e2e1a7baed43f9b0a1e04e109109648bf +esr115: 36fd7b6b3ddbffe940e402af3c6d1b44ce285543 +esr128: 80804a4f2b2df8460c9fca53a294ff945df9eeec +release: 85fef6eb8f2cd56494960fee7b000e0bf9f04aaa diff --git a/experimenter/experimenter/features/manifests/firefox-desktop/experimenter.yaml b/experimenter/experimenter/features/manifests/firefox-desktop/experimenter.yaml index f974149a69..43452caaa8 100644 --- a/experimenter/experimenter/features/manifests/firefox-desktop/experimenter.yaml +++ b/experimenter/experimenter/features/manifests/firefox-desktop/experimenter.yaml @@ -2852,7 +2852,7 @@ legacyHeartbeat: queryStripping: description: Query parameter stripping anti-tracking feature. - owner: pbz@mozilla.com + owner: emz@mozilla.com hasExposure: false variables: enabledNormalBrowsing: @@ -3504,7 +3504,7 @@ bookmarks: cookieBannerHandling: description: Automatically handle cookie banners on the user's behalf. - owner: pbz@mozilla.com + owner: emz@mozilla.com hasExposure: false variables: modeNormalBrowsing: @@ -3723,15 +3723,30 @@ nimbusIsReady: nimbusTelemetry: description: A feature that enables or disables Nimbus telemetry. - owner: chumphreys@mozilla.com + owner: nimbus-team@mozilla.com hasExposure: false applications: - firefox-desktop variables: gleanMetricConfiguration: - description: A Glean metric configuration JSON blob. + description: > + A Glean metric configuration JSON blob. + + This is limited to configuring the following categories: + - nimbus_events + - nimbus_targeting_context + - nimbus_targeting_environment + type: json + + nimbusTargetingEnvironment: + description: > + Configuration for the nimbus_targeting_environment telemetry category. type: json + schema: + uri: resource://nimbus/schemas/NimbusTelemetryFeature.schema.json + path: toolkit/components/nimbus/schemas/NimbusTelemetryFeature.schema.json + httpsFirst: description: >- Prefs for HTTPS-First, which upgrades all top-level page loads to HTTPS and @@ -3931,7 +3946,7 @@ certCompression: bounceTrackingProtection: description: Controls the Bounce Tracking Protection feature. - owner: pbz@mozilla.com + owner: emz@mozilla.com hasExposure: false variables: enabled: diff --git a/experimenter/experimenter/features/manifests/firefox-desktop/schemas/toolkit/components/nimbus/schemas/NimbusTelemetryFeature.schema.json b/experimenter/experimenter/features/manifests/firefox-desktop/schemas/toolkit/components/nimbus/schemas/NimbusTelemetryFeature.schema.json new file mode 100644 index 0000000000..668236e81c --- /dev/null +++ b/experimenter/experimenter/features/manifests/firefox-desktop/schemas/toolkit/components/nimbus/schemas/NimbusTelemetryFeature.schema.json @@ -0,0 +1,35 @@ +{ + "$schema": "https://json-schema.org/draft/2020-12/schema", + "type": "object", + "properties": { + "gleanMetricConfiguration": { + "type": "object", + "properties": { + "metrics_enabled": { + "type": "object", + "patternProperties": { + "^nimbus_targeting_environment\\..*": { "type": "boolean" }, + "^nimbus_targeting_context\\..*": { "type": "boolean" }, + "^nimbus_events\\..*": { "type": "boolean" } + }, + "additionalProperties": false + } + }, + "additionalProperties": true + }, + "nimbusTargetingEnvironment": { + "type": "object", + "properties": { + "recordAttrs": { + "description": "A list of attributes that should be recorded in the nimbus_targeting_environment.targeting_context_value metric. If not provided, it will default to all attributes.", + "type": "array", + "items": { + "type": "string" + } + } + }, + "additionalProperties": true + } + }, + "additionalProperties": true +} diff --git a/experimenter/experimenter/features/manifests/firefox-desktop/v135.0.0/experimenter.yaml b/experimenter/experimenter/features/manifests/firefox-desktop/v135.0.0/experimenter.yaml index f974149a69..43452caaa8 100644 --- a/experimenter/experimenter/features/manifests/firefox-desktop/v135.0.0/experimenter.yaml +++ b/experimenter/experimenter/features/manifests/firefox-desktop/v135.0.0/experimenter.yaml @@ -2852,7 +2852,7 @@ legacyHeartbeat: queryStripping: description: Query parameter stripping anti-tracking feature. - owner: pbz@mozilla.com + owner: emz@mozilla.com hasExposure: false variables: enabledNormalBrowsing: @@ -3504,7 +3504,7 @@ bookmarks: cookieBannerHandling: description: Automatically handle cookie banners on the user's behalf. - owner: pbz@mozilla.com + owner: emz@mozilla.com hasExposure: false variables: modeNormalBrowsing: @@ -3723,15 +3723,30 @@ nimbusIsReady: nimbusTelemetry: description: A feature that enables or disables Nimbus telemetry. - owner: chumphreys@mozilla.com + owner: nimbus-team@mozilla.com hasExposure: false applications: - firefox-desktop variables: gleanMetricConfiguration: - description: A Glean metric configuration JSON blob. + description: > + A Glean metric configuration JSON blob. + + This is limited to configuring the following categories: + - nimbus_events + - nimbus_targeting_context + - nimbus_targeting_environment + type: json + + nimbusTargetingEnvironment: + description: > + Configuration for the nimbus_targeting_environment telemetry category. type: json + schema: + uri: resource://nimbus/schemas/NimbusTelemetryFeature.schema.json + path: toolkit/components/nimbus/schemas/NimbusTelemetryFeature.schema.json + httpsFirst: description: >- Prefs for HTTPS-First, which upgrades all top-level page loads to HTTPS and @@ -3931,7 +3946,7 @@ certCompression: bounceTrackingProtection: description: Controls the Bounce Tracking Protection feature. - owner: pbz@mozilla.com + owner: emz@mozilla.com hasExposure: false variables: enabled: diff --git a/experimenter/experimenter/features/manifests/firefox-desktop/v135.0.0/schemas/toolkit/components/nimbus/schemas/NimbusTelemetryFeature.schema.json b/experimenter/experimenter/features/manifests/firefox-desktop/v135.0.0/schemas/toolkit/components/nimbus/schemas/NimbusTelemetryFeature.schema.json new file mode 100644 index 0000000000..668236e81c --- /dev/null +++ b/experimenter/experimenter/features/manifests/firefox-desktop/v135.0.0/schemas/toolkit/components/nimbus/schemas/NimbusTelemetryFeature.schema.json @@ -0,0 +1,35 @@ +{ + "$schema": "https://json-schema.org/draft/2020-12/schema", + "type": "object", + "properties": { + "gleanMetricConfiguration": { + "type": "object", + "properties": { + "metrics_enabled": { + "type": "object", + "patternProperties": { + "^nimbus_targeting_environment\\..*": { "type": "boolean" }, + "^nimbus_targeting_context\\..*": { "type": "boolean" }, + "^nimbus_events\\..*": { "type": "boolean" } + }, + "additionalProperties": false + } + }, + "additionalProperties": true + }, + "nimbusTargetingEnvironment": { + "type": "object", + "properties": { + "recordAttrs": { + "description": "A list of attributes that should be recorded in the nimbus_targeting_environment.targeting_context_value metric. If not provided, it will default to all attributes.", + "type": "array", + "items": { + "type": "string" + } + } + }, + "additionalProperties": true + } + }, + "additionalProperties": true +} diff --git a/experimenter/experimenter/features/manifests/focus-ios/.ref-cache.yaml b/experimenter/experimenter/features/manifests/focus-ios/.ref-cache.yaml index 96fa6b6104..a27ba6053a 100644 --- a/experimenter/experimenter/features/manifests/focus-ios/.ref-cache.yaml +++ b/experimenter/experimenter/features/manifests/focus-ios/.ref-cache.yaml @@ -12,7 +12,7 @@ focus/klar-v131.0: 34d92c8df1b1522a1da88c23879b439d763ec133 focus/klar-v131.1: b7dca2271b14988837524a30eb154d91eb5e4912 focus/klar-v132.0: d9ed6134db59ff456d343e2bb211aefd040319ac focus/klar-v133.0: a3372669a06fa684d3c5945c317d6787e3125303 -main: 394d238bbc555d3e6c59f9bb672e586b4af58a2b +main: cd731c356e44776fd754932b3895e1969fd74b65 release/v124: da250bed9e19c4978d4400d6d404cb312e33636e release/v125: a3e1e0773a00009e08d95726fd518ab642255ccd release/v126: 6f305409b4af68e8404401a2caad8cb0da9a0494 @@ -22,5 +22,5 @@ release/v129: 500c57e46f0de7c5125ba823eb4f72500934bdca release/v130: a48ec1b1f0219e1987bb38bc4f6b838f37dc6f12 release/v131: 7444df581b62d357df12ddc3c90d821d940efbb8 release/v132: cb318d0061ec6354167ecc1968020d5d75f1bffc -release/v133: 5230c008f4c592fb4bf229f435d24dc912d96d16 -release/v134: 9c03589c19b92066405ccfa66b76686a48d49824 +release/v133: 80bf9ad762058e5dede8b222f348671f949ad855 +release/v134: be550d94c2c7bc8b8902cdf7fe542a64e73a381a diff --git a/experimenter/experimenter/features/manifests/ios/.ref-cache.yaml b/experimenter/experimenter/features/manifests/ios/.ref-cache.yaml index d70ef1f119..1b8145af00 100644 --- a/experimenter/experimenter/features/manifests/ios/.ref-cache.yaml +++ b/experimenter/experimenter/features/manifests/ios/.ref-cache.yaml @@ -1,4 +1,4 @@ -main: 394d238bbc555d3e6c59f9bb672e586b4af58a2b +main: cd731c356e44776fd754932b3895e1969fd74b65 release/v117: 43b690c450066d4dde1b2ccb93ed3714d244d502 release/v118: 89a7ea3c3372e5a4ef5b3c5b85499d26198d0524 release/v119: 7dc381f991c6d2a983c3ba7f0cffd880e8c29e7b @@ -15,8 +15,8 @@ release/v129: 500c57e46f0de7c5125ba823eb4f72500934bdca release/v130: a48ec1b1f0219e1987bb38bc4f6b838f37dc6f12 release/v131: 7444df581b62d357df12ddc3c90d821d940efbb8 release/v132: cb318d0061ec6354167ecc1968020d5d75f1bffc -release/v133: 5230c008f4c592fb4bf229f435d24dc912d96d16 -release/v134: 9c03589c19b92066405ccfa66b76686a48d49824 +release/v133: 80bf9ad762058e5dede8b222f348671f949ad855 +release/v134: be550d94c2c7bc8b8902cdf7fe542a64e73a381a v117.0: 3b275ab1e4ccef769d84437033c0c68acfd2df8a v117.1: 55ddcf473a65d106d43f6d2ae5af4076d6d03688 v117.2: 5cc367aa8857199cd8a54d53e8faf6696c5614c3