Skip to content

Commit

Permalink
chore(glam): move GLAM tables to moz-fx-glam-prod (#6819)
Browse files Browse the repository at this point in the history
  • Loading branch information
edugfilho authored Jan 15, 2025
1 parent e0cea6c commit 032ac41
Show file tree
Hide file tree
Showing 55 changed files with 26 additions and 24 deletions.
2 changes: 2 additions & 0 deletions bqetl_project.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ default:
- moz-fx-data-pioneer-nonprod
- moz-fx-data-pioneer-prod
- moz-fx-data-glam-prod-fca7
- moz-fx-glam-prod
public_project: mozilla-public-data

monitoring:
Expand Down Expand Up @@ -199,6 +200,7 @@ dry_run:
# Dataset sql/glam-fenix-dev:glam_etl was not found
- sql/glam-fenix-dev/glam_etl/**/*.sql
- sql/moz-fx-data-glam-prod-fca7/glam_etl/**/*.sql
- sql/moz-fx-glam-prod/glam_etl/**/*.sql
# Source table does not have a verifiable schema
- sql/moz-fx-data-shared-prod/monitoring_derived/outerbounds_cost_per_flow_run_v1/view.sql
- sql/moz-fx-data-shared-prod/monitoring_derived/outerbounds_cost_per_flow_v1/view.sql
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CREATE OR REPLACE VIEW
`moz-fx-data-glam-prod-fca7.glam_etl.glam_desktop_beta_aggregates` AS (
`moz-fx-glam-prod.glam_etl.glam_desktop_beta_aggregates` AS (
WITH base AS (
SELECT
* EXCEPT (percentiles, non_norm_percentiles),
Expand All @@ -17,7 +17,7 @@ CREATE OR REPLACE VIEW
percentiles AS existing_percentiles,
non_norm_percentiles AS existing_non_norm_percentiles
FROM
`moz-fx-data-glam-prod-fca7.glam_etl.glam_desktop_beta_aggregates_v1`
`moz-fx-glam-prod.glam_etl.glam_desktop_beta_aggregates_v1`
WHERE
-- filter based on https://github.com/mozilla/python_mozaggregator/blob/6c0119bfd0b535346c37cb3f707d998039d3e24b/mozaggregator/service.py#L51
(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CREATE OR REPLACE VIEW
`moz-fx-data-glam-prod-fca7.glam_etl.glam_desktop_nightly_aggregates` AS (
`moz-fx-glam-prod.glam_etl.glam_desktop_nightly_aggregates` AS (
WITH base AS (
SELECT
* EXCEPT (percentiles, non_norm_percentiles),
Expand All @@ -17,7 +17,7 @@ CREATE OR REPLACE VIEW
percentiles AS existing_percentiles,
non_norm_percentiles AS existing_non_norm_percentiles
FROM
`moz-fx-data-glam-prod-fca7.glam_etl.glam_desktop_nightly_aggregates_v1`
`moz-fx-glam-prod.glam_etl.glam_desktop_nightly_aggregates_v1`
WHERE
-- filter based on https://github.com/mozilla/python_mozaggregator/blob/6c0119bfd0b535346c37cb3f707d998039d3e24b/mozaggregator/service.py#L51
(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CREATE OR REPLACE VIEW
`moz-fx-data-glam-prod-fca7.glam_etl.glam_desktop_release_aggregates` AS (
`moz-fx-glam-prod.glam_etl.glam_desktop_release_aggregates` AS (
WITH base AS (
SELECT
* EXCEPT (percentiles, non_norm_percentiles),
Expand All @@ -17,7 +17,7 @@ CREATE OR REPLACE VIEW
percentiles AS existing_percentiles,
non_norm_percentiles AS existing_non_norm_percentiles
FROM
`moz-fx-data-glam-prod-fca7.glam_etl.glam_desktop_release_aggregates_v1`
`moz-fx-glam-prod.glam_etl.glam_desktop_release_aggregates_v1`
WHERE
-- filter based on https://github.com/mozilla/python_mozaggregator/blob/6c0119bfd0b535346c37cb3f707d998039d3e24b/mozaggregator/service.py#L51
(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CREATE OR REPLACE VIEW
`moz-fx-data-glam-prod-fca7.glam_etl.glam_fenix_beta_aggregates` AS (
`moz-fx-glam-prod.glam_etl.glam_fenix_beta_aggregates` AS (
WITH base AS (
SELECT
* EXCEPT (percentiles, non_norm_percentiles),
Expand All @@ -17,7 +17,7 @@ CREATE OR REPLACE VIEW
percentiles AS existing_percentiles,
non_norm_percentiles AS existing_non_norm_percentiles
FROM
`moz-fx-data-glam-prod-fca7.glam_etl.glam_fenix_beta_aggregates_v1`
`moz-fx-glam-prod.glam_etl.glam_fenix_beta_aggregates_v1`
WHERE
-- filter based on https://github.com/mozilla/python_mozaggregator/blob/6c0119bfd0b535346c37cb3f707d998039d3e24b/mozaggregator/service.py#L51
(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ MERGE INTO
SELECT
*
FROM
`moz-fx-data-glam-prod-fca7.glam_etl.org_mozilla_fenix_glam_beta__extract_probe_counts_v1`
`moz-fx-glam-prod.glam_etl.org_mozilla_fenix_glam_beta__extract_probe_counts_v1`
) S
ON T.version = S.version
AND T.ping_type = S.ping_type
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CREATE OR REPLACE VIEW
`moz-fx-data-glam-prod-fca7.glam_etl.glam_fenix_nightly_aggregates` AS (
`moz-fx-glam-prod.glam_etl.glam_fenix_nightly_aggregates` AS (
WITH base AS (
SELECT
* EXCEPT (percentiles, non_norm_percentiles),
Expand All @@ -17,7 +17,7 @@ CREATE OR REPLACE VIEW
percentiles AS existing_percentiles,
non_norm_percentiles AS existing_non_norm_percentiles
FROM
`moz-fx-data-glam-prod-fca7.glam_etl.glam_fenix_nightly_aggregates_v1`
`moz-fx-glam-prod.glam_etl.glam_fenix_nightly_aggregates_v1`
WHERE
-- filter based on https://github.com/mozilla/python_mozaggregator/blob/6c0119bfd0b535346c37cb3f707d998039d3e24b/mozaggregator/service.py#L51
(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ MERGE INTO
SELECT
*
FROM
`moz-fx-data-glam-prod-fca7.glam_etl.org_mozilla_fenix_glam_nightly__extract_probe_counts_v1`
`moz-fx-glam-prod.glam_etl.org_mozilla_fenix_glam_nightly__extract_probe_counts_v1`
) S
ON T.version = S.version
AND T.ping_type = S.ping_type
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CREATE OR REPLACE VIEW
`moz-fx-data-glam-prod-fca7.glam_etl.glam_fenix_release_aggregates` AS (
`moz-fx-glam-prod.glam_etl.glam_fenix_release_aggregates` AS (
WITH base AS (
SELECT
* EXCEPT (percentiles, non_norm_percentiles),
Expand All @@ -17,7 +17,7 @@ CREATE OR REPLACE VIEW
percentiles AS existing_percentiles,
non_norm_percentiles AS existing_non_norm_percentiles
FROM
`moz-fx-data-glam-prod-fca7.glam_etl.glam_fenix_release_aggregates_v1`
`moz-fx-glam-prod.glam_etl.glam_fenix_release_aggregates_v1`
WHERE
-- filter based on https://github.com/mozilla/python_mozaggregator/blob/6c0119bfd0b535346c37cb3f707d998039d3e24b/mozaggregator/service.py#L51
(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ MERGE INTO
SELECT
*
FROM
`moz-fx-data-glam-prod-fca7.glam_etl.org_mozilla_fenix_glam_release__extract_probe_counts_v1`
`moz-fx-glam-prod.glam_etl.org_mozilla_fenix_glam_release__extract_probe_counts_v1`
) S
ON T.version = S.version
AND T.ping_type = S.ping_type
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CREATE OR REPLACE VIEW
`moz-fx-data-glam-prod-fca7.glam_etl.glam_fog_beta_aggregates` AS (
`moz-fx-glam-prod.glam_etl.glam_fog_beta_aggregates` AS (
WITH base AS (
SELECT
* EXCEPT (percentiles, non_norm_percentiles),
Expand All @@ -17,7 +17,7 @@ CREATE OR REPLACE VIEW
percentiles AS existing_percentiles,
non_norm_percentiles AS existing_non_norm_percentiles
FROM
`moz-fx-data-glam-prod-fca7.glam_etl.glam_fog_beta_aggregates_v1`
`moz-fx-glam-prod.glam_etl.glam_fog_beta_aggregates_v1`
WHERE
-- filter based on https://github.com/mozilla/python_mozaggregator/blob/6c0119bfd0b535346c37cb3f707d998039d3e24b/mozaggregator/service.py#L51
(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ MERGE INTO
SELECT
*
FROM
`moz-fx-data-glam-prod-fca7.glam_etl.firefox_desktop_glam_beta__extract_probe_counts_v1`
`moz-fx-glam-prod.glam_etl.firefox_desktop_glam_beta__extract_probe_counts_v1`
) S
ON T.version = S.version
AND T.ping_type = S.ping_type
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CREATE OR REPLACE VIEW
`moz-fx-data-glam-prod-fca7.glam_etl.glam_fog_nightly_aggregates` AS (
`moz-fx-glam-prod.glam_etl.glam_fog_nightly_aggregates` AS (
WITH base AS (
SELECT
* EXCEPT (percentiles, non_norm_percentiles),
Expand All @@ -17,7 +17,7 @@ CREATE OR REPLACE VIEW
percentiles AS existing_percentiles,
non_norm_percentiles AS existing_non_norm_percentiles
FROM
`moz-fx-data-glam-prod-fca7.glam_etl.glam_fog_nightly_aggregates_v1`
`moz-fx-glam-prod.glam_etl.glam_fog_nightly_aggregates_v1`
WHERE
-- filter based on https://github.com/mozilla/python_mozaggregator/blob/6c0119bfd0b535346c37cb3f707d998039d3e24b/mozaggregator/service.py#L51
(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ MERGE INTO
SELECT
*
FROM
`moz-fx-data-glam-prod-fca7.glam_etl.firefox_desktop_glam_nightly__extract_probe_counts_v1`
`moz-fx-glam-prod.glam_etl.firefox_desktop_glam_nightly__extract_probe_counts_v1`
) S
ON T.version = S.version
AND T.ping_type = S.ping_type
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CREATE OR REPLACE VIEW
`moz-fx-data-glam-prod-fca7.glam_etl.glam_fog_release_aggregates` AS (
`moz-fx-glam-prod.glam_etl.glam_fog_release_aggregates` AS (
WITH base AS (
SELECT
* EXCEPT (percentiles, non_norm_percentiles),
Expand All @@ -17,7 +17,7 @@ CREATE OR REPLACE VIEW
percentiles AS existing_percentiles,
non_norm_percentiles AS existing_non_norm_percentiles
FROM
`moz-fx-data-glam-prod-fca7.glam_etl.glam_fog_release_aggregates_v1`
`moz-fx-glam-prod.glam_etl.glam_fog_release_aggregates_v1`
WHERE
-- filter based on https://github.com/mozilla/python_mozaggregator/blob/6c0119bfd0b535346c37cb3f707d998039d3e24b/mozaggregator/service.py#L51
(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ MERGE INTO
SELECT
*
FROM
`moz-fx-data-glam-prod-fca7.glam_etl.firefox_desktop_glam_release__extract_probe_counts_v1`
`moz-fx-glam-prod.glam_etl.firefox_desktop_glam_release__extract_probe_counts_v1`
) S
ON T.version = S.version
AND T.ping_type = S.ping_type
Expand Down

1 comment on commit 032ac41

@dataops-ci-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Integration report for "chore(glam): move GLAM tables to moz-fx-glam-prod (#6819)"

sql.diff

Click to expand!
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/dags/bqetl_glam_refresh_aggregates_fog_release.py /tmp/workspace/generated-sql/dags/bqetl_glam_refresh_aggregates_fog_release.py
--- /tmp/workspace/main-generated-sql/dags/bqetl_glam_refresh_aggregates_fog_release.py	2025-01-15 22:32:27.000000000 +0000
+++ /tmp/workspace/generated-sql/dags/bqetl_glam_refresh_aggregates_fog_release.py	2025-01-15 22:46:17.000000000 +0000
@@ -67,12 +67,12 @@
         task_id="glam_etl__glam_fog_release_aggregates__v1",
         destination_table=None,
         dataset_id="glam_etl",
-        project_id="moz-fx-data-glam-prod-fca7",
+        project_id="moz-fx-glam-prod",
         owner="[email protected]",
         email=["[email protected]"],
         date_partition_parameter=None,
         depends_on_past=False,
-        sql_file_path="sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fog_release_aggregates_v1/script.sql",
+        sql_file_path="sql/moz-fx-glam-prod/glam_etl/glam_fog_release_aggregates_v1/script.sql",
     )
 
     glam_etl__glam_fog_release_aggregates__v1.set_upstream(wait_for_fog_release_done)
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/dags/bqetl_glam_refresh_aggregates.py /tmp/workspace/generated-sql/dags/bqetl_glam_refresh_aggregates.py
--- /tmp/workspace/main-generated-sql/dags/bqetl_glam_refresh_aggregates.py	2025-01-15 22:32:27.000000000 +0000
+++ /tmp/workspace/generated-sql/dags/bqetl_glam_refresh_aggregates.py	2025-01-15 22:46:18.000000000 +0000
@@ -158,96 +158,96 @@
         task_id="glam_etl__glam_desktop_beta_aggregates__v1",
         destination_table=None,
         dataset_id="glam_etl",
-        project_id="moz-fx-data-glam-prod-fca7",
+        project_id="moz-fx-glam-prod",
         owner="[email protected]",
         email=["[email protected]"],
         date_partition_parameter=None,
         depends_on_past=False,
-        sql_file_path="sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_beta_aggregates_v1/script.sql",
+        sql_file_path="sql/moz-fx-glam-prod/glam_etl/glam_desktop_beta_aggregates_v1/script.sql",
     )
 
     glam_etl__glam_desktop_nightly_aggregates__v1 = bigquery_etl_query(
         task_id="glam_etl__glam_desktop_nightly_aggregates__v1",
         destination_table=None,
         dataset_id="glam_etl",
-        project_id="moz-fx-data-glam-prod-fca7",
+        project_id="moz-fx-glam-prod",
         owner="[email protected]",
         email=["[email protected]"],
         date_partition_parameter=None,
         depends_on_past=False,
-        sql_file_path="sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_nightly_aggregates_v1/script.sql",
+        sql_file_path="sql/moz-fx-glam-prod/glam_etl/glam_desktop_nightly_aggregates_v1/script.sql",
     )
 
     glam_etl__glam_desktop_release_aggregates__v1 = bigquery_etl_query(
         task_id="glam_etl__glam_desktop_release_aggregates__v1",
         destination_table=None,
         dataset_id="glam_etl",
-        project_id="moz-fx-data-glam-prod-fca7",
+        project_id="moz-fx-glam-prod",
         owner="[email protected]",
         email=["[email protected]"],
         date_partition_parameter=None,
         depends_on_past=False,
-        sql_file_path="sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_release_aggregates_v1/script.sql",
+        sql_file_path="sql/moz-fx-glam-prod/glam_etl/glam_desktop_release_aggregates_v1/script.sql",
     )
 
     glam_etl__glam_fenix_beta_aggregates__v1 = bigquery_etl_query(
         task_id="glam_etl__glam_fenix_beta_aggregates__v1",
         destination_table=None,
         dataset_id="glam_etl",
-        project_id="moz-fx-data-glam-prod-fca7",
+        project_id="moz-fx-glam-prod",
         owner="[email protected]",
         email=["[email protected]"],
         date_partition_parameter=None,
         depends_on_past=False,
-        sql_file_path="sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_beta_aggregates_v1/script.sql",
+        sql_file_path="sql/moz-fx-glam-prod/glam_etl/glam_fenix_beta_aggregates_v1/script.sql",
     )
 
     glam_etl__glam_fenix_nightly_aggregates__v1 = bigquery_etl_query(
         task_id="glam_etl__glam_fenix_nightly_aggregates__v1",
         destination_table=None,
         dataset_id="glam_etl",
-        project_id="moz-fx-data-glam-prod-fca7",
+        project_id="moz-fx-glam-prod",
         owner="[email protected]",
         email=["[email protected]"],
         date_partition_parameter=None,
         depends_on_past=False,
-        sql_file_path="sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_nightly_aggregates_v1/script.sql",
+        sql_file_path="sql/moz-fx-glam-prod/glam_etl/glam_fenix_nightly_aggregates_v1/script.sql",
     )
 
     glam_etl__glam_fenix_release_aggregates__v1 = bigquery_etl_query(
         task_id="glam_etl__glam_fenix_release_aggregates__v1",
         destination_table=None,
         dataset_id="glam_etl",
-        project_id="moz-fx-data-glam-prod-fca7",
+        project_id="moz-fx-glam-prod",
         owner="[email protected]",
         email=["[email protected]"],
         date_partition_parameter=None,
         depends_on_past=False,
-        sql_file_path="sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_release_aggregates_v1/script.sql",
+        sql_file_path="sql/moz-fx-glam-prod/glam_etl/glam_fenix_release_aggregates_v1/script.sql",
     )
 
     glam_etl__glam_fog_beta_aggregates__v1 = bigquery_etl_query(
         task_id="glam_etl__glam_fog_beta_aggregates__v1",
         destination_table=None,
         dataset_id="glam_etl",
-        project_id="moz-fx-data-glam-prod-fca7",
+        project_id="moz-fx-glam-prod",
         owner="[email protected]",
         email=["[email protected]"],
         date_partition_parameter=None,
         depends_on_past=False,
-        sql_file_path="sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fog_beta_aggregates_v1/script.sql",
+        sql_file_path="sql/moz-fx-glam-prod/glam_etl/glam_fog_beta_aggregates_v1/script.sql",
     )
 
     glam_etl__glam_fog_nightly_aggregates__v1 = bigquery_etl_query(
         task_id="glam_etl__glam_fog_nightly_aggregates__v1",
         destination_table=None,
         dataset_id="glam_etl",
-        project_id="moz-fx-data-glam-prod-fca7",
+        project_id="moz-fx-glam-prod",
         owner="[email protected]",
         email=["[email protected]"],
         date_partition_parameter=None,
         depends_on_past=False,
-        sql_file_path="sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fog_nightly_aggregates_v1/script.sql",
+        sql_file_path="sql/moz-fx-glam-prod/glam_etl/glam_fog_nightly_aggregates_v1/script.sql",
     )
 
     glam_etl__glam_desktop_beta_aggregates__v1.set_upstream(
Only in /tmp/workspace/main-generated-sql/sql/: moz-fx-data-glam-prod-fca7
Only in /tmp/workspace/generated-sql/sql/: moz-fx-glam-prod
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_beta_aggregates/metadata.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_beta_aggregates/metadata.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_beta_aggregates/metadata.yaml	2025-01-15 22:27:12.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_beta_aggregates/metadata.yaml	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
----
-friendly_name: GLAM Desktop beta aggregates
-description: |-
-  Data served by GLAM on Desktop beta.
-
-# Generated by bigquery_etl.dependency
-references:
-  view.sql:
-  - moz-fx-data-glam-prod-fca7.glam_etl.glam_desktop_beta_aggregates_v1
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_beta_aggregates/schema.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_beta_aggregates/schema.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_beta_aggregates/schema.yaml	2025-01-15 22:26:19.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_beta_aggregates/schema.yaml	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-fields:
-- name: version
-  type: INTEGER
-  mode: NULLABLE
-- name: os
-  type: STRING
-  mode: NULLABLE
-- name: build_id
-  type: STRING
-  mode: NULLABLE
-- name: process
-  type: STRING
-  mode: NULLABLE
-- name: metric
-  type: STRING
-  mode: NULLABLE
-- name: metric_key
-  type: STRING
-  mode: NULLABLE
-- name: client_agg_type
-  type: STRING
-  mode: NULLABLE
-- name: metric_type
-  type: STRING
-  mode: NULLABLE
-- name: total_users
-  type: BIGNUMERIC
-  mode: NULLABLE
-- name: histogram
-  type: STRING
-  mode: NULLABLE
-- name: percentiles
-  type: STRING
-  mode: NULLABLE
-- name: total_sample
-  type: BIGNUMERIC
-  mode: NULLABLE
-- name: non_norm_histogram
-  type: STRING
-  mode: NULLABLE
-- name: non_norm_percentiles
-  type: STRING
-  mode: NULLABLE
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_beta_aggregates/view.sql /tmp/workspace/generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_beta_aggregates/view.sql
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_beta_aggregates/view.sql	2025-01-15 22:26:19.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_beta_aggregates/view.sql	1970-01-01 00:00:00.000000000 +0000
@@ -1,94 +0,0 @@
-CREATE OR REPLACE VIEW
-  `moz-fx-data-glam-prod-fca7.glam_etl.glam_desktop_beta_aggregates` AS (
-    WITH base AS (
-      SELECT
-        * EXCEPT (percentiles, non_norm_percentiles),
-        IF(
-          percentiles IS NOT NULL,
-          NULL,
-          mozfun.glam.histogram_cast_struct(histogram)
-        ) AS struct_histogram,
-        IF(
-          metric_type IN ("scalar", "keyed-scalar")
-          OR non_norm_percentiles IS NOT NULL,
-          NULL,
-          mozfun.glam.histogram_cast_struct(non_norm_histogram)
-        ) AS struct_non_norm_histogram,
-        percentiles AS existing_percentiles,
-        non_norm_percentiles AS existing_non_norm_percentiles
-      FROM
-        `moz-fx-data-glam-prod-fca7.glam_etl.glam_desktop_beta_aggregates_v1`
-      WHERE
-  -- filter based on https://github.com/mozilla/python_mozaggregator/blob/6c0119bfd0b535346c37cb3f707d998039d3e24b/mozaggregator/service.py#L51
-        (
-          metric NOT LIKE r"%search\_counts%"
-          AND metric NOT LIKE r"%browser\_search%"
-          AND metric NOT LIKE r"%event\_counts%"
-          AND metric NOT LIKE r"%browser\_engagement\_navigation%"
-          AND metric NOT LIKE r"%manager\_message\_size%"
-          AND metric NOT LIKE r"%dropped\_frames\_proportion%"
-        )
-        AND metric_type NOT IN ("boolean", "keyed-scalar-boolean")
-    ),
-    calculated_percentiles AS (
-      SELECT
-        * EXCEPT (struct_histogram, struct_non_norm_histogram),
-        IF(
-          struct_histogram IS NOT NULL,
-          mozfun.glam.histogram_cast_json(
-            ARRAY<STRUCT<key STRING, value FLOAT64>>[
-              ('0.1', mozfun.glam.percentile(0.1, struct_histogram, metric_type)),
-              ('1', mozfun.glam.percentile(1, struct_histogram, metric_type)),
-              ('5', mozfun.glam.percentile(5, struct_histogram, metric_type)),
-              ('25', mozfun.glam.percentile(25, struct_histogram, metric_type)),
-              ('50', mozfun.glam.percentile(50, struct_histogram, metric_type)),
-              ('75', mozfun.glam.percentile(75, struct_histogram, metric_type)),
-              ('95', mozfun.glam.percentile(95, struct_histogram, metric_type)),
-              ('99', mozfun.glam.percentile(99, struct_histogram, metric_type)),
-              ('99.9', mozfun.glam.percentile(99.9, struct_histogram, metric_type))
-            ]
-          ),
-          existing_percentiles
-        ) AS percentiles,
-        IF(
-          struct_non_norm_histogram IS NOT NULL,
-          mozfun.glam.histogram_cast_json(
-            ARRAY<STRUCT<key STRING, value FLOAT64>>[
-              ('0.1', mozfun.glam.percentile(0.1, struct_non_norm_histogram, metric_type)),
-              ('1', mozfun.glam.percentile(1, struct_non_norm_histogram, metric_type)),
-              ('5', mozfun.glam.percentile(5, struct_non_norm_histogram, metric_type)),
-              ('25', mozfun.glam.percentile(25, struct_non_norm_histogram, metric_type)),
-              ('50', mozfun.glam.percentile(50, struct_non_norm_histogram, metric_type)),
-              ('75', mozfun.glam.percentile(75, struct_non_norm_histogram, metric_type)),
-              ('95', mozfun.glam.percentile(95, struct_non_norm_histogram, metric_type)),
-              ('99', mozfun.glam.percentile(99, struct_non_norm_histogram, metric_type)),
-              ('99.9', mozfun.glam.percentile(99.9, struct_non_norm_histogram, metric_type))
-            ]
-          ),
-          existing_non_norm_percentiles
-        ) AS non_norm_percentiles
-      FROM
-        base
-    )
-    SELECT
-      version,
-      os,
-      build_id,
-      process,
-      metric,
-      metric_key,
-      client_agg_type,
-      metric_type,
-      total_users,
-      histogram,
-      percentiles,
-      total_sample,
-      non_norm_histogram,
-      IF(
-        metric_type IN ("scalar", "keyed-scalar"),
-        percentiles,
-        non_norm_percentiles
-      ) AS non_norm_percentiles
-    FROM
-      calculated_percentiles
-  )
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_beta_aggregates_v1/metadata.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_beta_aggregates_v1/metadata.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_beta_aggregates_v1/metadata.yaml	2025-01-15 22:27:12.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_beta_aggregates_v1/metadata.yaml	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-friendly_name: Glam Desktop Beta Aggregates
-description: |-
-  Refresh glam_desktop_beta_aggregates which contains data served by GLAM
-owners:
-- [email protected]
-labels:
-  incremental: false
-  owner1: [email protected]
-scheduling:
-  dag_name: bqetl_glam_refresh_aggregates
-  date_partition_parameter: null
-  depends_on:
-  - task_id: glam_client_probe_counts_beta_extract
-    task_group: extracts
-    dag_name: glam
-    execution_delta: -8h
-
-# Generated by bigquery_etl.dependency
-references:
-  script.sql:
-  - moz-fx-data-shared-prod.telemetry_derived.glam_extract_firefox_beta_v1
-  - moz-fx-glam-prod.glam_etl.glam_desktop_beta_aggregates_v1
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_beta_aggregates_v1/schema.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_beta_aggregates_v1/schema.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_beta_aggregates_v1/schema.yaml	2025-01-15 22:26:19.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_beta_aggregates_v1/schema.yaml	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-fields:
-- name: version
-  type: INTEGER
-  mode: NULLABLE
-- name: os
-  type: STRING
-  mode: NULLABLE
-- name: build_id
-  type: STRING
-  mode: NULLABLE
-- name: process
-  type: STRING
-  mode: NULLABLE
-- name: metric
-  type: STRING
-  mode: NULLABLE
-- name: metric_key
-  type: STRING
-  mode: NULLABLE
-- name: client_agg_type
-  type: STRING
-  mode: NULLABLE
-- name: metric_type
-  type: STRING
-  mode: NULLABLE
-- name: total_users
-  type: BIGNUMERIC
-  mode: NULLABLE
-- name: histogram
-  type: STRING
-  mode: NULLABLE
-- name: percentiles
-  type: STRING
-  mode: NULLABLE
-- name: total_sample
-  type: BIGNUMERIC
-  mode: NULLABLE
-- name: non_norm_histogram
-  type: STRING
-  mode: NULLABLE
-- name: non_norm_percentiles
-  type: STRING
-  mode: NULLABLE
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_beta_aggregates_v1/script.sql /tmp/workspace/generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_beta_aggregates_v1/script.sql
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_beta_aggregates_v1/script.sql	2025-01-15 22:26:19.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_beta_aggregates_v1/script.sql	1970-01-01 00:00:00.000000000 +0000
@@ -1,59 +0,0 @@
--- Script for glam_etl.glam_desktop_beta_aggregates_v1
-            -- For more information on writing queries see:
-            -- https://docs.telemetry.mozilla.org/cookbooks/bigquery/querying.html
-MERGE INTO
-  `moz-fx-glam-prod.glam_etl.glam_desktop_beta_aggregates_v1` T
-  USING (SELECT * FROM `moz-fx-data-shared-prod.telemetry_derived.glam_extract_firefox_beta_v1`) S
-  ON T.version = S.app_version
-  AND T.os = S.os
-  AND T.build_id = S.app_build_id
-  AND T.process = S.process
-  AND T.metric = S.metric
-  AND T.metric_key = S.key
-  AND T.client_agg_type = S.client_agg_type
-  AND T.metric_type = S.metric_type
-WHEN NOT MATCHED BY TARGET
-THEN
-  INSERT
-    (
-      version,
-      os,
-      build_id,
-      process,
-      metric,
-      metric_key,
-      client_agg_type,
-      metric_type,
-      total_users,
-      histogram,
-      percentiles,
-      total_sample,
-      non_norm_histogram,
-      non_norm_percentiles
-    )
-  VALUES
-    (
-      S.app_version,
-      S.os,
-      S.app_build_id,
-      S.process,
-      S.metric,
-      S.key,
-      S.client_agg_type,
-      S.metric_type,
-      S.total_users,
-      S.histogram,
-      NULL,
-      S.total_sample,
-      S.non_norm_histogram,
-      NULL
-    )
-  WHEN MATCHED
-THEN
-  UPDATE
-    SET T.total_users = S.total_users,
-    T.histogram = S.histogram,
-    T.percentiles = NULL,
-    T.total_sample = S.total_sample,
-    T.non_norm_histogram = S.non_norm_histogram,
-    T.non_norm_percentiles = NULL
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_nightly_aggregates/metadata.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_nightly_aggregates/metadata.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_nightly_aggregates/metadata.yaml	2025-01-15 22:27:12.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_nightly_aggregates/metadata.yaml	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
----
-friendly_name: GLAM Desktop nightly aggregates
-description: |-
-  Data served by GLAM on Desktop nightly.
-
-# Generated by bigquery_etl.dependency
-references:
-  view.sql:
-  - moz-fx-data-glam-prod-fca7.glam_etl.glam_desktop_nightly_aggregates_v1
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_nightly_aggregates/schema.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_nightly_aggregates/schema.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_nightly_aggregates/schema.yaml	2025-01-15 22:26:19.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_nightly_aggregates/schema.yaml	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-fields:
-- name: version
-  type: INTEGER
-  mode: NULLABLE
-- name: os
-  type: STRING
-  mode: NULLABLE
-- name: build_id
-  type: STRING
-  mode: NULLABLE
-- name: process
-  type: STRING
-  mode: NULLABLE
-- name: metric
-  type: STRING
-  mode: NULLABLE
-- name: metric_key
-  type: STRING
-  mode: NULLABLE
-- name: client_agg_type
-  type: STRING
-  mode: NULLABLE
-- name: metric_type
-  type: STRING
-  mode: NULLABLE
-- name: total_users
-  type: BIGNUMERIC
-  mode: NULLABLE
-- name: histogram
-  type: STRING
-  mode: NULLABLE
-- name: percentiles
-  type: STRING
-  mode: NULLABLE
-- name: total_sample
-  type: BIGNUMERIC
-  mode: NULLABLE
-- name: non_norm_histogram
-  type: STRING
-  mode: NULLABLE
-- name: non_norm_percentiles
-  type: STRING
-  mode: NULLABLE
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_nightly_aggregates/view.sql /tmp/workspace/generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_nightly_aggregates/view.sql
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_nightly_aggregates/view.sql	2025-01-15 22:26:19.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_nightly_aggregates/view.sql	1970-01-01 00:00:00.000000000 +0000
@@ -1,94 +0,0 @@
-CREATE OR REPLACE VIEW
-  `moz-fx-data-glam-prod-fca7.glam_etl.glam_desktop_nightly_aggregates` AS (
-    WITH base AS (
-      SELECT
-        * EXCEPT (percentiles, non_norm_percentiles),
-        IF(
-          percentiles IS NOT NULL,
-          NULL,
-          mozfun.glam.histogram_cast_struct(histogram)
-        ) AS struct_histogram,
-        IF(
-          metric_type IN ("scalar", "keyed-scalar")
-          OR non_norm_percentiles IS NOT NULL,
-          NULL,
-          mozfun.glam.histogram_cast_struct(non_norm_histogram)
-        ) AS struct_non_norm_histogram,
-        percentiles AS existing_percentiles,
-        non_norm_percentiles AS existing_non_norm_percentiles
-      FROM
-        `moz-fx-data-glam-prod-fca7.glam_etl.glam_desktop_nightly_aggregates_v1`
-      WHERE
-  -- filter based on https://github.com/mozilla/python_mozaggregator/blob/6c0119bfd0b535346c37cb3f707d998039d3e24b/mozaggregator/service.py#L51
-        (
-          metric NOT LIKE r"%search\_counts%"
-          AND metric NOT LIKE r"%browser\_search%"
-          AND metric NOT LIKE r"%event\_counts%"
-          AND metric NOT LIKE r"%browser\_engagement\_navigation%"
-          AND metric NOT LIKE r"%manager\_message\_size%"
-          AND metric NOT LIKE r"%dropped\_frames\_proportion%"
-        )
-        AND metric_type NOT IN ("boolean", "keyed-scalar-boolean")
-    ),
-    calculated_percentiles AS (
-      SELECT
-        * EXCEPT (struct_histogram, struct_non_norm_histogram),
-        IF(
-          struct_histogram IS NOT NULL,
-          mozfun.glam.histogram_cast_json(
-            ARRAY<STRUCT<key STRING, value FLOAT64>>[
-              ('0.1', mozfun.glam.percentile(0.1, struct_histogram, metric_type)),
-              ('1', mozfun.glam.percentile(1, struct_histogram, metric_type)),
-              ('5', mozfun.glam.percentile(5, struct_histogram, metric_type)),
-              ('25', mozfun.glam.percentile(25, struct_histogram, metric_type)),
-              ('50', mozfun.glam.percentile(50, struct_histogram, metric_type)),
-              ('75', mozfun.glam.percentile(75, struct_histogram, metric_type)),
-              ('95', mozfun.glam.percentile(95, struct_histogram, metric_type)),
-              ('99', mozfun.glam.percentile(99, struct_histogram, metric_type)),
-              ('99.9', mozfun.glam.percentile(99.9, struct_histogram, metric_type))
-            ]
-          ),
-          existing_percentiles
-        ) AS percentiles,
-        IF(
-          struct_non_norm_histogram IS NOT NULL,
-          mozfun.glam.histogram_cast_json(
-            ARRAY<STRUCT<key STRING, value FLOAT64>>[
-              ('0.1', mozfun.glam.percentile(0.1, struct_non_norm_histogram, metric_type)),
-              ('1', mozfun.glam.percentile(1, struct_non_norm_histogram, metric_type)),
-              ('5', mozfun.glam.percentile(5, struct_non_norm_histogram, metric_type)),
-              ('25', mozfun.glam.percentile(25, struct_non_norm_histogram, metric_type)),
-              ('50', mozfun.glam.percentile(50, struct_non_norm_histogram, metric_type)),
-              ('75', mozfun.glam.percentile(75, struct_non_norm_histogram, metric_type)),
-              ('95', mozfun.glam.percentile(95, struct_non_norm_histogram, metric_type)),
-              ('99', mozfun.glam.percentile(99, struct_non_norm_histogram, metric_type)),
-              ('99.9', mozfun.glam.percentile(99.9, struct_non_norm_histogram, metric_type))
-            ]
-          ),
-          existing_non_norm_percentiles
-        ) AS non_norm_percentiles
-      FROM
-        base
-    )
-    SELECT
-      version,
-      os,
-      build_id,
-      process,
-      metric,
-      metric_key,
-      client_agg_type,
-      metric_type,
-      total_users,
-      histogram,
-      percentiles,
-      total_sample,
-      non_norm_histogram,
-      IF(
-        metric_type IN ("scalar", "keyed-scalar"),
-        percentiles,
-        non_norm_percentiles
-      ) AS non_norm_percentiles
-    FROM
-      calculated_percentiles
-  )
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_nightly_aggregates_v1/metadata.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_nightly_aggregates_v1/metadata.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_nightly_aggregates_v1/metadata.yaml	2025-01-15 22:27:12.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_nightly_aggregates_v1/metadata.yaml	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-friendly_name: Glam Desktop Nightly Aggregates
-description: |-
-  Refresh glam_desktop_nightly_aggregates which contains data served by GLAM
-owners:
-- [email protected]
-labels:
-  incremental: false
-  owner1: [email protected]
-scheduling:
-  dag_name: bqetl_glam_refresh_aggregates
-  date_partition_parameter: null
-  depends_on:
-  - task_id: glam_client_probe_counts_nightly_extract
-    task_group: extracts
-    dag_name: glam
-    execution_delta: -8h
-
-# Generated by bigquery_etl.dependency
-references:
-  script.sql:
-  - moz-fx-data-shared-prod.telemetry_derived.glam_extract_firefox_nightly_v1
-  - moz-fx-glam-prod.glam_etl.glam_desktop_nightly_aggregates_v1
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_nightly_aggregates_v1/schema.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_nightly_aggregates_v1/schema.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_nightly_aggregates_v1/schema.yaml	2025-01-15 22:26:19.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_nightly_aggregates_v1/schema.yaml	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-fields:
-- name: version
-  type: INTEGER
-  mode: NULLABLE
-- name: os
-  type: STRING
-  mode: NULLABLE
-- name: build_id
-  type: STRING
-  mode: NULLABLE
-- name: process
-  type: STRING
-  mode: NULLABLE
-- name: metric
-  type: STRING
-  mode: NULLABLE
-- name: metric_key
-  type: STRING
-  mode: NULLABLE
-- name: client_agg_type
-  type: STRING
-  mode: NULLABLE
-- name: metric_type
-  type: STRING
-  mode: NULLABLE
-- name: total_users
-  type: BIGNUMERIC
-  mode: NULLABLE
-- name: histogram
-  type: STRING
-  mode: NULLABLE
-- name: percentiles
-  type: STRING
-  mode: NULLABLE
-- name: total_sample
-  type: BIGNUMERIC
-  mode: NULLABLE
-- name: non_norm_histogram
-  type: STRING
-  mode: NULLABLE
-- name: non_norm_percentiles
-  type: STRING
-  mode: NULLABLE
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_nightly_aggregates_v1/script.sql /tmp/workspace/generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_nightly_aggregates_v1/script.sql
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_nightly_aggregates_v1/script.sql	2025-01-15 22:26:19.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_nightly_aggregates_v1/script.sql	1970-01-01 00:00:00.000000000 +0000
@@ -1,64 +0,0 @@
--- Script for glam_etl.glam_desktop_nightly_aggregates_v1
-            -- For more information on writing queries see:
-            -- https://docs.telemetry.mozilla.org/cookbooks/bigquery/querying.html
-MERGE INTO
-  `moz-fx-glam-prod.glam_etl.glam_desktop_nightly_aggregates_v1` T
-  USING (
-    SELECT
-      *
-    FROM
-      `moz-fx-data-shared-prod.telemetry_derived.glam_extract_firefox_nightly_v1`
-  ) S
-  ON T.version = S.app_version
-  AND T.os = S.os
-  AND T.build_id = S.app_build_id
-  AND T.process = S.process
-  AND T.metric = S.metric
-  AND T.metric_key = S.key
-  AND T.client_agg_type = S.client_agg_type
-  AND T.metric_type = S.metric_type
-WHEN NOT MATCHED BY TARGET
-THEN
-  INSERT
-    (
-      version,
-      os,
-      build_id,
-      process,
-      metric,
-      metric_key,
-      client_agg_type,
-      metric_type,
-      total_users,
-      histogram,
-      percentiles,
-      total_sample,
-      non_norm_histogram,
-      non_norm_percentiles
-    )
-  VALUES
-    (
-      S.app_version,
-      S.os,
-      S.app_build_id,
-      S.process,
-      S.metric,
-      S.key,
-      S.client_agg_type,
-      S.metric_type,
-      S.total_users,
-      S.histogram,
-      NULL,
-      S.total_sample,
-      S.non_norm_histogram,
-      NULL
-    )
-  WHEN MATCHED
-THEN
-  UPDATE
-    SET T.total_users = S.total_users,
-    T.histogram = S.histogram,
-    T.percentiles = NULL,
-    T.total_sample = S.total_sample,
-    T.non_norm_histogram = S.non_norm_histogram,
-    T.non_norm_percentiles = NULL
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_release_aggregates/metadata.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_release_aggregates/metadata.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_release_aggregates/metadata.yaml	2025-01-15 22:27:12.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_release_aggregates/metadata.yaml	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
----
-friendly_name: GLAM Desktop release aggregates
-description: |-
-  Data served by GLAM on Desktop release.
-
-# Generated by bigquery_etl.dependency
-references:
-  view.sql:
-  - moz-fx-data-glam-prod-fca7.glam_etl.glam_desktop_release_aggregates_v1
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_release_aggregates/schema.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_release_aggregates/schema.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_release_aggregates/schema.yaml	2025-01-15 22:26:19.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_release_aggregates/schema.yaml	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-fields:
-- name: version
-  type: INTEGER
-  mode: NULLABLE
-- name: os
-  type: STRING
-  mode: NULLABLE
-- name: build_id
-  type: STRING
-  mode: NULLABLE
-- name: process
-  type: STRING
-  mode: NULLABLE
-- name: metric
-  type: STRING
-  mode: NULLABLE
-- name: metric_key
-  type: STRING
-  mode: NULLABLE
-- name: client_agg_type
-  type: STRING
-  mode: NULLABLE
-- name: metric_type
-  type: STRING
-  mode: NULLABLE
-- name: total_users
-  type: BIGNUMERIC
-  mode: NULLABLE
-- name: histogram
-  type: STRING
-  mode: NULLABLE
-- name: percentiles
-  type: STRING
-  mode: NULLABLE
-- name: total_sample
-  type: BIGNUMERIC
-  mode: NULLABLE
-- name: non_norm_histogram
-  type: STRING
-  mode: NULLABLE
-- name: non_norm_percentiles
-  type: STRING
-  mode: NULLABLE
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_release_aggregates/view.sql /tmp/workspace/generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_release_aggregates/view.sql
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_release_aggregates/view.sql	2025-01-15 22:26:19.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_release_aggregates/view.sql	1970-01-01 00:00:00.000000000 +0000
@@ -1,94 +0,0 @@
-CREATE OR REPLACE VIEW
-  `moz-fx-data-glam-prod-fca7.glam_etl.glam_desktop_release_aggregates` AS (
-    WITH base AS (
-      SELECT
-        * EXCEPT (percentiles, non_norm_percentiles),
-        IF(
-          percentiles IS NOT NULL,
-          NULL,
-          mozfun.glam.histogram_cast_struct(histogram)
-        ) AS struct_histogram,
-        IF(
-          metric_type IN ("scalar", "keyed-scalar")
-          OR non_norm_percentiles IS NOT NULL,
-          NULL,
-          mozfun.glam.histogram_cast_struct(non_norm_histogram)
-        ) AS struct_non_norm_histogram,
-        percentiles AS existing_percentiles,
-        non_norm_percentiles AS existing_non_norm_percentiles
-      FROM
-        `moz-fx-data-glam-prod-fca7.glam_etl.glam_desktop_release_aggregates_v1`
-      WHERE
-  -- filter based on https://github.com/mozilla/python_mozaggregator/blob/6c0119bfd0b535346c37cb3f707d998039d3e24b/mozaggregator/service.py#L51
-        (
-          metric NOT LIKE r"%search\_counts%"
-          AND metric NOT LIKE r"%browser\_search%"
-          AND metric NOT LIKE r"%event\_counts%"
-          AND metric NOT LIKE r"%browser\_engagement\_navigation%"
-          AND metric NOT LIKE r"%manager\_message\_size%"
-          AND metric NOT LIKE r"%dropped\_frames\_proportion%"
-        )
-        AND metric_type NOT IN ("boolean", "keyed-scalar-boolean")
-    ),
-    calculated_percentiles AS (
-      SELECT
-        * EXCEPT (struct_histogram, struct_non_norm_histogram),
-        IF(
-          struct_histogram IS NOT NULL,
-          mozfun.glam.histogram_cast_json(
-            ARRAY<STRUCT<key STRING, value FLOAT64>>[
-              ('0.1', mozfun.glam.percentile(0.1, struct_histogram, metric_type)),
-              ('1', mozfun.glam.percentile(1, struct_histogram, metric_type)),
-              ('5', mozfun.glam.percentile(5, struct_histogram, metric_type)),
-              ('25', mozfun.glam.percentile(25, struct_histogram, metric_type)),
-              ('50', mozfun.glam.percentile(50, struct_histogram, metric_type)),
-              ('75', mozfun.glam.percentile(75, struct_histogram, metric_type)),
-              ('95', mozfun.glam.percentile(95, struct_histogram, metric_type)),
-              ('99', mozfun.glam.percentile(99, struct_histogram, metric_type)),
-              ('99.9', mozfun.glam.percentile(99.9, struct_histogram, metric_type))
-            ]
-          ),
-          existing_percentiles
-        ) AS percentiles,
-        IF(
-          struct_non_norm_histogram IS NOT NULL,
-          mozfun.glam.histogram_cast_json(
-            ARRAY<STRUCT<key STRING, value FLOAT64>>[
-              ('0.1', mozfun.glam.percentile(0.1, struct_non_norm_histogram, metric_type)),
-              ('1', mozfun.glam.percentile(1, struct_non_norm_histogram, metric_type)),
-              ('5', mozfun.glam.percentile(5, struct_non_norm_histogram, metric_type)),
-              ('25', mozfun.glam.percentile(25, struct_non_norm_histogram, metric_type)),
-              ('50', mozfun.glam.percentile(50, struct_non_norm_histogram, metric_type)),
-              ('75', mozfun.glam.percentile(75, struct_non_norm_histogram, metric_type)),
-              ('95', mozfun.glam.percentile(95, struct_non_norm_histogram, metric_type)),
-              ('99', mozfun.glam.percentile(99, struct_non_norm_histogram, metric_type)),
-              ('99.9', mozfun.glam.percentile(99.9, struct_non_norm_histogram, metric_type))
-            ]
-          ),
-          existing_non_norm_percentiles
-        ) AS non_norm_percentiles
-      FROM
-        base
-    )
-    SELECT
-      version,
-      os,
-      build_id,
-      process,
-      metric,
-      metric_key,
-      client_agg_type,
-      metric_type,
-      total_users,
-      histogram,
-      percentiles,
-      total_sample,
-      non_norm_histogram,
-      IF(
-        metric_type IN ("scalar", "keyed-scalar"),
-        percentiles,
-        non_norm_percentiles
-      ) AS non_norm_percentiles
-    FROM
-      calculated_percentiles
-  )
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_release_aggregates_v1/metadata.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_release_aggregates_v1/metadata.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_release_aggregates_v1/metadata.yaml	2025-01-15 22:27:12.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_release_aggregates_v1/metadata.yaml	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-friendly_name: Glam Desktop Release Aggregates
-description: |-
-  Refresh glam_desktop_release_aggregates which contains data served by GLAM
-owners:
-- [email protected]
-labels:
-  incremental: false
-  owner1: [email protected]
-scheduling:
-  dag_name: bqetl_glam_refresh_aggregates
-  date_partition_parameter: null
-  depends_on:
-  - task_id: glam_client_probe_counts_release_extract
-    task_group: extracts
-    dag_name: glam
-    execution_delta: -8h
-
-# Generated by bigquery_etl.dependency
-references:
-  script.sql:
-  - moz-fx-data-shared-prod.telemetry_derived.glam_extract_firefox_release_v1
-  - moz-fx-glam-prod.glam_etl.glam_desktop_release_aggregates_v1
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_release_aggregates_v1/schema.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_release_aggregates_v1/schema.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_release_aggregates_v1/schema.yaml	2025-01-15 22:26:19.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_release_aggregates_v1/schema.yaml	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-fields:
-- name: version
-  type: INTEGER
-  mode: NULLABLE
-- name: os
-  type: STRING
-  mode: NULLABLE
-- name: build_id
-  type: STRING
-  mode: NULLABLE
-- name: process
-  type: STRING
-  mode: NULLABLE
-- name: metric
-  type: STRING
-  mode: NULLABLE
-- name: metric_key
-  type: STRING
-  mode: NULLABLE
-- name: client_agg_type
-  type: STRING
-  mode: NULLABLE
-- name: metric_type
-  type: STRING
-  mode: NULLABLE
-- name: total_users
-  type: BIGNUMERIC
-  mode: NULLABLE
-- name: histogram
-  type: STRING
-  mode: NULLABLE
-- name: percentiles
-  type: STRING
-  mode: NULLABLE
-- name: total_sample
-  type: BIGNUMERIC
-  mode: NULLABLE
-- name: non_norm_histogram
-  type: STRING
-  mode: NULLABLE
-- name: non_norm_percentiles
-  type: STRING
-  mode: NULLABLE
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_release_aggregates_v1/script.sql /tmp/workspace/generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_release_aggregates_v1/script.sql
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_release_aggregates_v1/script.sql	2025-01-15 22:26:19.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_release_aggregates_v1/script.sql	1970-01-01 00:00:00.000000000 +0000
@@ -1,64 +0,0 @@
--- Script for glam_etl.glam_desktop_release_aggregates_v1
-            -- For more information on writing queries see:
-            -- https://docs.telemetry.mozilla.org/cookbooks/bigquery/querying.html
-MERGE INTO
-  `moz-fx-glam-prod.glam_etl.glam_desktop_release_aggregates_v1` T
-  USING (
-    SELECT
-      *
-    FROM
-      `moz-fx-data-shared-prod.telemetry_derived.glam_extract_firefox_release_v1`
-  ) S
-  ON T.version = S.app_version
-  AND T.os = S.os
-  AND T.build_id = S.app_build_id
-  AND T.process = S.process
-  AND T.metric = S.metric
-  AND T.metric_key = S.key
-  AND T.client_agg_type = S.client_agg_type
-  AND T.metric_type = S.metric_type
-WHEN NOT MATCHED BY TARGET
-THEN
-  INSERT
-    (
-      version,
-      os,
-      build_id,
-      process,
-      metric,
-      metric_key,
-      client_agg_type,
-      metric_type,
-      total_users,
-      histogram,
-      percentiles,
-      total_sample,
-      non_norm_histogram,
-      non_norm_percentiles
-    )
-  VALUES
-    (
-      S.app_version,
-      S.os,
-      S.app_build_id,
-      S.process,
-      S.metric,
-      S.key,
-      S.client_agg_type,
-      S.metric_type,
-      S.total_users,
-      S.histogram,
-      NULL,
-      S.total_sample,
-      S.non_norm_histogram,
-      NULL
-    )
-  WHEN MATCHED
-THEN
-  UPDATE
-    SET T.total_users = S.total_users,
-    T.histogram = S.histogram,
-    T.percentiles = NULL,
-    T.total_sample = S.total_sample,
-    T.non_norm_histogram = S.non_norm_histogram,
-    T.non_norm_percentiles = NULL
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_beta_aggregates/metadata.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_beta_aggregates/metadata.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_beta_aggregates/metadata.yaml	2025-01-15 22:27:12.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_beta_aggregates/metadata.yaml	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
----
-friendly_name: GLAM Fenix beta aggregates
-description: |-
-  Data served by GLAM on Fenix beta.
-
-# Generated by bigquery_etl.dependency
-references:
-  view.sql:
-  - moz-fx-data-glam-prod-fca7.glam_etl.glam_fenix_beta_aggregates_v1
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_beta_aggregates/schema.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_beta_aggregates/schema.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_beta_aggregates/schema.yaml	2025-01-15 22:26:19.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_beta_aggregates/schema.yaml	1970-01-01 00:00:00.000000000 +0000
@@ -1,52 +0,0 @@
-fields:
-- name: channel
-  type: STRING
-  mode: NULLABLE
-- name: version
-  type: INTEGER
-  mode: NULLABLE
-- name: ping_type
-  type: STRING
-  mode: NULLABLE
-- name: os
-  type: STRING
-  mode: NULLABLE
-- name: build_id
-  type: STRING
-  mode: NULLABLE
-- name: build_date
-  type: STRING
-  mode: NULLABLE
-- name: metric
-  type: STRING
-  mode: NULLABLE
-- name: metric_type
-  type: STRING
-  mode: NULLABLE
-- name: metric_key
-  type: STRING
-  mode: NULLABLE
-- name: client_agg_type
-  type: STRING
-  mode: NULLABLE
-- name: total_users
-  type: BIGNUMERIC
-  mode: NULLABLE
-- name: histogram
-  type: STRING
-  mode: NULLABLE
-- name: percentiles
-  type: STRING
-  mode: NULLABLE
-- name: non_norm_histogram
-  type: STRING
-  mode: NULLABLE
-- name: non_norm_percentiles
-  type: STRING
-  mode: NULLABLE
-- name: app_id
-  type: STRING
-  mode: NULLABLE
-- name: total_sample
-  type: BIGNUMERIC
-  mode: NULLABLE
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_beta_aggregates/view.sql /tmp/workspace/generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_beta_aggregates/view.sql
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_beta_aggregates/view.sql	2025-01-15 22:26:19.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_beta_aggregates/view.sql	1970-01-01 00:00:00.000000000 +0000
@@ -1,118 +0,0 @@
-CREATE OR REPLACE VIEW
-  `moz-fx-data-glam-prod-fca7.glam_etl.glam_fenix_beta_aggregates` AS (
-    WITH base AS (
-      SELECT
-        * EXCEPT (percentiles, non_norm_percentiles),
-        IF(
-          percentiles IS NOT NULL,
-          NULL,
-          mozfun.glam.histogram_cast_struct(histogram)
-        ) AS struct_histogram,
-        IF(
-          metric_type IN ("counter", "labeled_counter", "quantity")
-          OR non_norm_percentiles IS NOT NULL,
-          NULL,
-          mozfun.glam.histogram_cast_struct(non_norm_histogram)
-        ) AS struct_non_norm_histogram,
-        percentiles AS existing_percentiles,
-        non_norm_percentiles AS existing_non_norm_percentiles
-      FROM
-        `moz-fx-data-glam-prod-fca7.glam_etl.glam_fenix_beta_aggregates_v1`
-      WHERE
-  -- filter based on https://github.com/mozilla/python_mozaggregator/blob/6c0119bfd0b535346c37cb3f707d998039d3e24b/mozaggregator/service.py#L51
-        (
-          metric NOT LIKE r"%search\_counts%"
-          AND metric NOT LIKE r"%browser\_search%"
-          AND metric NOT LIKE r"%event\_counts%"
-          AND metric NOT LIKE r"%browser\_engagement\_navigation%"
-          AND metric NOT LIKE r"%manager\_message\_size%"
-          AND metric NOT LIKE r"%dropped\_frames\_proportion%"
-        )
-        AND metric NOT IN (
-          "characteristics.color_depth",
-          "characteristics.color_gamut",
-          "characteristics.color_scheme",
-          "characteristics.inverted_colors",
-          "characteristics.max_touch_points",
-          "characteristics.missing_fonts",
-          "characteristics.prefers_contrast",
-          "characteristics.prefers_reduced_motion",
-          "characteristics.prefers_reduced_transparency",
-          "characteristics.prefs_media_eme_enabled",
-          "characteristics.prefs_zoom_text_only",
-          "characteristics.processor_count",
-          "characteristics.screen_height",
-          "characteristics.screen_width",
-          "characteristics.submission_schema",
-          "characteristics.target_frame_rate",
-          "characteristics.video_dynamic_range",
-          "pocket.shim",
-          "shopping.product_page_visits"
-        )
-        AND metric_type != "boolean"
-    ),
-    calculated_percentiles AS (
-      SELECT
-        * EXCEPT (struct_histogram, struct_non_norm_histogram),
-        IF(
-          struct_histogram IS NOT NULL,
-          mozfun.glam.histogram_cast_json(
-            ARRAY<STRUCT<key STRING, value FLOAT64>>[
-              ('0.1', mozfun.glam.percentile(0.1, struct_histogram, metric_type)),
-              ('1', mozfun.glam.percentile(1, struct_histogram, metric_type)),
-              ('5', mozfun.glam.percentile(5, struct_histogram, metric_type)),
-              ('25', mozfun.glam.percentile(25, struct_histogram, metric_type)),
-              ('50', mozfun.glam.percentile(50, struct_histogram, metric_type)),
-              ('75', mozfun.glam.percentile(75, struct_histogram, metric_type)),
-              ('95', mozfun.glam.percentile(95, struct_histogram, metric_type)),
-              ('99', mozfun.glam.percentile(99, struct_histogram, metric_type)),
-              ('99.9', mozfun.glam.percentile(99.9, struct_histogram, metric_type))
-            ]
-          ),
-          existing_percentiles
-        ) AS percentiles,
-        IF(
-          struct_non_norm_histogram IS NOT NULL,
-          mozfun.glam.histogram_cast_json(
-            ARRAY<STRUCT<key STRING, value FLOAT64>>[
-              ('0.1', mozfun.glam.percentile(0.1, struct_non_norm_histogram, metric_type)),
-              ('1', mozfun.glam.percentile(1, struct_non_norm_histogram, metric_type)),
-              ('5', mozfun.glam.percentile(5, struct_non_norm_histogram, metric_type)),
-              ('25', mozfun.glam.percentile(25, struct_non_norm_histogram, metric_type)),
-              ('50', mozfun.glam.percentile(50, struct_non_norm_histogram, metric_type)),
-              ('75', mozfun.glam.percentile(75, struct_non_norm_histogram, metric_type)),
-              ('95', mozfun.glam.percentile(95, struct_non_norm_histogram, metric_type)),
-              ('99', mozfun.glam.percentile(99, struct_non_norm_histogram, metric_type)),
-              ('99.9', mozfun.glam.percentile(99.9, struct_non_norm_histogram, metric_type))
-            ]
-          ),
-          existing_non_norm_percentiles
-        ) AS non_norm_percentiles
-      FROM
-        base
-    )
-    SELECT
-      channel,
-      version,
-      ping_type,
-      os,
-      build_id,
-      build_date,
-      metric,
-      metric_type,
-      metric_key,
-      client_agg_type,
-      total_users,
-      histogram,
-      percentiles,
-      app_id,
-      total_sample,
-      non_norm_histogram,
-      IF(
-        metric_type IN ("counter", "labeled_counter", "quantity"),
-        percentiles,
-        non_norm_percentiles
-      ) AS non_norm_percentiles
-    FROM
-      calculated_percentiles
-  )
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_beta_aggregates_v1/metadata.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_beta_aggregates_v1/metadata.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_beta_aggregates_v1/metadata.yaml	2025-01-15 22:27:12.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_beta_aggregates_v1/metadata.yaml	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-friendly_name: Glam Fenix Beta Aggregates
-description: |-
-  Refresh glam_fenix_beta_aggregates which contains data served by GLAM
-owners:
-- [email protected]
-labels:
-  incremental: false
-  owner1: [email protected]
-scheduling:
-  dag_name: bqetl_glam_refresh_aggregates
-  date_partition_parameter: null
-  depends_on:
-  - task_id: query_org_mozilla_fenix_glam_beta__extract_probe_counts_v1
-    dag_name: glam_fenix
-    execution_delta: 6h
-
-# Generated by bigquery_etl.dependency
-references:
-  script.sql:
-  - moz-fx-data-glam-prod-fca7.glam_etl.org_mozilla_fenix_glam_beta__extract_probe_counts_v1
-  - moz-fx-glam-prod.glam_etl.glam_fenix_beta_aggregates_v1
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_beta_aggregates_v1/schema.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_beta_aggregates_v1/schema.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_beta_aggregates_v1/schema.yaml	2025-01-15 22:26:19.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_beta_aggregates_v1/schema.yaml	1970-01-01 00:00:00.000000000 +0000
@@ -1,52 +0,0 @@
-fields:
-- name: channel
-  type: STRING
-  mode: NULLABLE
-- name: version
-  type: INTEGER
-  mode: NULLABLE
-- name: ping_type
-  type: STRING
-  mode: NULLABLE
-- name: os
-  type: STRING
-  mode: NULLABLE
-- name: build_id
-  type: STRING
-  mode: NULLABLE
-- name: build_date
-  type: STRING
-  mode: NULLABLE
-- name: metric
-  type: STRING
-  mode: NULLABLE
-- name: metric_type
-  type: STRING
-  mode: NULLABLE
-- name: metric_key
-  type: STRING
-  mode: NULLABLE
-- name: client_agg_type
-  type: STRING
-  mode: NULLABLE
-- name: total_users
-  type: BIGNUMERIC
-  mode: NULLABLE
-- name: histogram
-  type: STRING
-  mode: NULLABLE
-- name: percentiles
-  type: STRING
-  mode: NULLABLE
-- name: non_norm_histogram
-  type: STRING
-  mode: NULLABLE
-- name: non_norm_percentiles
-  type: STRING
-  mode: NULLABLE
-- name: app_id
-  type: STRING
-  mode: NULLABLE
-- name: total_sample
-  type: BIGNUMERIC
-  mode: NULLABLE
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_beta_aggregates_v1/script.sql /tmp/workspace/generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_beta_aggregates_v1/script.sql
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_beta_aggregates_v1/script.sql	2025-01-15 22:26:19.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_beta_aggregates_v1/script.sql	1970-01-01 00:00:00.000000000 +0000
@@ -1,66 +0,0 @@
--- Script for glam_etl.glam_fenix_beta_aggregates_v1
-            -- For more information on writing queries see:
-            -- https://docs.telemetry.mozilla.org/cookbooks/bigquery/querying.html
-MERGE INTO
-  `moz-fx-glam-prod.glam_etl.glam_fenix_beta_aggregates_v1` T
-  USING (
-    SELECT
-      *
-    FROM
-      `moz-fx-data-glam-prod-fca7.glam_etl.org_mozilla_fenix_glam_beta__extract_probe_counts_v1`
-  ) S
-  ON T.version = S.version
-  AND T.ping_type = S.ping_type
-  AND T.os = S.os
-  AND T.build_id = S.build_id
-  AND T.metric = S.metric
-  AND T.metric_type = S.metric_type
-  AND T.metric_key = S.metric_key
-  AND T.client_agg_type = S.client_agg_type
-WHEN NOT MATCHED BY TARGET
-THEN
-  INSERT
-    (
-      version,
-      ping_type,
-      os,
-      build_id,
-      build_date,
-      metric,
-      metric_type,
-      metric_key,
-      client_agg_type,
-      total_users,
-      histogram,
-      percentiles,
-      non_norm_histogram,
-      non_norm_percentiles,
-      total_sample
-    )
-  VALUES
-    (
-      S.version,
-      S.ping_type,
-      S.os,
-      S.build_id,
-      S.build_date,
-      S.metric,
-      S.metric_type,
-      S.metric_key,
-      S.client_agg_type,
-      S.total_users,
-      S.histogram,
-      NULL,
-      S.non_norm_histogram,
-      NULL,
-      S.total_sample
-    )
-  WHEN MATCHED
-THEN
-  UPDATE
-    SET T.total_users = S.total_users,
-    T.histogram = S.histogram,
-    T.percentiles = NULL,
-    T.non_norm_histogram = S.non_norm_histogram,
-    T.non_norm_percentiles = NULL,
-    T.total_sample = S.total_sample
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_nightly_aggregates/metadata.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_nightly_aggregates/metadata.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_nightly_aggregates/metadata.yaml	2025-01-15 22:27:12.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_nightly_aggregates/metadata.yaml	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
----
-friendly_name: GLAM Fenix nightly aggregates
-description: |-
-  Data served by GLAM on Fenix nightly.
-
-# Generated by bigquery_etl.dependency
-references:
-  view.sql:
-  - moz-fx-data-glam-prod-fca7.glam_etl.glam_fenix_nightly_aggregates_v1
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_nightly_aggregates/schema.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_nightly_aggregates/schema.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_nightly_aggregates/schema.yaml	2025-01-15 22:26:19.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_nightly_aggregates/schema.yaml	1970-01-01 00:00:00.000000000 +0000
@@ -1,52 +0,0 @@
-fields:
-- name: channel
-  type: STRING
-  mode: NULLABLE
-- name: version
-  type: INTEGER
-  mode: NULLABLE
-- name: ping_type
-  type: STRING
-  mode: NULLABLE
-- name: os
-  type: STRING
-  mode: NULLABLE
-- name: build_id
-  type: STRING
-  mode: NULLABLE
-- name: build_date
-  type: STRING
-  mode: NULLABLE
-- name: metric
-  type: STRING
-  mode: NULLABLE
-- name: metric_type
-  type: STRING
-  mode: NULLABLE
-- name: metric_key
-  type: STRING
-  mode: NULLABLE
-- name: client_agg_type
-  type: STRING
-  mode: NULLABLE
-- name: total_users
-  type: BIGNUMERIC
-  mode: NULLABLE
-- name: histogram
-  type: STRING
-  mode: NULLABLE
-- name: percentiles
-  type: STRING
-  mode: NULLABLE
-- name: non_norm_histogram
-  type: STRING
-  mode: NULLABLE
-- name: non_norm_percentiles
-  type: STRING
-  mode: NULLABLE
-- name: app_id
-  type: STRING
-  mode: NULLABLE
-- name: total_sample
-  type: BIGNUMERIC
-  mode: NULLABLE
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_nightly_aggregates/view.sql /tmp/workspace/generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_nightly_aggregates/view.sql
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_nightly_aggregates/view.sql	2025-01-15 22:26:19.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_nightly_aggregates/view.sql	1970-01-01 00:00:00.000000000 +0000
@@ -1,118 +0,0 @@
-CREATE OR REPLACE VIEW
-  `moz-fx-data-glam-prod-fca7.glam_etl.glam_fenix_nightly_aggregates` AS (
-    WITH base AS (
-      SELECT
-        * EXCEPT (percentiles, non_norm_percentiles),
-        IF(
-          percentiles IS NOT NULL,
-          NULL,
-          mozfun.glam.histogram_cast_struct(histogram)
-        ) AS struct_histogram,
-        IF(
-          metric_type IN ("counter", "labeled_counter", "quantity")
-          OR non_norm_percentiles IS NOT NULL,
-          NULL,
-          mozfun.glam.histogram_cast_struct(non_norm_histogram)
-        ) AS struct_non_norm_histogram,
-        percentiles AS existing_percentiles,
-        non_norm_percentiles AS existing_non_norm_percentiles
-      FROM
-        `moz-fx-data-glam-prod-fca7.glam_etl.glam_fenix_nightly_aggregates_v1`
-      WHERE
-  -- filter based on https://github.com/mozilla/python_mozaggregator/blob/6c0119bfd0b535346c37cb3f707d998039d3e24b/mozaggregator/service.py#L51
-        (
-          metric NOT LIKE r"%search\_counts%"
-          AND metric NOT LIKE r"%browser\_search%"
-          AND metric NOT LIKE r"%event\_counts%"
-          AND metric NOT LIKE r"%browser\_engagement\_navigation%"
-          AND metric NOT LIKE r"%manager\_message\_size%"
-          AND metric NOT LIKE r"%dropped\_frames\_proportion%"
-        )
-        AND metric NOT IN (
-          "characteristics.color_depth",
-          "characteristics.color_gamut",
-          "characteristics.color_scheme",
-          "characteristics.inverted_colors",
-          "characteristics.max_touch_points",
-          "characteristics.missing_fonts",
-          "characteristics.prefers_contrast",
-          "characteristics.prefers_reduced_motion",
-          "characteristics.prefers_reduced_transparency",
-          "characteristics.prefs_media_eme_enabled",
-          "characteristics.prefs_zoom_text_only",
-          "characteristics.processor_count",
-          "characteristics.screen_height",
-          "characteristics.screen_width",
-          "characteristics.submission_schema",
-          "characteristics.target_frame_rate",
-          "characteristics.video_dynamic_range",
-          "pocket.shim",
-          "shopping.product_page_visits"
-        )
-        AND metric_type != "boolean"
-    ),
-    calculated_percentiles AS (
-      SELECT
-        * EXCEPT (struct_histogram, struct_non_norm_histogram),
-        IF(
-          struct_histogram IS NOT NULL,
-          mozfun.glam.histogram_cast_json(
-            ARRAY<STRUCT<key STRING, value FLOAT64>>[
-              ('0.1', mozfun.glam.percentile(0.1, struct_histogram, metric_type)),
-              ('1', mozfun.glam.percentile(1, struct_histogram, metric_type)),
-              ('5', mozfun.glam.percentile(5, struct_histogram, metric_type)),
-              ('25', mozfun.glam.percentile(25, struct_histogram, metric_type)),
-              ('50', mozfun.glam.percentile(50, struct_histogram, metric_type)),
-              ('75', mozfun.glam.percentile(75, struct_histogram, metric_type)),
-              ('95', mozfun.glam.percentile(95, struct_histogram, metric_type)),
-              ('99', mozfun.glam.percentile(99, struct_histogram, metric_type)),
-              ('99.9', mozfun.glam.percentile(99.9, struct_histogram, metric_type))
-            ]
-          ),
-          existing_percentiles
-        ) AS percentiles,
-        IF(
-          struct_non_norm_histogram IS NOT NULL,
-          mozfun.glam.histogram_cast_json(
-            ARRAY<STRUCT<key STRING, value FLOAT64>>[
-              ('0.1', mozfun.glam.percentile(0.1, struct_non_norm_histogram, metric_type)),
-              ('1', mozfun.glam.percentile(1, struct_non_norm_histogram, metric_type)),
-              ('5', mozfun.glam.percentile(5, struct_non_norm_histogram, metric_type)),
-              ('25', mozfun.glam.percentile(25, struct_non_norm_histogram, metric_type)),
-              ('50', mozfun.glam.percentile(50, struct_non_norm_histogram, metric_type)),
-              ('75', mozfun.glam.percentile(75, struct_non_norm_histogram, metric_type)),
-              ('95', mozfun.glam.percentile(95, struct_non_norm_histogram, metric_type)),
-              ('99', mozfun.glam.percentile(99, struct_non_norm_histogram, metric_type)),
-              ('99.9', mozfun.glam.percentile(99.9, struct_non_norm_histogram, metric_type))
-            ]
-          ),
-          existing_non_norm_percentiles
-        ) AS non_norm_percentiles
-      FROM
-        base
-    )
-    SELECT
-      channel,
-      version,
-      ping_type,
-      os,
-      build_id,
-      build_date,
-      metric,
-      metric_type,
-      metric_key,
-      client_agg_type,
-      total_users,
-      histogram,
-      percentiles,
-      app_id,
-      total_sample,
-      non_norm_histogram,
-      IF(
-        metric_type IN ("counter", "labeled_counter", "quantity"),
-        percentiles,
-        non_norm_percentiles
-      ) AS non_norm_percentiles
-    FROM
-      calculated_percentiles
-  )
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_nightly_aggregates_v1/metadata.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_nightly_aggregates_v1/metadata.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_nightly_aggregates_v1/metadata.yaml	2025-01-15 22:27:12.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_nightly_aggregates_v1/metadata.yaml	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-friendly_name: Glam Fenix Nightly Aggregates
-description: |-
-  Refresh glam_fenix_nightly_aggregates which contains data served by GLAM
-owners:
-- [email protected]
-labels:
-  incremental: false
-  owner1: [email protected]
-scheduling:
-  dag_name: bqetl_glam_refresh_aggregates
-  date_partition_parameter: null
-  depends_on:
-  - task_id: query_org_mozilla_fenix_glam_nightly__extract_probe_counts_v1
-    dag_name: glam_fenix
-    execution_delta: 6h
-
-# Generated by bigquery_etl.dependency
-references:
-  script.sql:
-  - moz-fx-data-glam-prod-fca7.glam_etl.org_mozilla_fenix_glam_nightly__extract_probe_counts_v1
-  - moz-fx-glam-prod.glam_etl.glam_fenix_nightly_aggregates_v1
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_nightly_aggregates_v1/schema.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_nightly_aggregates_v1/schema.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_nightly_aggregates_v1/schema.yaml	2025-01-15 22:26:19.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_nightly_aggregates_v1/schema.yaml	1970-01-01 00:00:00.000000000 +0000
@@ -1,52 +0,0 @@
-fields:
-- name: channel
-  type: STRING
-  mode: NULLABLE
-- name: version
-  type: INTEGER
-  mode: NULLABLE
-- name: ping_type
-  type: STRING
-  mode: NULLABLE
-- name: os
-  type: STRING
-  mode: NULLABLE
-- name: build_id
-  type: STRING
-  mode: NULLABLE
-- name: build_date
-  type: STRING
-  mode: NULLABLE
-- name: metric
-  type: STRI

⚠️ Only part of the diff is displayed.

Link to full diff

Please sign in to comment.