Fix #2274 - Nest schemas under field object in glam queries (#2275)

* Update schema to be nested under field object

* Update schemas for glam-fenix-dev

bigquery_etl/glam/cli.py

@@ -190,7 +190,7 @@ def update_schemas(project, dataset, src_dataset):
     for path in sql_root.glob("*"):
         print(f"fetching schema for {path.name}")
         # we can update the schema with the development version of the schema
-        schema = get_schema(f"{src_dataset}.{path.name}", project)
+        schema = dict(fields=get_schema(f"{src_dataset}.{path.name}", project))
         with (path / "schema.yaml").open("w") as fp:
             yaml.dump(schema, fp)
 

sql/glam-fenix-dev/glam_etl/org_mozilla_fenix__clients_daily_histogram_aggregates_metrics_v1/query.sql

@@ -434,6 +434,21 @@ histograms AS (
         "timing_distribution",
         metrics.timing_distribution.perf_startup_home_fragment_on_view_created.values
       ),
+      (
+        "performance_clone_deserialize_items",
+        "custom_distribution",
+        metrics.custom_distribution.performance_clone_deserialize_items.values
+      ),
+      (
+        "performance_clone_deserialize_size",
+        "memory_distribution",
+        metrics.memory_distribution.performance_clone_deserialize_size.values
+      ),
+      (
+        "performance_clone_deserialize_time",
+        "timing_distribution",
+        metrics.timing_distribution.performance_clone_deserialize_time.values
+      ),
       (
         "performance_interaction_keypress_present_latency",
         "timing_distribution",

sql/glam-fenix-dev/glam_etl/org_mozilla_fenix__clients_daily_histogram_aggregates_metrics_v1/schema.yaml

@@ -1,3 +1,4 @@
+fields:
 - mode: NULLABLE
   name: sample_id
   type: INTEGER

sql/glam-fenix-dev/glam_etl/org_mozilla_fenix__clients_daily_scalar_aggregates_activation_v1/schema.yaml

@@ -1,3 +1,4 @@
+fields:
 - mode: NULLABLE
   name: client_id
   type: STRING

sql/glam-fenix-dev/glam_etl/org_mozilla_fenix__clients_daily_scalar_aggregates_addresses_sync_v1/schema.yaml

@@ -1,3 +1,4 @@
+fields:
 - mode: NULLABLE
   name: client_id
   type: STRING

sql/glam-fenix-dev/glam_etl/org_mozilla_fenix__clients_daily_scalar_aggregates_baseline_v1/schema.yaml

@@ -1,3 +1,4 @@
+fields:
 - mode: NULLABLE
   name: client_id
   type: STRING

sql/glam-fenix-dev/glam_etl/org_mozilla_fenix__clients_daily_scalar_aggregates_bookmarks_sync_v1/schema.yaml

@@ -1,3 +1,4 @@
+fields:
 - mode: NULLABLE
   name: client_id
   type: STRING

sql/glam-fenix-dev/glam_etl/org_mozilla_fenix__clients_daily_scalar_aggregates_creditcards_sync_v1/schema.yaml

@@ -1,3 +1,4 @@
+fields:
 - mode: NULLABLE
   name: client_id
   type: STRING

sql/glam-fenix-dev/glam_etl/org_mozilla_fenix__clients_daily_scalar_aggregates_deletion_request_v1/schema.yaml

@@ -1,3 +1,4 @@
+fields:
 - mode: NULLABLE
   name: client_id
   type: STRING

sql/glam-fenix-dev/glam_etl/org_mozilla_fenix__clients_daily_scalar_aggregates_events_v1/schema.yaml

@@ -1,3 +1,4 @@
+fields:
 - mode: NULLABLE
   name: client_id
   type: STRING

sql/glam-fenix-dev/glam_etl/org_mozilla_fenix__clients_daily_scalar_aggregates_first_session_v1/schema.yaml

@@ -1,3 +1,4 @@
+fields:
 - mode: NULLABLE
   name: client_id
   type: STRING

sql/glam-fenix-dev/glam_etl/org_mozilla_fenix__clients_daily_scalar_aggregates_history_sync_v1/schema.yaml

@@ -1,3 +1,4 @@
+fields:
 - mode: NULLABLE
   name: client_id
   type: STRING

sql/glam-fenix-dev/glam_etl/org_mozilla_fenix__clients_daily_scalar_aggregates_installation_v1/schema.yaml

@@ -1,3 +1,4 @@
+fields:
 - mode: NULLABLE
   name: client_id
   type: STRING

sql/glam-fenix-dev/glam_etl/org_mozilla_fenix__clients_daily_scalar_aggregates_logins_sync_v1/schema.yaml

@@ -1,3 +1,4 @@
+fields:
 - mode: NULLABLE
   name: client_id
   type: STRING

sql/glam-fenix-dev/glam_etl/org_mozilla_fenix__clients_daily_scalar_aggregates_metrics_v1/query.sql

@@ -56,6 +56,34 @@ unlabeled_metrics AS (
         'true',
         SUM(CAST(metrics.boolean.addons_has_installed_addons AS INT64))
       ),
+      (
+        'android_autofill_enabled',
+        'boolean',
+        '',
+        'false',
+        SUM(CAST(NOT metrics.boolean.android_autofill_enabled AS INT64))
+      ),
+      (
+        'android_autofill_enabled',
+        'boolean',
+        '',
+        'true',
+        SUM(CAST(metrics.boolean.android_autofill_enabled AS INT64))
+      ),
+      (
+        'android_autofill_supported',
+        'boolean',
+        '',
+        'false',
+        SUM(CAST(NOT metrics.boolean.android_autofill_supported AS INT64))
+      ),
+      (
+        'android_autofill_supported',
+        'boolean',
+        '',
+        'true',
+        SUM(CAST(metrics.boolean.android_autofill_supported AS INT64))
+      ),
       (
         'avif_aom_decode_error',
         'quantity',

sql/glam-fenix-dev/glam_etl/org_mozilla_fenix__clients_daily_scalar_aggregates_metrics_v1/schema.yaml

@@ -1,3 +1,4 @@
+fields:
 - mode: NULLABLE
   name: client_id
   type: STRING

sql/glam-fenix-dev/glam_etl/org_mozilla_fenix__clients_daily_scalar_aggregates_migration_v1/schema.yaml

@@ -1,3 +1,4 @@
+fields:
 - mode: NULLABLE
   name: client_id
   type: STRING

sql/glam-fenix-dev/glam_etl/org_mozilla_fenix__clients_daily_scalar_aggregates_startup_timeline_v1/schema.yaml

@@ -1,3 +1,4 @@
+fields:
 - mode: NULLABLE
   name: client_id
   type: STRING

sql/glam-fenix-dev/glam_etl/org_mozilla_fenix__clients_daily_scalar_aggregates_sync_v1/schema.yaml

@@ -1,3 +1,4 @@
+fields:
 - mode: NULLABLE
   name: client_id
   type: STRING

sql/glam-fenix-dev/glam_etl/org_mozilla_fenix__clients_daily_scalar_aggregates_tabs_sync_v1/schema.yaml

@@ -1,3 +1,4 @@
+fields:
 - mode: NULLABLE
   name: client_id
   type: STRING

sql/glam-fenix-dev/glam_etl/org_mozilla_fenix__view_clients_daily_histogram_aggregates_v1/schema.yaml

@@ -1,3 +1,4 @@
+fields:
 - name: sample_id
   type: INTEGER
 - name: client_id

sql/glam-fenix-dev/glam_etl/org_mozilla_fenix__view_clients_daily_scalar_aggregates_v1/schema.yaml

@@ -1,3 +1,4 @@
+fields:
 - name: client_id
   type: STRING
 - name: ping_type

sql/glam-fenix-dev/glam_etl/org_mozilla_fenix_glam_nightly__clients_histogram_aggregates_v1/schema.yaml

@@ -1,3 +1,4 @@
+fields:
 - mode: NULLABLE
   name: sample_id
   type: INTEGER

sql/glam-fenix-dev/glam_etl/org_mozilla_fenix_glam_nightly__clients_scalar_aggregates_v1/schema.yaml

@@ -1,3 +1,4 @@
+fields:
 - mode: NULLABLE
   name: client_id
   type: STRING

sql/glam-fenix-dev/glam_etl/org_mozilla_fenix_glam_nightly__extract_probe_counts_v1/schema.yaml

@@ -1,3 +1,4 @@
+fields:
 - mode: NULLABLE
   name: channel
   type: STRING

sql/glam-fenix-dev/glam_etl/org_mozilla_fenix_glam_nightly__extract_user_counts_v1/schema.yaml

@@ -1,3 +1,4 @@
+fields:
 - mode: NULLABLE
   name: channel
   type: STRING

sql/glam-fenix-dev/glam_etl/org_mozilla_fenix_glam_nightly__histogram_bucket_counts_v1/schema.yaml

@@ -1,3 +1,4 @@
+fields:
 - mode: NULLABLE
   name: metric
   type: STRING

sql/glam-fenix-dev/glam_etl/org_mozilla_fenix_glam_nightly__histogram_percentiles_v1/schema.yaml

@@ -1,3 +1,4 @@
+fields:
 - mode: NULLABLE
   name: ping_type
   type: STRING

sql/glam-fenix-dev/glam_etl/org_mozilla_fenix_glam_nightly__histogram_probe_counts_v1/schema.yaml

@@ -1,3 +1,4 @@
+fields:
 - mode: NULLABLE
   name: ping_type
   type: STRING

sql/glam-fenix-dev/glam_etl/org_mozilla_fenix_glam_nightly__latest_versions_v1/schema.yaml

@@ -1,3 +1,4 @@
+fields:
 - mode: NULLABLE
   name: channel
   type: STRING

sql/glam-fenix-dev/glam_etl/org_mozilla_fenix_glam_nightly__scalar_bucket_counts_v1/schema.yaml

@@ -1,3 +1,4 @@
+fields:
 - mode: NULLABLE
   name: ping_type
   type: STRING

sql/glam-fenix-dev/glam_etl/org_mozilla_fenix_glam_nightly__scalar_percentiles_v1/schema.yaml

@@ -1,3 +1,4 @@
+fields:
 - mode: NULLABLE
   name: ping_type
   type: STRING

sql/glam-fenix-dev/glam_etl/org_mozilla_fenix_glam_nightly__scalar_probe_counts_v1/schema.yaml

@@ -1,3 +1,4 @@
+fields:
 - mode: NULLABLE
   name: ping_type
   type: STRING

sql/glam-fenix-dev/glam_etl/org_mozilla_fenix_glam_nightly__view_clients_daily_histogram_aggregates_v1/schema.yaml

@@ -1,3 +1,4 @@
+fields:
 - name: sample_id
   type: INTEGER
 - name: client_id

sql/glam-fenix-dev/glam_etl/org_mozilla_fenix_glam_nightly__view_clients_daily_scalar_aggregates_v1/schema.yaml

@@ -1,3 +1,4 @@
+fields:
 - name: client_id
   type: STRING
 - name: ping_type

sql/glam-fenix-dev/glam_etl/org_mozilla_fenix_glam_nightly__view_probe_counts_v1/schema.yaml

@@ -1,3 +1,4 @@
+fields:
 - name: ping_type
   type: STRING
 - name: os

sql/glam-fenix-dev/glam_etl/org_mozilla_fenix_glam_nightly__view_user_counts_v1/schema.yaml

@@ -1,3 +1,4 @@
+fields:
 - name: ping_type
   type: STRING
 - name: os

sql/glam-fenix-dev/glam_etl/org_mozilla_fenix_nightly__clients_daily_histogram_aggregates_metrics_v1/schema.yaml

@@ -1,3 +1,4 @@
+fields:
 - mode: NULLABLE
   name: sample_id
   type: INTEGER

sql/glam-fenix-dev/glam_etl/org_mozilla_fenix_nightly__clients_daily_scalar_aggregates_metrics_v1/query.sql

@@ -56,6 +56,34 @@ unlabeled_metrics AS (
         'true',
         SUM(CAST(metrics.boolean.addons_has_installed_addons AS INT64))
       ),
+      (
+        'android_autofill_enabled',
+        'boolean',
+        '',
+        'false',
+        SUM(CAST(NOT metrics.boolean.android_autofill_enabled AS INT64))
+      ),
+      (
+        'android_autofill_enabled',
+        'boolean',
+        '',
+        'true',
+        SUM(CAST(metrics.boolean.android_autofill_enabled AS INT64))
+      ),
+      (
+        'android_autofill_supported',
+        'boolean',
+        '',
+        'false',
+        SUM(CAST(NOT metrics.boolean.android_autofill_supported AS INT64))
+      ),
+      (
+        'android_autofill_supported',
+        'boolean',
+        '',
+        'true',
+        SUM(CAST(metrics.boolean.android_autofill_supported AS INT64))
+      ),
       (
         'avif_aom_decode_error',
         'quantity',

sql/glam-fenix-dev/glam_etl/org_mozilla_fenix_nightly__clients_daily_scalar_aggregates_metrics_v1/schema.yaml

@@ -1,3 +1,4 @@
+fields:
 - mode: NULLABLE
   name: client_id
   type: STRING

sql/glam-fenix-dev/glam_etl/org_mozilla_fenix_nightly__view_clients_daily_histogram_aggregates_v1/schema.yaml

@@ -1,3 +1,4 @@
+fields:
 - name: sample_id
   type: INTEGER
 - name: client_id

sql/glam-fenix-dev/glam_etl/org_mozilla_fenix_nightly__view_clients_daily_scalar_aggregates_v1/schema.yaml

@@ -1,3 +1,4 @@
+fields:
 - name: client_id
   type: STRING
 - name: ping_type

sql/glam-fenix-dev/glam_etl/org_mozilla_fennec_aurora__clients_daily_histogram_aggregates_metrics_v1/query.sql

@@ -434,6 +434,21 @@ histograms AS (
         "timing_distribution",
         metrics.timing_distribution.perf_startup_home_fragment_on_view_created.values
       ),
+      (
+        "performance_clone_deserialize_items",
+        "custom_distribution",
+        metrics.custom_distribution.performance_clone_deserialize_items.values
+      ),
+      (
+        "performance_clone_deserialize_size",
+        "memory_distribution",
+        metrics.memory_distribution.performance_clone_deserialize_size.values
+      ),
+      (
+        "performance_clone_deserialize_time",
+        "timing_distribution",
+        metrics.timing_distribution.performance_clone_deserialize_time.values
+      ),
       (
         "performance_interaction_keypress_present_latency",
         "timing_distribution",

sql/glam-fenix-dev/glam_etl/org_mozilla_fennec_aurora__clients_daily_histogram_aggregates_metrics_v1/schema.yaml

@@ -1,3 +1,4 @@
+fields:
 - mode: NULLABLE
   name: sample_id
   type: INTEGER

sql/glam-fenix-dev/glam_etl/org_mozilla_fennec_aurora__clients_daily_scalar_aggregates_metrics_v1/query.sql

@@ -56,6 +56,34 @@ unlabeled_metrics AS (
         'true',
         SUM(CAST(metrics.boolean.addons_has_installed_addons AS INT64))
       ),
+      (
+        'android_autofill_enabled',
+        'boolean',
+        '',
+        'false',
+        SUM(CAST(NOT metrics.boolean.android_autofill_enabled AS INT64))
+      ),
+      (
+        'android_autofill_enabled',
+        'boolean',
+        '',
+        'true',
+        SUM(CAST(metrics.boolean.android_autofill_enabled AS INT64))
+      ),
+      (
+        'android_autofill_supported',
+        'boolean',
+        '',
+        'false',
+        SUM(CAST(NOT metrics.boolean.android_autofill_supported AS INT64))
+      ),
+      (
+        'android_autofill_supported',
+        'boolean',
+        '',
+        'true',
+        SUM(CAST(metrics.boolean.android_autofill_supported AS INT64))
+      ),
       (
         'avif_aom_decode_error',
         'quantity',

sql/glam-fenix-dev/glam_etl/org_mozilla_fennec_aurora__clients_daily_scalar_aggregates_metrics_v1/schema.yaml

@@ -1,3 +1,4 @@
+fields:
 - mode: NULLABLE
   name: client_id
   type: STRING

sql/glam-fenix-dev/glam_etl/org_mozilla_fennec_aurora__view_clients_daily_histogram_aggregates_v1/schema.yaml

@@ -1,3 +1,4 @@
+fields:
 - name: sample_id
   type: INTEGER
 - name: client_id

sql/glam-fenix-dev/glam_etl/org_mozilla_fennec_aurora__view_clients_daily_scalar_aggregates_v1/schema.yaml

@@ -1,3 +1,4 @@
+fields:
 - name: client_id
   type: STRING
 - name: ping_type