dataops-ci-bot
commented
2 weeks ago Integration report for "Always fully specify metrics fields to select in Glean union views."
sql.diff
Click to expand!
```diff diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/bedrock_derived/event_monitoring_live_v1/materialized_view.sql /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/bedrock_derived/event_monitoring_live_v1/materialized_view.sql --- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/bedrock_derived/event_monitoring_live_v1/materialized_view.sql 2024-06-18 16:28:39.000000000 +0000 +++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/bedrock_derived/event_monitoring_live_v1/materialized_view.sql 2024-06-18 16:30:45.000000000 +0000 @@ -50,7 +50,7 @@ client_info.app_display_version AS version, ping_info FROM - `moz-fx-data-shared-prod.bedrock_live.interaction_v1` + `moz-fx-data-shared-prod.bedrock_live.events_v1` UNION ALL SELECT submission_timestamp, @@ -70,7 +70,7 @@ client_info.app_display_version AS version, ping_info FROM - `moz-fx-data-shared-prod.bedrock_live.events_v1` + `moz-fx-data-shared-prod.bedrock_live.interaction_v1` ) CROSS JOIN UNNEST(events) AS event, diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/bergamot/custom/view.sql /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/bergamot/custom/view.sql --- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/bergamot/custom/view.sql 2024-06-18 16:28:39.000000000 +0000 +++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/bergamot/custom/view.sql 2024-06-18 16:31:20.000000000 +0000 @@ -10,7 +10,99 @@ document_id, events, metadata, - metrics, + STRUCT( + STRUCT( + CAST(NULL AS INTEGER) AS `errors_marian`, + CAST(NULL AS INTEGER) AS `errors_memory`, + CAST(NULL AS INTEGER) AS `errors_model_download`, + CAST(NULL AS INTEGER) AS `errors_translation`, + CAST(NULL AS INTEGER) AS `service_lang_mismatch`, + CAST(NULL AS INTEGER) AS `service_not_suppported`, + CAST(NULL AS INTEGER) AS `test_counter_test`, + CAST(NULL AS INTEGER) AS `service_not_supported` + ) AS `counter`, + STRUCT( + CAST(NULL AS STRING) AS `metadata_from_lang`, + CAST(NULL AS STRING) AS `metadata_to_lang`, + CAST(NULL AS STRING) AS `performance_model_download_time`, + CAST(NULL AS STRING) AS `performance_model_load_time`, + CAST(NULL AS STRING) AS `performance_translation_quality`, + CAST(NULL AS STRING) AS `performance_translation_time`, + CAST(NULL AS STRING) AS `performance_words_per_second`, + CAST(NULL AS STRING) AS `test_string_test`, + CAST(NULL AS STRING) AS `metadata_firefox_client_id`, + CAST(NULL AS STRING) AS `metadata_bergamot_translator_version`, + CAST(NULL AS STRING) AS `metadata_cpu_extensions`, + CAST(NULL AS STRING) AS `metadata_cpu_family`, + CAST(NULL AS STRING) AS `metadata_cpu_model`, + CAST(NULL AS STRING) AS `metadata_cpu_stepping`, + CAST(NULL AS STRING) AS `metadata_cpu_vendor`, + CAST(NULL AS STRING) AS `metadata_extension_build_id`, + CAST(NULL AS STRING) AS `metadata_extension_version`, + CAST(NULL AS STRING) AS `glean_client_annotation_experimentation_id` + ) AS `string`, + STRUCT( + ARRAY( + SELECT + STRUCT(glean_error_invalid_label.key, glean_error_invalid_label.value) + FROM + UNNEST(metrics.labeled_counter.glean_error_invalid_label) AS `glean_error_invalid_label` + ) AS `glean_error_invalid_label`, + ARRAY( + SELECT + STRUCT(glean_error_invalid_overflow.key, glean_error_invalid_overflow.value) + FROM + UNNEST( + metrics.labeled_counter.glean_error_invalid_overflow + ) AS `glean_error_invalid_overflow` + ) AS `glean_error_invalid_overflow`, + ARRAY( + SELECT + STRUCT(glean_error_invalid_state.key, glean_error_invalid_state.value) + FROM + UNNEST(metrics.labeled_counter.glean_error_invalid_state) AS `glean_error_invalid_state` + ) AS `glean_error_invalid_state`, + ARRAY( + SELECT + STRUCT(glean_error_invalid_value.key, glean_error_invalid_value.value) + FROM + UNNEST(metrics.labeled_counter.glean_error_invalid_value) AS `glean_error_invalid_value` + ) AS `glean_error_invalid_value` + ) AS `labeled_counter`, + STRUCT( + CAST(NULL AS INTEGER) AS `metadata_cpu_cores_count`, + CAST(NULL AS INTEGER) AS `metadata_cpu_count`, + CAST(NULL AS INTEGER) AS `metadata_cpu_l2_cache`, + CAST(NULL AS INTEGER) AS `metadata_cpu_l3_cache`, + CAST(NULL AS INTEGER) AS `metadata_cpu_speed`, + CAST(NULL AS INTEGER) AS `metadata_system_memory`, + CAST(NULL AS INTEGER) AS `performance_full_page_translated_wps`, + CAST(NULL AS INTEGER) AS `performance_translation_engine_wps`, + CAST(NULL AS INTEGER) AS `performance_word_count`, + CAST(NULL AS INTEGER) AS `performance_word_count_visible_in_viewport`, + CAST(NULL AS INTEGER) AS `metadata_cpu_family`, + CAST(NULL AS INTEGER) AS `metadata_cpu_model`, + CAST(NULL AS INTEGER) AS `metadata_cpu_stepping` + ) AS `quantity`, + STRUCT( + STRUCT( + CAST(NULL AS STRING) AS `time_unit`, + CAST(NULL AS INTEGER) AS `value` + ) AS `performance_full_page_translated_time`, + STRUCT( + CAST(NULL AS STRING) AS `time_unit`, + CAST(NULL AS INTEGER) AS `value` + ) AS `performance_model_download_time_num`, + STRUCT( + CAST(NULL AS STRING) AS `time_unit`, + CAST(NULL AS INTEGER) AS `value` + ) AS `performance_model_load_time_num`, + STRUCT( + CAST(NULL AS STRING) AS `time_unit`, + CAST(NULL AS INTEGER) AS `value` + ) AS `performance_translation_engine_time` + ) AS `timespan` + ) AS `metrics`, normalized_app_name, normalized_country_code, normalized_os, diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/bergamot/deletion_request/view.sql /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/bergamot/deletion_request/view.sql --- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/bergamot/deletion_request/view.sql 2024-06-18 16:28:39.000000000 +0000 +++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/bergamot/deletion_request/view.sql 2024-06-18 16:31:18.000000000 +0000 @@ -10,7 +10,37 @@ document_id, events, metadata, - metrics, + STRUCT( + STRUCT( + ARRAY( + SELECT + STRUCT(glean_error_invalid_label.key, glean_error_invalid_label.value) + FROM + UNNEST(metrics.labeled_counter.glean_error_invalid_label) AS `glean_error_invalid_label` + ) AS `glean_error_invalid_label`, + ARRAY( + SELECT + STRUCT(glean_error_invalid_overflow.key, glean_error_invalid_overflow.value) + FROM + UNNEST( + metrics.labeled_counter.glean_error_invalid_overflow + ) AS `glean_error_invalid_overflow` + ) AS `glean_error_invalid_overflow`, + ARRAY( + SELECT + STRUCT(glean_error_invalid_state.key, glean_error_invalid_state.value) + FROM + UNNEST(metrics.labeled_counter.glean_error_invalid_state) AS `glean_error_invalid_state` + ) AS `glean_error_invalid_state`, + ARRAY( + SELECT + STRUCT(glean_error_invalid_value.key, glean_error_invalid_value.value) + FROM + UNNEST(metrics.labeled_counter.glean_error_invalid_value) AS `glean_error_invalid_value` + ) AS `glean_error_invalid_value` + ) AS `labeled_counter`, + STRUCT(CAST(NULL AS STRING) AS `glean_client_annotation_experimentation_id`) AS `string` + ) AS `metrics`, normalized_app_name, normalized_country_code, normalized_os, diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/bergamot/events/view.sql /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/bergamot/events/view.sql --- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/bergamot/events/view.sql 2024-06-18 16:28:39.000000000 +0000 +++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/bergamot/events/view.sql 2024-06-18 16:31:19.000000000 +0000 @@ -10,7 +10,38 @@ document_id, events, metadata, - metrics, + STRUCT( + STRUCT( + ARRAY( + SELECT + STRUCT(glean_error_invalid_label.key, glean_error_invalid_label.value) + FROM + UNNEST(metrics.labeled_counter.glean_error_invalid_label) AS `glean_error_invalid_label` + ) AS `glean_error_invalid_label`, + ARRAY( + SELECT + STRUCT(glean_error_invalid_overflow.key, glean_error_invalid_overflow.value) + FROM + UNNEST( + metrics.labeled_counter.glean_error_invalid_overflow + ) AS `glean_error_invalid_overflow` + ) AS `glean_error_invalid_overflow`, + ARRAY( + SELECT + STRUCT(glean_error_invalid_state.key, glean_error_invalid_state.value) + FROM + UNNEST(metrics.labeled_counter.glean_error_invalid_state) AS `glean_error_invalid_state` + ) AS `glean_error_invalid_state`, + ARRAY( + SELECT + STRUCT(glean_error_invalid_value.key, glean_error_invalid_value.value) + FROM + UNNEST(metrics.labeled_counter.glean_error_invalid_value) AS `glean_error_invalid_value` + ) AS `glean_error_invalid_value` + ) AS `labeled_counter`, + STRUCT(CAST(NULL AS STRING) AS `glean_client_annotation_experimentation_id`) AS `string`, + STRUCT(CAST(NULL AS STRING) AS `glean_page_id`) AS `uuid` + ) AS `metrics`, normalized_app_name, normalized_country_code, normalized_os, diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/contextual_services/event_aggregates/schema.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/contextual_services/event_aggregates/schema.yaml --- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/contextual_services/event_aggregates/schema.yaml 2024-06-18 16:28:03.000000000 +0000 +++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/contextual_services/event_aggregates/schema.yaml 2024-06-18 16:37:43.000000000 +0000 @@ -1,49 +1,49 @@ fields: -- mode: NULLABLE - name: submission_date +- name: submission_date type: DATE -- mode: NULLABLE - name: source + mode: NULLABLE +- name: source type: STRING -- mode: NULLABLE - name: event_type + mode: NULLABLE +- name: event_type type: STRING -- mode: NULLABLE - name: form_factor + mode: NULLABLE +- name: form_factor type: STRING -- mode: NULLABLE - name: country + mode: NULLABLE +- name: country type: STRING -- mode: NULLABLE - name: subdivision1 + mode: NULLABLE +- name: subdivision1 type: STRING -- mode: NULLABLE - name: advertiser + mode: NULLABLE +- name: advertiser type: STRING -- mode: NULLABLE - name: release_channel + mode: NULLABLE +- name: release_channel type: STRING -- mode: NULLABLE - name: position + mode: NULLABLE +- name: position type: INTEGER -- mode: NULLABLE - name: provider + mode: NULLABLE +- name: provider type: STRING -- mode: NULLABLE - name: match_type + mode: NULLABLE +- name: match_type type: STRING -- mode: NULLABLE - name: normalized_os + mode: NULLABLE +- name: normalized_os type: STRING -- mode: NULLABLE - name: suggest_data_sharing_enabled + mode: NULLABLE +- name: suggest_data_sharing_enabled type: BOOLEAN -- mode: NULLABLE - name: event_count + mode: NULLABLE +- name: event_count type: INTEGER -- mode: NULLABLE - name: user_count + mode: NULLABLE +- name: user_count type: INTEGER -- mode: NULLABLE - name: query_type + mode: NULLABLE +- name: query_type type: STRING + mode: NULLABLE diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/contextual_services/event_aggregates_suggest/schema.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/contextual_services/event_aggregates_suggest/schema.yaml --- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/contextual_services/event_aggregates_suggest/schema.yaml 2024-06-18 16:28:03.000000000 +0000 +++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/contextual_services/event_aggregates_suggest/schema.yaml 2024-06-18 16:37:42.000000000 +0000 @@ -1,40 +1,40 @@ fields: -- mode: NULLABLE - name: submission_date +- name: submission_date type: DATE -- mode: NULLABLE - name: form_factor + mode: NULLABLE +- name: form_factor type: STRING -- mode: NULLABLE - name: country + mode: NULLABLE +- name: country type: STRING -- mode: NULLABLE - name: advertiser + mode: NULLABLE +- name: advertiser type: STRING -- mode: NULLABLE - name: normalized_os + mode: NULLABLE +- name: normalized_os type: STRING -- mode: NULLABLE - name: release_channel + mode: NULLABLE +- name: release_channel type: STRING -- mode: NULLABLE - name: position + mode: NULLABLE +- name: position type: INTEGER -- mode: NULLABLE - name: provider + mode: NULLABLE +- name: provider type: STRING -- mode: NULLABLE - name: match_type + mode: NULLABLE +- name: match_type type: STRING -- mode: NULLABLE - name: suggest_data_sharing_enabled + mode: NULLABLE +- name: suggest_data_sharing_enabled type: BOOLEAN -- mode: NULLABLE - name: impression_count + mode: NULLABLE +- name: impression_count type: INTEGER -- mode: NULLABLE - name: click_count + mode: NULLABLE +- name: click_count type: INTEGER -- mode: NULLABLE - name: query_type + mode: NULLABLE +- name: query_type type: STRING + mode: NULLABLE diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/fenix/activation/view.sql /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/fenix/activation/view.sql --- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/fenix/activation/view.sql 2024-06-18 16:28:40.000000000 +0000 +++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/fenix/activation/view.sql 2024-06-18 16:31:37.000000000 +0000 @@ -13,7 +13,41 @@ document_id, events, metadata, - metrics, + STRUCT( + STRUCT( + ARRAY( + SELECT + STRUCT(glean_error_invalid_label.key, glean_error_invalid_label.value) + FROM + UNNEST(metrics.labeled_counter.glean_error_invalid_label) AS `glean_error_invalid_label` + ) AS `glean_error_invalid_label`, + ARRAY( + SELECT + STRUCT(glean_error_invalid_overflow.key, glean_error_invalid_overflow.value) + FROM + UNNEST( + metrics.labeled_counter.glean_error_invalid_overflow + ) AS `glean_error_invalid_overflow` + ) AS `glean_error_invalid_overflow`, + ARRAY( + SELECT + STRUCT(glean_error_invalid_state.key, glean_error_invalid_state.value) + FROM + UNNEST(metrics.labeled_counter.glean_error_invalid_state) AS `glean_error_invalid_state` + ) AS `glean_error_invalid_state`, + ARRAY( + SELECT + STRUCT(glean_error_invalid_value.key, glean_error_invalid_value.value) + FROM + UNNEST(metrics.labeled_counter.glean_error_invalid_value) AS `glean_error_invalid_value` + ) AS `glean_error_invalid_value` + ) AS `labeled_counter`, + STRUCT( + CAST(NULL AS STRING) AS `activation_identifier`, + CAST(NULL AS STRING) AS `glean_client_annotation_experimentation_id` + ) AS `string`, + STRUCT(CAST(NULL AS STRING) AS `activation_activation_id`) AS `uuid` + ) AS `metrics`, normalized_app_name, normalized_country_code, normalized_os, @@ -35,7 +69,41 @@ document_id, events, metadata, - metrics, + STRUCT( + STRUCT( + ARRAY( + SELECT + STRUCT(glean_error_invalid_label.key, glean_error_invalid_label.value) + FROM + UNNEST(metrics.labeled_counter.glean_error_invalid_label) AS `glean_error_invalid_label` + ) AS `glean_error_invalid_label`, + ARRAY( + SELECT + STRUCT(glean_error_invalid_overflow.key, glean_error_invalid_overflow.value) + FROM + UNNEST( + metrics.labeled_counter.glean_error_invalid_overflow + ) AS `glean_error_invalid_overflow` + ) AS `glean_error_invalid_overflow`, + ARRAY( + SELECT + STRUCT(glean_error_invalid_state.key, glean_error_invalid_state.value) + FROM + UNNEST(metrics.labeled_counter.glean_error_invalid_state) AS `glean_error_invalid_state` + ) AS `glean_error_invalid_state`, + ARRAY( + SELECT + STRUCT(glean_error_invalid_value.key, glean_error_invalid_value.value) + FROM + UNNEST(metrics.labeled_counter.glean_error_invalid_value) AS `glean_error_invalid_value` + ) AS `glean_error_invalid_value` + ) AS `labeled_counter`, + STRUCT( + CAST(NULL AS STRING) AS `activation_identifier`, + CAST(NULL AS STRING) AS `glean_client_annotation_experimentation_id` + ) AS `string`, + STRUCT(CAST(NULL AS STRING) AS `activation_activation_id`) AS `uuid` + ) AS `metrics`, normalized_app_name, normalized_country_code, normalized_os, @@ -77,13 +145,38 @@ metadata, STRUCT( STRUCT( - metrics.labeled_counter.glean_error_invalid_label, - metrics.labeled_counter.glean_error_invalid_overflow, - metrics.labeled_counter.glean_error_invalid_state, - metrics.labeled_counter.glean_error_invalid_value + ARRAY( + SELECT + STRUCT(glean_error_invalid_label.key, glean_error_invalid_label.value) + FROM + UNNEST(metrics.labeled_counter.glean_error_invalid_label) AS `glean_error_invalid_label` + ) AS `glean_error_invalid_label`, + ARRAY( + SELECT + STRUCT(glean_error_invalid_overflow.key, glean_error_invalid_overflow.value) + FROM + UNNEST( + metrics.labeled_counter.glean_error_invalid_overflow + ) AS `glean_error_invalid_overflow` + ) AS `glean_error_invalid_overflow`, + ARRAY( + SELECT + STRUCT(glean_error_invalid_state.key, glean_error_invalid_state.value) + FROM + UNNEST(metrics.labeled_counter.glean_error_invalid_state) AS `glean_error_invalid_state` + ) AS `glean_error_invalid_state`, + ARRAY( + SELECT + STRUCT(glean_error_invalid_value.key, glean_error_invalid_value.value) + FROM + UNNEST(metrics.labeled_counter.glean_error_invalid_value) AS `glean_error_invalid_value` + ) AS `glean_error_invalid_value` ) AS `labeled_counter`, - metrics.string, - metrics.uuid + STRUCT( + CAST(NULL AS STRING) AS `activation_identifier`, + CAST(NULL AS STRING) AS `glean_client_annotation_experimentation_id` + ) AS `string`, + STRUCT(CAST(NULL AS STRING) AS `activation_activation_id`) AS `uuid` ) AS `metrics`, normalized_app_name, normalized_country_code, @@ -135,13 +228,38 @@ metadata, STRUCT( STRUCT( - metrics.labeled_counter.glean_error_invalid_label, - metrics.labeled_counter.glean_error_invalid_overflow, - metrics.labeled_counter.glean_error_invalid_state, - metrics.labeled_counter.glean_error_invalid_value + ARRAY( + SELECT + STRUCT(glean_error_invalid_label.key, glean_error_invalid_label.value) + FROM + UNNEST(metrics.labeled_counter.glean_error_invalid_label) AS `glean_error_invalid_label` + ) AS `glean_error_invalid_label`, + ARRAY( + SELECT + STRUCT(glean_error_invalid_overflow.key, glean_error_invalid_overflow.value) + FROM + UNNEST( + metrics.labeled_counter.glean_error_invalid_overflow + ) AS `glean_error_invalid_overflow` + ) AS `glean_error_invalid_overflow`, + ARRAY( + SELECT + STRUCT(glean_error_invalid_state.key, glean_error_invalid_state.value) + FROM + UNNEST(metrics.labeled_counter.glean_error_invalid_state) AS `glean_error_invalid_state` + ) AS `glean_error_invalid_state`, + ARRAY( + SELECT + STRUCT(glean_error_invalid_value.key, glean_error_invalid_value.value) + FROM + UNNEST(metrics.labeled_counter.glean_error_invalid_value) AS `glean_error_invalid_value` + ) AS `glean_error_invalid_value` ) AS `labeled_counter`, - metrics.string, - metrics.uuid + STRUCT( + CAST(NULL AS STRING) AS `activation_identifier`, + CAST(NULL AS STRING) AS `glean_client_annotation_experimentation_id` + ) AS `string`, + STRUCT(CAST(NULL AS STRING) AS `activation_activation_id`) AS `uuid` ) AS `metrics`, normalized_app_name, normalized_country_code, @@ -173,7 +291,41 @@ document_id, events, metadata, - metrics, + STRUCT( + STRUCT( + ARRAY( + SELECT + STRUCT(glean_error_invalid_label.key, glean_error_invalid_label.value) + FROM + UNNEST(metrics.labeled_counter.glean_error_invalid_label) AS `glean_error_invalid_label` + ) AS `glean_error_invalid_label`, + ARRAY( + SELECT + STRUCT(glean_error_invalid_overflow.key, glean_error_invalid_overflow.value) + FROM + UNNEST( + metrics.labeled_counter.glean_error_invalid_overflow + ) AS `glean_error_invalid_overflow` + ) AS `glean_error_invalid_overflow`, + ARRAY( + SELECT + STRUCT(glean_error_invalid_state.key, glean_error_invalid_state.value) + FROM + UNNEST(metrics.labeled_counter.glean_error_invalid_state) AS `glean_error_invalid_state` + ) AS `glean_error_invalid_state`, + ARRAY( + SELECT + STRUCT(glean_error_invalid_value.key, glean_error_invalid_value.value) + FROM + UNNEST(metrics.labeled_counter.glean_error_invalid_value) AS `glean_error_invalid_value` + ) AS `glean_error_invalid_value` + ) AS `labeled_counter`, + STRUCT( + CAST(NULL AS STRING) AS `activation_identifier`, + CAST(NULL AS STRING) AS `glean_client_annotation_experimentation_id` + ) AS `string`, + STRUCT(CAST(NULL AS STRING) AS `activation_activation_id`) AS `uuid` + ) AS `metrics`, normalized_app_name, normalized_country_code, normalized_os, diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/fenix/addresses_sync/view.sql /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/fenix/addresses_sync/view.sql --- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/fenix/addresses_sync/view.sql 2024-06-18 16:28:40.000000000 +0000 +++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/fenix/addresses_sync/view.sql 2024-06-18 16:34:19.000000000 +0000 @@ -13,7 +13,97 @@ document_id, events, metadata, - metrics, + STRUCT( + STRUCT( + CAST(NULL AS INTEGER) AS `addresses_sync_outgoing_batches`, + CAST(NULL AS INTEGER) AS `addresses_sync_v2_outgoing_batches` + ) AS `counter`, + STRUCT( + CAST(NULL AS TIMESTAMP) AS `addresses_sync_finished_at`, + CAST(NULL AS STRING) AS `raw_addresses_sync_finished_at`, + CAST(NULL AS TIMESTAMP) AS `addresses_sync_started_at`, + CAST(NULL AS STRING) AS `raw_addresses_sync_started_at`, + CAST(NULL AS TIMESTAMP) AS `addresses_sync_v2_finished_at`, + CAST(NULL AS STRING) AS `raw_addresses_sync_v2_finished_at`, + CAST(NULL AS TIMESTAMP) AS `addresses_sync_v2_started_at`, + CAST(NULL AS STRING) AS `raw_addresses_sync_v2_started_at` + ) AS `datetime`, + STRUCT( + ARRAY( + SELECT + STRUCT(addresses_sync_incoming.key, addresses_sync_incoming.value) + FROM + UNNEST(metrics.labeled_counter.addresses_sync_incoming) AS `addresses_sync_incoming` + ) AS `addresses_sync_incoming`, + ARRAY( + SELECT + STRUCT(addresses_sync_outgoing.key, addresses_sync_outgoing.value) + FROM + UNNEST(metrics.labeled_counter.addresses_sync_outgoing) AS `addresses_sync_outgoing` + ) AS `addresses_sync_outgoing`, + ARRAY( + SELECT + STRUCT(glean_error_invalid_label.key, glean_error_invalid_label.value) + FROM + UNNEST(metrics.labeled_counter.glean_error_invalid_label) AS `glean_error_invalid_label` + ) AS `glean_error_invalid_label`, + ARRAY( + SELECT + STRUCT(glean_error_invalid_overflow.key, glean_error_invalid_overflow.value) + FROM + UNNEST( + metrics.labeled_counter.glean_error_invalid_overflow + ) AS `glean_error_invalid_overflow` + ) AS `glean_error_invalid_overflow`, + ARRAY( + SELECT + STRUCT(glean_error_invalid_state.key, glean_error_invalid_state.value) + FROM + UNNEST(metrics.labeled_counter.glean_error_invalid_state) AS `glean_error_invalid_state` + ) AS `glean_error_invalid_state`, + ARRAY( + SELECT + STRUCT(glean_error_invalid_value.key, glean_error_invalid_value.value) + FROM + UNNEST(metrics.labeled_counter.glean_error_invalid_value) AS `glean_error_invalid_value` + ) AS `glean_error_invalid_value`, + ARRAY( + SELECT + STRUCT(addresses_sync_v2_incoming.key, addresses_sync_v2_incoming.value) + FROM + UNNEST(metrics.labeled_counter.addresses_sync_v2_incoming) AS `addresses_sync_v2_incoming` + ) AS `addresses_sync_v2_incoming`, + ARRAY( + SELECT + STRUCT(addresses_sync_v2_outgoing.key, addresses_sync_v2_outgoing.value) + FROM + UNNEST(metrics.labeled_counter.addresses_sync_v2_outgoing) AS `addresses_sync_v2_outgoing` + ) AS `addresses_sync_v2_outgoing` + ) AS `labeled_counter`, + STRUCT( + ARRAY( + SELECT + STRUCT(addresses_sync_failure_reason.key, addresses_sync_failure_reason.value) + FROM + UNNEST( + metrics.labeled_string.addresses_sync_failure_reason + ) AS `addresses_sync_failure_reason` + ) AS `addresses_sync_failure_reason`, + ARRAY( + SELECT + STRUCT(addresses_sync_v2_failure_reason.key, addresses_sync_v2_failure_reason.value) + FROM + UNNEST( + metrics.labeled_string.addresses_sync_v2_failure_reason + ) AS `addresses_sync_v2_failure_reason` + ) AS `addresses_sync_v2_failure_reason` + ) AS `labeled_string`, + STRUCT( + CAST(NULL AS STRING) AS `addresses_sync_uid`, + CAST(NULL AS STRING) AS `addresses_sync_v2_uid`, + CAST(NULL AS STRING) AS `glean_client_annotation_experimentation_id` + ) AS `string` + ) AS `metrics`, normalized_app_name, normalized_country_code, normalized_os, @@ -35,7 +125,97 @@ document_id, events, metadata, - metrics, + STRUCT( + STRUCT( + CAST(NULL AS INTEGER) AS `addresses_sync_outgoing_batches`, + CAST(NULL AS INTEGER) AS `addresses_sync_v2_outgoing_batches` + ) AS `counter`, + STRUCT( + CAST(NULL AS TIMESTAMP) AS `addresses_sync_finished_at`, + CAST(NULL AS STRING) AS `raw_addresses_sync_finished_at`, + CAST(NULL AS TIMESTAMP) AS `addresses_sync_started_at`, + CAST(NULL AS STRING) AS `raw_addresses_sync_started_at`, + CAST(NULL AS TIMESTAMP) AS `addresses_sync_v2_finished_at`, + CAST(NULL AS STRING) AS `raw_addresses_sync_v2_finished_at`, + CAST(NULL AS TIMESTAMP) AS `addresses_sync_v2_started_at`, + CAST(NULL AS STRING) AS `raw_addresses_sync_v2_started_at` + ) AS `datetime`, + STRUCT( + ARRAY( + SELECT + STRUCT(addresses_sync_incoming.key, addresses_sync_incoming.value) + FROM + UNNEST(metrics.labeled_counter.addresses_sync_incoming) AS `addresses_sync_incoming` + ) AS `addresses_sync_incoming`, + ARRAY( + SELECT + STRUCT(addresses_sync_outgoing.key, addresses_sync_outgoing.value) + FROM + UNNEST(metrics.labeled_counter.addresses_sync_outgoing) AS `addresses_sync_outgoing` + ) AS `addresses_sync_outgoing`, + ARRAY( + SELECT + STRUCT(glean_error_invalid_label.key, glean_error_invalid_label.value) + FROM + UNNEST(metrics.labeled_counter.glean_error_invalid_label) AS `glean_error_invalid_label` + ) AS `glean_error_invalid_label`, + ARRAY( + SELECT + STRUCT(glean_error_invalid_overflow.key, glean_error_invalid_overflow.value) + FROM + UNNEST( + metrics.labeled_counter.glean_error_invalid_overflow + ) AS `glean_error_invalid_overflow` + ) AS `glean_error_invalid_overflow`, + ARRAY( + SELECT + STRUCT(glean_error_invalid_state.key, glean_error_invalid_state.value) + FROM + UNNEST(metrics.labeled_counter.glean_error_invalid_state) AS `glean_error_invalid_state` + ) AS `glean_error_invalid_state`, + ARRAY( + SELECT + STRUCT(glean_error_invalid_value.key, glean_error_invalid_value.value) + FROM + UNNEST(metrics.labeled_counter.glean_error_invalid_value) AS `glean_error_invalid_value` + ) AS `glean_error_invalid_value`, + ARRAY( + SELECT + STRUCT(addresses_sync_v2_incoming.key, addresses_sync_v2_incoming.value) + FROM + UNNEST(metrics.labeled_counter.addresses_sync_v2_incoming) AS `addresses_sync_v2_incoming` + ) AS `addresses_sync_v2_incoming`, + ARRAY( + SELECT + STRUCT(addresses_sync_v2_outgoing.key, addresses_sync_v2_outgoing.value) + FROM + UNNEST(metrics.labeled_counter.addresses_sync_v2_outgoing) AS `addresses_sync_v2_outgoing` + ) AS `addresses_sync_v2_outgoing` + ) AS `labeled_counter`, + STRUCT( + ARRAY( + SELECT + STRUCT(addresses_sync_failure_reason.key, addresses_sync_failure_reason.value) + FROM + UNNEST( + metrics.labeled_string.addresses_sync_failure_reason + ) AS `addresses_sync_failure_reason` + ) AS `addresses_sync_failure_reason`, + ARRAY( + SELECT + STRUCT(addresses_sync_v2_failure_reason.key, addresses_sync_v2_failure_reason.value) + FROM + UNNEST( + metrics.labeled_string.addresses_sync_v2_failure_reason + ) AS `addresses_sync_v2_failure_reason` + ) AS `addresses_sync_v2_failure_reason` + ) AS `labeled_string`, + STRUCT( + CAST(NULL AS STRING) AS `addresses_sync_uid`, + CAST(NULL AS STRING) AS `addresses_sync_v2_uid`, + CAST(NULL AS STRING) AS `glean_client_annotation_experimentation_id` + ) AS `string` + ) AS `metrics`, normalized_app_name, normalized_country_code, normalized_os, @@ -57,7 +237,97 @@ document_id, events, metadata, - metrics, + STRUCT( + STRUCT( + CAST(NULL AS INTEGER) AS `addresses_sync_outgoing_batches`, + CAST(NULL AS INTEGER) AS `addresses_sync_v2_outgoing_batches` + ) AS `counter`, + STRUCT( + CAST(NULL AS TIMESTAMP) AS `addresses_sync_finished_at`, + CAST(NULL AS STRING) AS `raw_addresses_sync_finished_at`, + CAST(NULL AS TIMESTAMP) AS `addresses_sync_started_at`, + CAST(NULL AS STRING) AS `raw_addresses_sync_started_at`, + CAST(NULL AS TIMESTAMP) AS `addresses_sync_v2_finished_at`, + CAST(NULL AS STRING) AS `raw_addresses_sync_v2_finished_at`, + CAST(NULL AS TIMESTAMP) AS `addresses_sync_v2_started_at`, + CAST(NULL AS STRING) AS `raw_addresses_sync_v2_started_at` + ) AS `datetime`, + STRUCT( + ARRAY( + SELECT + STRUCT(addresses_sync_incoming.key, addresses_sync_incoming.value) + FROM + UNNEST(metrics.labeled_counter.addresses_sync_incoming) AS `addresses_sync_incoming` + ) AS `addresses_sync_incoming`, + ARRAY( + SELECT + STRUCT(addresses_sync_outgoing.key, addresses_sync_outgoing.value) + FROM + UNNEST(metrics.labeled_counter.addresses_sync_outgoing) AS `addresses_sync_outgoing` + ) AS `addresses_sync_outgoing`, + ARRAY( + SELECT + STRUCT(glean_error_invalid_label.key, glean_error_invalid_label.value) + FROM + UNNEST(metrics.labeled_counter.glean_error_invalid_label) AS `glean_error_invalid_label` + ) AS `glean_error_invalid_label`, + ARRAY( + SELECT + STRUCT(glean_error_invalid_overflow.key, glean_error_invalid_overflow.value) + FROM + UNNEST( + metrics.labeled_counter.glean_error_invalid_overflow + ) AS `glean_error_invalid_overflow` + ) AS `glean_error_invalid_overflow`, + ARRAY( + SELECT + STRUCT(glean_error_invalid_state.key, glean_error_invalid_state.value) + FROM + UNNEST(metrics.labeled_counter.glean_error_invalid_state) AS `glean_error_invalid_state` + ) AS `glean_error_invalid_state`, + ARRAY( + SELECT + STRUCT(glean_error_invalid_value.key, glean_error_invalid_value.value) + FROM + UNNEST(metrics.labeled_counter.glean_error_invalid_value) AS `glean_error_invalid_value` + ) AS `glean_error_invalid_value`, + ARRAY( + SELECT + STRUCT(addresses_sync_v2_incoming.key, addresses_sync_v2_incoming.value) + FROM + UNNEST(metrics.labeled_counter.addresses_sync_v2_incoming) AS `addresses_sync_v2_incoming` + ) AS `addresses_sync_v2_incoming`, + ARRAY( + SELECT + STRUCT(addresses_sync_v2_outgoing.key, addresses_sync_v2_outgoing.value) + FROM + UNNEST(metrics.labeled_counter.addresses_sync_v2_outgoing) AS `addresses_sync_v2_outgoing` + ) AS `addresses_sync_v2_outgoing` + ) AS `labeled_counter`, + STRUCT( + ARRAY( + SELECT + STRUCT(addresses_sync_failure_reason.key, addresses_sync_failure_reason.value) + FROM + UNNEST( + metrics.labeled_string.addresses_sync_failure_reason + ) AS `addresses_sync_failure_reason` + ) AS `addresses_sync_failure_reason`, + ARRAY( + SELECT + STRUCT(addresses_sync_v2_failure_reason.key, addresses_sync_v2_failure_reason.value) + FROM + UNNEST( + metrics.labeled_string.addresses_sync_v2_failure_reason + ) AS `addresses_sync_v2_failure_reason` + ) AS `addresses_sync_v2_failure_reason` + ) AS `labeled_string`, + STRUCT( + CAST(NULL AS STRING) AS `addresses_sync_uid`, + CAST(NULL AS STRING) AS `addresses_sync_v2_uid`, + CAST(NULL AS STRING) AS `glean_client_annotation_experimentation_id` + ) AS `string` + ) AS `metrics`, normalized_app_name, normalized_country_code, normalized_os, @@ -79,7 +349,97 @@ document_id, events, metadata, - metrics, + STRUCT( + STRUCT( + CAST(NULL AS INTEGER) AS `addresses_sync_outgoing_batches`, + CAST(NULL AS INTEGER) AS `addresses_sync_v2_outgoing_batches` + ) AS `counter`, + STRUCT( + CAST(NULL AS TIMESTAMP) AS `addresses_sync_finished_at`, + CAST(NULL AS STRING) AS `raw_addresses_sync_finished_at`, + CAST(NULL AS TIMESTAMP) AS `addresses_sync_started_at`, + CAST(NULL AS STRING) AS `raw_addresses_sync_started_at`, + CAST(NULL AS TIMESTAMP) AS `addresses_sync_v2_finished_at`, + CAST(NULL AS STRING) AS `raw_addresses_sync_v2_finished_at`, + CAST(NULL AS TIMESTAMP) AS `addresses_sync_v2_started_at`, + CAST(NULL AS STRING) AS `raw_addresses_sync_v2_started_at` + ) AS `datetime`, + STRUCT( + ARRAY( + SELECT + STRUCT(addresses_sync_incoming.key, addresses_sync_incoming.value) + FROM + UNNEST(metrics.labeled_counter.addresses_sync_incoming) AS `addresses_sync_incoming` + ) AS `addresses_sync_incoming`, + ARRAY( + SELECT + STRUCT(addresses_sync_outgoing.key, addresses_sync_outgoing.value) + FROM + UNNEST(metrics.labeled_counter.addresses_sync_outgoing) AS `addresses_sync_outgoing` + ) AS `addresses_sync_outgoing`, + ARRAY( + SELECT + STRUCT(glean_error_invalid_label.key, glean_error_invalid_label.value) + FROM + UNNEST(metrics.labeled_counter.glean_error_invalid_label) AS `glean_error_invalid_label` + ) AS `glean_error_invalid_label`, + ARRAY( + SELECT + STRUCT(glean_error_invalid_overflow.key, glean_error_invalid_overflow.value) + FROM + UNNEST( + metrics.labeled_counter.glean_error_invalid_overflow + ) AS `glean_error_invalid_overflow` + ) AS `glean_error_invalid_overflow`, + ARRAY( + SELECT + STRUCT(glean_error_invalid_state.key, glean_error_invalid_state.value) + FROM + UNNEST(metrics.labeled_counter.glean_error_invalid_state) AS `glean_error_invalid_state` + ) AS `glean_error_invalid_state`, + ARRAY( + SELECT + STRUCT(glean_error_invalid_value.key, glean_error_invalid_value.value) + FROM + UNNEST(metrics.labeled_counter.glean_error_invalid_value) AS `glean_error_invalid_value` + ) AS `glean_error_invalid_value`, + ARRAY( + SELECT + STRUCT(addresses_sync_v2_incoming.key, addresses_sync_v2_incoming.value) + FROM + UNNEST(metrics.labeled_counter.addresses_sync_v2_incoming) AS `addresses_sync_v2_incoming` + ) AS `addresses_sync_v2_incoming`, + ARRAY( + SELECT + STRUCT(addresses_sync_v2_outgoing.key, addresses_sync_v2_outgoing.value) + FROM + UNNEST(metrics.labeled_counter.addresses_sync_v2_outgoing) AS `addresses_sync_v2_outgoing` + ) AS `addresses_sync_v2_outgoing` + ) AS `labeled_counter`, + STRUCT( + ARRAY( + SELECT + STRUCT(addresses_sync_failure_reason.key, addresses_sync_failure_reason.value) + FROM + UNNEST( + metrics.labeled_string.addresses_sync_failure_reason + ) AS `addresses_sync_failure_reason` + ) AS `addresses_sync_failure_reason`, + ARRAY( + SELECT + STRUCT(addresses_sync_v2_failure_reason.key, addresses_sync_v2_failure_reason.value) + FROM + UNNEST( + metrics.labeled_string.addresses_sync_v2_failure_reason + ) AS `addresses_sync_v2_failure_reason` + ) AS `addresses_sync_v2_failure_reason` + ) AS `labeled_string`, + STRUCT( + CAST(NULL AS STRING) AS `addresses_sync_uid`, + CAST(NULL AS STRING) AS `addresses_sync_v2_uid`, + CAST(NULL AS STRING) AS `glean_client_annotation_experimentation_id` + ) AS `string` + ) AS `metrics`, normalized_app_name, normalized_country_code, normalized_os, @@ -101,7 +461,97 @@ document_id, events, metadata, - metrics, + STRUCT( + STRUCT( + CAST(NULL AS INTEGER) AS `addresses_sync_outgoing_batches`, + CAST(NULL AS INTEGER) AS `addresses_sync_v2_outgoing_batches` + ) AS `counter`, + STRUCT( + CAST(NULL AS TIMESTAMP) AS `addresses_sync_finished_at`, + CAST(NULL AS STRING) AS `raw_addresses_sync_finished_at`, + CAST(NULL AS TIMESTAMP) AS `addresses_sync_started_at`, + CAST(NULL AS STRING) AS `raw_addresses_sync_started_at`, + CAST(NULL AS TIMESTAMP) AS `addresses_sync_v2_finished_at`, + CAST(NULL AS STRING) AS `raw_addresses_sync_v2_finished_at`, + CAST(NULL AS TIMESTAMP) AS `addresses_sync_v2_started_at`, + CAST(NULL AS STRING) AS `raw_addresses_sync_v2_started_at` + ) AS `datetime`, + STRUCT( + ARRAY( + SELECT + STRUCT(addresses_sync_incoming.key, addresses_sync_incoming.value) + FROM + UNNEST(metrics.labeled_counter.addresses_sync_incoming) AS `addresses_sync_incoming` + ) AS `addresses_sync_incoming`, + ARRAY( + SELECT + STRUCT(addresses_sync_outgoing.key, addresses_sync_outgoing.value) + FROM + UNNEST(metrics.labeled_counter.addresses_sync_outgoing) AS `addresses_sync_outgoing` + ) AS `addresses_sync_outgoing`, + ARRAY( + SELECT + STRUCT(glean_error_invalid_label.key, glean_error_invalid_label.value) + FROM + UNNEST(metrics.labeled_counter.glean_error_invalid_label) AS `glean_error_invalid_label` + ) AS `glean_error_invalid_label`, + ARRAY( + SELECT + STRUCT(glean_error_invalid_overflow.key, glean_error_invalid_overflow.value) + FROM + UNNEST( + metrics.labeled_counter.glean_error_invalid_overflow + ) AS `glean_error_invalid_overflow` + ) AS `glean_error_invalid_overflow`, + ARRAY( + SELECT + STRUCT(glean_error_invalid_state.key, glean_error_invalid_state.value) + FROM + UNNEST(metrics.labeled_counter.glean_error_invalid_state) AS `glean_error_invalid_state` + ) AS `glean_error_invalid_state`, + ARRAY( + SELECT + STRUCT(glean_error_invalid_value.key, glean_error_invalid_value.value) + FROM + UNNEST(metrics.labeled_counter.glean_error_invalid_value) AS `glean_error_invalid_value` + ) AS `glean_error_invalid_value`, + ARRAY( + SELECT + STRUCT(addresses_sync_v2_incoming.key, addresses_sync_v2_incoming.value) + FROM + UNNEST(metrics.labeled_counter.addresses_sync_v2_incoming) AS `addresses_sync_v2_incoming` + ) AS `addresses_sync_v2_incoming`, + ARRAY( + SELECT + STRUCT(addresses_sync_v2_outgoing.key, addresses_sync_v2_outgoing.value) + FROM + UNNEST(metrics.labeled_counter.addresses_sync_v2_outgoing) AS `addresses_sync_v2_outgoing` + ) AS `addresses_sync_v2_outgoing` + ) AS `labeled_counter`, + STRUCT( + ARRAY( + SELECT + STRUCT(addresses_sync_failure_reason.key, addresses_sync_failure_reason.value) + FROM + UNNEST( + metrics.labeled_string.addresses_sync_failure_reason + ) AS `addresses_sync_failure_reason` + ) AS `addresses_sync_failure_reason`, + ARRAY( + SELECT + STRUCT(addresses_sync_v2_failure_reason.key, addresses_sync_v2_failure_reason.value) + FROM + UNNEST( + metrics.labeled_string.addresses_sync_v2_failure_reason + ) AS `addresses_sync_v2_failure_reason` + ) AS `addresses_sync_v2_failure_reason` + ) AS `labeled_string`, + STRUCT( + CAST(NULL AS STRING) AS `addresses_sync_uid`, + CAST(NULL AS STRING) AS `addresses_sync_v2_uid`, + CAST(NULL AS STRING) AS `glean_client_annotation_experimentation_id` + ) AS `string` + ) AS `metrics`, normalized_app_name, normalized_country_code, normalized_os, diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/fenix/baseline/view.sql /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/fenix/baseline/view.sql --- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/fenix/baseline/view.sql 2024-06-18 16:28:40.000000000 +0000 +++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/fenix/baseline/view.sql 2024-06-18 16:32:41.000000000 +0000 @@ -13,7 +13,90 @@ document_id, events, metadata, - metrics, + STRUCT( + STRUCT( + CAST(NULL AS INTEGER) AS `events_total_uri_count`, + CAST(NULL AS INTEGER) AS `glean_validation_metrics_ping_count`, + CAST(NULL AS INTEGER) AS `events_normal_and_private_uri_count` + ) AS `counter`, + STRUCT( + ARRAY( + SELECT + STRUCT(glean_error_invalid_label.key, glean_error_invalid_label.value) + FROM + UNNEST(metrics.labeled_counter.glean_error_invalid_label) AS `glean_error_invalid_label` + ) AS `glean_error_invalid_label`, + ARRAY( + SELECT + STRUCT(glean_error_invalid_overflow.key, glean_error_invalid_overflow.value) + FROM + UNNEST( + metrics.labeled_counter.glean_error_invalid_overflow + ) AS `glean_error_invalid_overflow` + ) AS `glean_error_invalid_overflow`, + ARRAY( + SELECT + STRUCT(glean_error_invalid_state.key, glean_error_invalid_state.value) + FROM + UNNEST(metrics.labeled_counter.glean_error_invalid_state) AS `glean_error_invalid_state` + ) AS `glean_error_invalid_state`, + ARRAY( + SELECT + STRUCT(glean_error_invalid_value.key, glean_error_invalid_value.value) + FROM + UNNEST(metrics.labeled_counter.glean_error_invalid_value) AS `glean_error_invalid_value` + ) AS `glean_error_invalid_value`, + ARRAY( + SELECT + STRUCT(metrics_search_count.key, metrics_search_count.value) + FROM + UNNEST(metrics.labeled_counter.metrics_search_count) AS `metrics_search_count` + ) AS `metrics_search_count`, + ARRAY( + SELECT + STRUCT(browser_search_ad_clicks.key, browser_search_ad_clicks.value) + FROM + UNNEST(metrics.labeled_counter.browser_search_ad_clicks) AS `browser_search_ad_clicks` + ) AS `browser_search_ad_clicks`, + ARRAY( + SELECT + STRUCT(browser_search_in_content.key, browser_search_in_content.value) + FROM + UNNEST(metrics.labeled_counter.browser_search_in_content) AS `browser_search_in_content` + ) AS `browser_search_in_content`, + ARRAY( + SELECT + STRUCT(browser_search_with_ads.key, browser_search_with_ads.value) + FROM + UNNEST(metrics.labeled_counter.browser_search_with_ads) AS `browser_search_with_ads` + ) AS `browser_search_with_ads`, + ARRAY( + SELECT + STRUCT(glean_validation_pings_submitted.key, glean_validation_pings_submitted.value) + FROM + UNNEST( + metrics.labeled_counter.glean_validation_pings_submitted + ) AS `glean_validation_pings_submitted` + ) AS `glean_validation_pings_submitted` + ) AS `labeled_counter`, + STRUCT( + CAST(NULL AS STRING) AS `glean_baseline_locale`, + CAST(NULL AS STRING) AS `search_default_engine_code`, + CAST(NULL AS STRING) AS `search_default_engine_name`, + CAST(NULL AS STRING) AS `metrics_distribution_id`, + CAST(NULL AS STRING) AS `glean_client_annotation_experimentation_id` + ) AS `string`, + STRUCT( + STRUCT( + CAST(NULL AS STRING) AS `time_unit`, + CAST(NULL AS INTEGER) AS `value` + ) AS `glean_baseline_duration` + ) AS `timespan`, + STRUCT( + CAST(NULL AS TIMESTAMP) AS `glean_validation_first_run_hour`, + CAST(NULL AS STRING) AS `raw_glean_validation_first_run_hour` + ) AS `datetime` + ) AS `metrics`, normalized_app_name, normalized_country_code, normalized_os, @@ -35,7 +118,90 @@ document_id, events, metadata, - metrics, + STRUCT( + STRUCT( + CAST(NULL AS INTEGER) AS `events_total_uri_count`, + CAST(NULL AS INTEGER) AS `glean_validation_metrics_ping_count`, + CAST(NULL AS INTEGER) AS `events_normal_and_private_uri_count` + ) AS `counter`, + STRUCT( + ARRAY( + SELECT + STRUCT(glean_error_invalid_label.key, glean_error_invalid_label.value) + FROM + UNNEST(metrics.labeled_counter.glean_error_invalid_label) AS `glean_error_invalid_label` + ) AS `glean_error_invalid_label`, + ARRAY( + SELECT + STRUCT(glean_error_invalid_overflow.key, glean_error_invalid_overflow.value) + FROM + UNNEST( + metrics.labeled_counter.glean_error_invalid_overflow + ) AS `glean_error_invalid_overflow` + ) AS `glean_error_invalid_overflow`, + ARRAY( + SELECT + STRUCT(glean_error_invalid_state.key, glean_error_invalid_state.value) + FROM + UNNEST(metrics.labeled_counter.glean_error_invalid_state) AS `glean_error_invalid_state` + ) AS `glean_error_invalid_state`, + ARRAY( + SELECT + STRUCT(glean_error_invalid_value.key, glean_error_invalid_value.value) + FROM + UNNEST(metrics.labeled_counter.glean_error_invalid_value) AS `glean_error_invalid_value` + ) AS `glean_error_invalid_value`, + ARRAY( + SELECT + STRUCT(metrics_search_count.key, metrics_search_count.value) + FROM + UNNEST(metrics.labeled_counter.metrics_search_count) AS `metrics_search_count` + ) AS `metrics_search_count`, + ARRAY( + SELECT + STRUCT(browser_search_ad_clicks.key, browser_search_ad_clicks.value) + FROM + UNNEST(metrics.labeled_counter.browser_search_ad_clicks) AS `browser_search_ad_clicks` + ) AS `browser_search_ad_clicks`, + ARRAY( + SELECT + STRUCT(browser_search_in_content.key, browser_search_in_content.value) + FROM + UNNEST(metrics.labeled_counter.browser_search_in_content) AS `browser_search_in_content` + ) AS `browser_search_in_content`, + ARRAY( + SELECT + STRUCT(browser_search_with_ads.key, browser_search_with_ads.value) + FROM + UNNEST(metrics.labeled_counter.browser_search_with_ads) AS `browser_search_with_ads` + ) AS `browser_search_with_ads`, + ARRAY( + SELECT + STRUCT(glean_validation_pings_submitted.key, glean_validation_pings_submitted.value) + FROM + UNNEST( + metrics.labeled_counter.glean_validation_pings_submitted + ) AS `glean_validation_pings_submitted` + ) AS `glean_validation_pings_submitted` + ) AS `labeled_counter`, + STRUCT( + CAST(NULL AS STRING) AS `glean_baseline_locale`, + CAST(NULL AS STRING) AS `search_default_engine_code`, + CAST(NULL AS STRING) AS `search_default_engine_name`, + CAST(NULL AS STRING) AS `metrics_distribution_id`, + CAST(NULL AS STRING) AS `glean_client_annotation_experimentation_id` + ) AS `string`, + STRUCT( + STRUCT( + CAST(NULL AS STRING) AS `time_unit`, + CAST(NULL AS INTEGER) AS `value` + ) AS `glean_baseline_duration` + ) AS `timespan`, + STRUCT( + CAST(NULL AS TIMESTAMP) AS `glean_validation_first_run_hour`, + CAST(NULL AS STRING) AS `raw_glean_validation_first_run_hour` + ) AS `datetime` + ) AS `metrics`, normalized_app_name, normalized_country_code, normalized_os, @@ -76,21 +242,88 @@ events, metadata, STRUCT( - metrics.counter, STRUCT( - metrics.labeled_counter.glean_error_invalid_label, - metrics.labeled_counter.glean_error_invalid_overflow, - metrics.labeled_counter.glean_error_invalid_state, - metrics.labeled_counter.glean_error_invalid_value, - metrics.labeled_counter.metrics_search_count, - metrics.labeled_counter.browser_search_ad_clicks, - metrics.labeled_counter.browser_search_in_content, - metrics.labeled_counter.browser_search_with_ads, + CAST(NULL AS INTEGER) AS `events_total_uri_count`, + CAST(NULL AS INTEGER) AS `glean_validation_metrics_ping_count`, + CAST(NULL AS INTEGER) AS `events_normal_and_private_uri_count` + ) AS `counter`, + STRUCT( + ARRAY( + SELECT + STRUCT(glean_error_invalid_label.key, glean_error_invalid_label.value) + FROM + UNNEST(metrics.labeled_counter.glean_error_invalid_label) AS `glean_error_invalid_label` + ) AS `glean_error_invalid_label`, + ARRAY( + SELECT + STRUCT(glean_error_invalid_overflow.key, glean_error_invalid_overflow.value) + FROM + UNNEST( + metrics.labeled_counter.glean_error_invalid_overflow + ) AS `glean_error_invalid_overflow` + ) AS `glean_error_invalid_overflow`, + ARRAY( + SELECT + STRUCT(glean_error_invalid_state.key, glean_error_invalid_state.value) + FROM + UNNEST(metrics.labeled_counter.glean_error_invalid_state) AS `glean_error_invalid_state` + ) AS `glean_error_invalid_state`, + ARRAY( + SELECT + STRUCT(glean_error_invalid_value.key, glean_error_invalid_value.value) + FROM + UNNEST(metrics.labeled_counter.glean_error_invalid_value) AS `glean_error_invalid_value` + ) AS `glean_error_invalid_value`, + ARRAY( + SELECT + STRUCT(metrics_search_count.key, metrics_search_count.value) + FROM + UNNEST(metrics.labeled_counter.metrics_search_count) AS `metrics_search_count` + ) AS `metrics_search_count`, + ARRAY( + SELECT + STRUCT(browser_search_ad_clicks.key, browser_search_ad_clicks.value) + FROM + UNNEST(metrics.labeled_counter.browser_search_ad_clicks) AS `browser_search_ad_clicks` + ) AS `browser_search_ad_clicks`, + ARRAY( + SELECT + STRUCT(browser_search_in_content.key, browser_search_in_content.value) + FROM + UNNEST(metrics.labeled_counter.browser_search_in_content) AS `browser_search_in_content` + ) AS `browser_search_in_content`, + ARRAY( + SELECT + STRUCT(browser_search_with_ads.key, browser_search_with_ads.value) + FROM + UNNEST(metrics.labeled_counter.browser_search_with_ads) AS `browser_search_with_ads` + ) AS `browser_search_with_ads`, + ARRAY( + SELECT + STRUCT(glean_validation_pings_submitted.key, glean_validation_pings_submitted.value) + FROM + UNNEST( metrics.labeled_counter.glean_validation_pings_submitted + ) AS `glean_validation_pings_submitted` + ) AS `glean_validation_pings_submitted` ) AS `labeled_counter`, - metrics.string, - metrics.timespan, - metrics.datetime + STRUCT( + CAST(NULL AS STRING) AS `glean_baseline_locale`, + CAST(NULL AS STRING) AS `search_default_engine_code`, + CAST(NULL AS STRING) AS `search_default_engine_name`, + CAST(NULL AS STRING) AS `metrics_distribution_id`, + CAST(NULL AS STRING) AS `glean_client_annotation_experimentation_id` + ) AS `string`, + STRUCT( + STRUCT( + CAST(NULL AS STRING) AS `time_unit`, + CAST(NULL AS INTEGER) AS `value` + ) AS `glean_baseline_duration` + ) AS `timespan`, + STRUCT( + CAST(NULL AS TIMESTAMP) AS `glean_validation_first_run_hour`, + CAST(NULL AS STRING) AS `raw_glean_validation_first_run_hour` + ) AS `datetime` ) AS `metrics`, normalized_app_name, normalized_country_code, @@ -141,21 +374,88 @@ events, metadata, STRUCT( - metrics.counter, STRUCT( - metrics.labeled_counter.glean_error_invalid_label, - metrics.labeled_counter.glean_error_invalid_overflow, - metrics.labeled_counter.glean_error_invalid_state, - metrics.labeled_counter.glean_error_invalid_value, - metrics.labeled_counter.metrics_search_count, - metrics.labeled_counter.browser_search_ad_clicks, - metrics.labeled_counter.browser_search_in_content, - metrics.labeled_counter.browser_search_with_ads, + CAST(NULL AS INTEGER) AS `events_total_uri_count`, + CAST(NULL AS INTEGER) AS `glean_validation_metrics_ping_count`, + CAST(NULL AS INTEGER) AS `events_normal_and_private_uri_count` + ) AS `counter`, + STRUCT( + ARRAY( + SELECT + STRUCT(glean_error_invalid_label.key, glean_error_invalid_label.value) + FROM + UNNEST(metrics.labeled_counter.glean_error_invalid_label) AS `glean_error_invalid_label` + ) AS `glean_error_invalid_label`, + ARRAY( + SELECT + STRUCT(glean_error_invalid_overflow.key, glean_error_invalid_overflow.value) + FROM + UNNEST( + metrics.labeled_counter.glean_error_invalid_overflow + ) AS `glean_error_invalid_overflow` + ) AS `glean_error_invalid_overflow`, + ARRAY( + SELECT + STRUCT(glean_error_invalid_state.key, glean_error_invalid_state.value) + FROM + UNNEST(metrics.labeled_counter.glean_error_invalid_state) AS `glean_error_invalid_state` + ) AS `glean_error_invalid_state`, + ARRAY( + SELECT + STRUCT(glean_error_invalid_value.key, glean_error_invalid_value.value) + FROM + UNNEST(metrics.labeled_counter.glean_error_invalid_value) AS `glean_error_invalid_value` + ) AS `glean_error_invalid_value`, + ARRAY( + SELECT + STRUCT(metrics_search_count.key, metrics_search_count.value) + FROM + UNNEST(metrics.labeled_counter.metrics_search_count) AS `metrics_search_count` + ) AS `metrics_search_count`, + ARRAY( + SELECT + STRUCT(browser_search_ad_clicks.key, browser_search_ad_clicks.value) + FROM + UNNEST(metrics.labeled_counter.browser_search_ad_clicks) AS `browser_search_ad_clicks` + ) AS `browser_search_ad_clicks`, + ARRAY( + SELECT + STRUCT(browser_search_in_content.key, browser_search_in_content.value) + FROM + UNNEST(metrics.labeled_counter.browser_search_in_content) AS `browser_search_in_content` + ) AS `browser_search_in_content`, + ARRAY( + SELECT + STRUCT(browser_search_with_ads.key, browser_search_with_ads.value) + FROM + UNNEST(metrics.labeled_counter.browser_search_with_ads) AS `browser_search_with_ads` + ) AS `browser_search_with_ads`, + ARRAY( + SELECT + STRUCT(glean_validation_pings_submitted.key, glean_validation_pings_submitted.value) + FROM + UNNEST( metrics.labeled_counter.glean_validation_pings_submitted + ) AS `glean_validation_pings_submitted` + ) AS `glean_validation_pings_submitted` ) AS `labeled_counter`, - metrics.string, - metrics.timespan, - metrics.datetime + STRUCT( + CAST(NULL AS STRING) AS `glean_baseline_locale`, + CAST(NULL AS STRING) AS `search_default_engine_code`, + CAST(NULL AS STRING) AS `search_default_engine_name`, + CAST(NULL AS STRING) AS `metrics_distribution_id`, + CAST(NULL AS STRING) AS `glean_client_annotation_experimentation_id` + ) AS `string`, + STRUCT( + STRUCT( + CAST(NULL AS STRING) AS `time_unit`, + CAST(NULL AS INTEGER) AS `value` + ) AS `glean_baseline_duration` + ) AS `timespan`, + STRUCT( + CAST(NULL AS TIMESTAMP) AS `glean_validation_first_run_hour`, + CAST(NULL AS STRING) AS `raw_glean_validation_first_run_hour` + ) AS `datetime` ) AS `metrics`, normalized_app_name, normalized_country_code, @@ -187,7 +487,90 @@ document_id, events, metadata, - metrics, + STRUCT( + STRUCT( + CAST(NULL AS INTEGER) AS `events_total_uri_count`, + CAST(NULL AS INTEGER) AS `glean_validation_metrics_ping_count`, + CAST(NULL AS INTEGER) AS `events_normal_and_private_uri_count` + ) AS `counter`, + STRUCT( + ARRAY( + SELECT + STRUCT(glean_error_invalid_label.key, glean_error_invalid_label.value) + FROM + UNNEST(metrics.labeled_counter.glean_error_invalid_label) AS `glean_error_invalid_label` + ) AS `glean_error_invalid_label`, + ARRAY( + SELECT + STRUCT(glean_error_invalid_overflow.key, glean_error_invalid_overflow.value) + FROM + UNNEST( + metrics.labeled_counter.glean_error_invalid_overflow + ) AS `glean_error_invalid_overflow` + ) AS `glean_error_invalid_overflow`, + ARRAY( + SELECT + STRUCT(glean_error_invalid_state.key, glean_error_invalid_state.value) + FROM + UNNEST(metrics.labeled_counter.glean_error_invalid_state) AS `glean_error_invalid_state` + ) AS `glean_error_invalid_state`, + ARRAY( + SELECT + STRUCT(glean_error_invalid_value.key, glean_error_invalid_value.value) + FROM + UNNEST(metrics.labeled_counter.glean_error_invalid_value) AS `glean_error_invalid_value` + ) AS `glean_error_invalid_value`, + ARRAY( + SELECT + STRUCT(metrics_search_count.key, metrics_search_count.value) + FROM + UNNEST(metrics.labeled_counter.metrics_search_count) AS `metrics_search_count` + ) AS `metrics_search_count`, + ARRAY( + SELECT + STRUCT(browser_search_ad_clicks.key, browser_search_ad_clicks.value) + FROM + UNNEST(metrics.labeled_counter.browser_search_ad_clicks) AS `browser_search_ad_clicks` + ) AS `browser_search_ad_clicks`, + ARRAY( + SELECT + STRUCT(browser_search_in_content.key, browser_search_in_content.value) + FROM + UNNEST(metrics.labeled_counter.browser_search_in_content) AS `browser_search_in_content` + ) AS `browser_search_in_content`, + ARRAY( + SELECT + STRUCT(browser_search_with_ads.key, browser_search_with_ads.value) + FROM + UNNEST(metrics.labeled_counter.browser_search_with_ads) AS `browser_search_with_ads` + ) AS `browser_search_with_ads`, + ARRAY( + SELECT + STRUCT(glean_validation_pings_submitted.key, glean_validation_pings_submitted.value) + FROM + UNNEST( + metrics.labeled_counter.glean_validation_pings_submitted + ) AS `glean_validation_pings_submitted` + ) AS `glean_validation_pings_submitted` + ) AS `labeled_counter`, + STRUCT( + CAST(NULL AS STRING) AS `glean_baseline_locale`, + CAST(NULL AS STRING) AS `search_default_engine_code`, + CAST(NULL AS STRING) AS `search_default_engine_name`, + CAST(NULL AS STRING) AS `metrics_distribution_id`, + CAST(NULL AS STRING) AS `glean_client_annotation_experimentation_id` + ) AS `string`, + STRUCT( + STRUCT( + CAST(NULL AS STRING) AS `time_unit`, + CAST(NULL AS INTEGER) AS `value` + ) AS `glean_baseline_duration` + ) AS `timespan`, + STRUCT( + CAST(NULL AS TIMESTAMP) AS `glean_validation_first_run_hour`, + CAST(NULL AS STRING) AS `raw_glean_validation_first_run_hour` + ) AS `datetime` + ) AS `metrics`, normalized_app_name, normalized_country_code, normalized_os, diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/fenix/bookmarks_sync/view.sql /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/fenix/bookmarks_sync/view.sql --- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/fenix/bookmarks_sync/view.sql 2024-06-18 16:28:40.000000000 +0000 +++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/fenix/bookmarks_sync/view.sql 2024-06-18 16:34:19.000000000 +0000 @@ -13,7 +13,120 @@ document_id, events, metadata, - metrics, + STRUCT( + STRUCT( + CAST(NULL AS INTEGER) AS `bookmarks_sync_outgoing_batches`, + CAST(NULL AS INTEGER) AS `bookmarks_sync_v2_outgoing_batches` + ) AS `counter`, + STRUCT( + CAST(NULL AS TIMESTAMP) AS `bookmarks_sync_finished_at`, + CAST(NULL AS STRING) AS `raw_bookmarks_sync_finished_at`, + CAST(NULL AS TIMESTAMP) AS `bookmarks_sync_started_at`, + CAST(NULL AS STRING) AS `raw_bookmarks_sync_started_at`, + CAST(NULL AS TIMESTAMP) AS `bookmarks_sync_v2_finished_at`, + CAST(NULL AS STRING) AS `raw_bookmarks_sync_v2_finished_at`, + CAST(NULL AS TIMESTAMP) AS `bookmarks_sync_v2_started_at`, + CAST(NULL AS STRING) AS `raw_bookmarks_sync_v2_started_at` + ) AS `datetime`, + STRUCT( + ARRAY( + SELECT + STRUCT(bookmarks_sync_incoming.key, bookmarks_sync_incoming.value) + FROM + UNNEST(metrics.labeled_counter.bookmarks_sync_incoming) AS `bookmarks_sync_incoming` + ) AS `bookmarks_sync_incoming`, + ARRAY( + SELECT + STRUCT(bookmarks_sync_outgoing.key, bookmarks_sync_outgoing.value) + FROM + UNNEST(metrics.labeled_counter.bookmarks_sync_outgoing) AS `bookmarks_sync_outgoing` + ) AS `bookmarks_sync_outgoing`, + ARRAY( + SELECT + STRUCT(bookmarks_sync_remote_tree_problems.key, bookmarks_sync_remote_tree_problems.value) + FROM + UNNEST( + metrics.labeled_counter.bookmarks_sync_remote_tree_problems + ) AS `bookmarks_sync_remote_tree_problems` + ) AS `bookmarks_sync_remote_tree_problems`, + ARRAY( + SELECT + STRUCT(glean_error_invalid_label.key, glean_error_invalid_label.value) + FROM + UNNEST(metrics.labeled_counter.glean_error_invalid_label) AS `glean_error_invalid_label` + ) AS `glean_error_invalid_label`, + ARRAY( + SELECT + STRUCT(glean_error_invalid_overflow.key, glean_error_invalid_over ```⚠️ Only part of the diff is displayed.
sean-rose
BenWu
To try to avoid problems when the underlying table/view schemas change due to new metrics being added.
Checklist for reviewer:
<username>:<branch>of the fork as parameter. The parameter will also show up in the logs of themanual-trigger-required-for-forkCI task together with more detailed instructions.For modifications to schemas in restricted namespaces (see
CODEOWNERS):┆Issue is synchronized with this Jira Task