Skip to content

[DENG-10877] Add fenix_nightly and fennec_aurora to glean_v2_to_v1 allowlist #315

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BenWu wants to merge 2 commits into
base: main
Choose a base branch
from
+6 −5
Open

[DENG-10877] Add fenix_nightly and fennec_aurora to glean_v2_to_v1 allowlist #315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
308c115
[DENG-10877] Add fenix_nightly and fennec_aurora to glean_v2_to_v1 al…
BenWu Apr 1, 2026
c2d6f18
Merge branch 'main' into benwu/fenix-v2-to-v1
BenWu May 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion mozilla_schema_generator/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,11 +238,12 @@ def write_schema(
continue

use_metrics_blocklist = version == 2 or repo["app_id"] in v1_overwrite_allowlist
schema_version = 2 if repo["app_id"] in v1_overwrite_allowlist else version

schema_generator = GleanPing(
repo,
mps_branch=mps_branch,
version=version,
version=schema_version,
use_metrics_blocklist=use_metrics_blocklist,
)
schemas = schema_generator.generate_schema(
Expand Down
4 changes: 2 additions & 2 deletions mozilla_schema_generator/configs/glean_v1_overwrite_allowlist.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
#- net-thunderbird-android-daily
#- org-mozilla-connect-firefox
#- org-mozilla-fenix
#- org-mozilla-fenix-nightly
#- org-mozilla-fennec-aurora
- org-mozilla-fenix-nightly
- org-mozilla-fennec-aurora
#- org-mozilla-firefox
#- org-mozilla-firefox-beta
#- org-mozilla-firefox-vpn
Expand Down
4 changes: 2 additions & 2 deletions tests/test_glean.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1468,7 +1468,7 @@ def test_v2_allowlist_overwrite_v1(
glean_v2_allowlist,
glean_v1_overwrite_allowlist,
):
"""Should write only v1 with metrics blocklist when in v1_overwrite allowlist."""
"""Should write v1 with v2 schema and metrics blocklist when in v1_overwrite allowlist."""
repo = {"app_id": "firefox-desktop"}

msg_main.write_schema(
Expand All @@ -1484,7 +1484,7 @@ def test_v2_allowlist_overwrite_v1(

assert mock_glean_ping.call_count == 1
mock_glean_ping.assert_any_call(
repo, mps_branch="", version=1, use_metrics_blocklist=True
repo, mps_branch="", version=2, use_metrics_blocklist=True
)

@patch("mozilla_schema_generator.__main__.dump_schema")
Expand Down