fix: Make column query order match schema order for clients_last_seen_v2 #5603

kwindau · 2024-05-16T19:32:41Z

Checklist for reviewer:

Commits should reference a bug or github issue, if relevant (if a bug is referenced, the pull request should include the bug number in the title).
If the PR comes from a fork, trigger integration CI tests by running the Push to upstream workflow and provide the <username>:<branch> of the fork as parameter. The parameter will also show up
in the logs of the manual-trigger-required-for-fork CI task together with more detailed instructions.
If adding a new field to a query, ensure that the schema and dependent downstream schemas have been updated.
When adding a new derived dataset, ensure that data is not available already (fully or partially) and recommend extending an existing dataset in favor of creating new ones. Data can be available in the bigquery-etl repository, looker-hub or in looker-spoke-default.

For modifications to schemas in restricted namespaces (see CODEOWNERS):

Follow the change control procedure

┆Issue is synchronized with this Jira Task

dataops-ci-bot · 2024-05-20T13:16:20Z

Integration report for "add desc"

`sql.diff`

Click to expand!

diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/telemetry_derived/clients_last_seen_v2/query.sql /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/telemetry_derived/clients_last_seen_v2/query.sql
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/telemetry_derived/clients_last_seen_v2/query.sql	2024-05-20 13:10:23.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/telemetry_derived/clients_last_seen_v2/query.sql	2024-05-20 13:10:22.000000000 +0000
@@ -108,9 +108,9 @@
     submission_date = DATE_SUB(@submission_date, INTERVAL 1 DAY)
     -- Filter out rows from yesterday that have now fallen outside the 28-day window.
     AND udf.shift_28_bits_one_day(days_seen_bits) > 0
-)
---
-SELECT
+),
+staging AS (
+  SELECT
   @submission_date AS submission_date,
   IF(cfs.first_seen_date > @submission_date, NULL, cfs.first_seen_date) AS first_seen_date,
   IF(cfs.second_seen_date > @submission_date, NULL, cfs.second_seen_date) AS second_seen_date,
@@ -164,11 +164,418 @@
       _current.days_seen_in_experiment
     ) AS days_seen_in_experiment
   )
-FROM
+  FROM
   _current
-FULL JOIN
+  FULL JOIN
   _previous
   USING (client_id)
-LEFT JOIN
+  LEFT JOIN
   clients_first_seen_v2 AS cfs
   USING (client_id)
+)
+SELECT
+  submission_date,
+  first_seen_date,
+  second_seen_date,
+  days_seen_bits,
+  days_visited_1_uri_bits,
+  days_visited_5_uri_bits,
+  days_visited_10_uri_bits,
+  days_had_8_active_ticks_bits,
+  days_opened_dev_tools_bits,
+  days_interacted_bits,
+  days_visited_1_uri_normal_mode_bits,
+  days_visited_1_uri_private_mode_bits,
+  days_created_profile_bits,
+  days_seen_in_experiment,
+  client_id,
+  aborts_content_sum,
+  aborts_gmplugin_sum,
+  aborts_plugin_sum,
+  active_addons_count_mean,
+  active_addons,
+  active_experiment_branch,
+  active_experiment_id,
+  active_hours_sum,
+  addon_compatibility_check_enabled,
+  app_build_id,
+  app_display_version,
+  app_name,
+  app_version,
+  attribution,
+  blocklist_enabled,
+  channel,
+  client_clock_skew_mean,
+  client_submission_latency_mean,
+  cpu_cores,
+  cpu_count,
+  cpu_family,
+  cpu_l2_cache_kb,
+  cpu_l3_cache_kb,
+  cpu_model,
+  cpu_speed_mhz,
+  cpu_stepping,
+  cpu_vendor,
+  crashes_detected_content_sum,
+  crashes_detected_gmplugin_sum,
+  crashes_detected_plugin_sum,
+  crash_submit_attempt_content_sum,
+  crash_submit_attempt_main_sum,
+  crash_submit_attempt_plugin_sum,
+  crash_submit_success_content_sum,
+  crash_submit_success_main_sum,
+  crash_submit_success_plugin_sum,
+  default_search_engine,
+  default_search_engine_data_load_path,
+  default_search_engine_data_name,
+  default_search_engine_data_origin,
+  default_search_engine_data_submission_url,
+  devtools_toolbox_opened_count_sum,
+  distribution_id,
+  e10s_enabled,
+  env_build_arch,
+  env_build_id,
+  env_build_version,
+  environment_settings_intl_accept_languages,
+  environment_settings_intl_app_locales,
+  environment_settings_intl_available_locales,
+  environment_settings_intl_requested_locales,
+  environment_settings_intl_system_locales,
+  environment_settings_intl_regional_prefs_locales,
+  experiments,
+  first_paint_mean,
+  flash_version,
+  country,
+  city,
+  geo_subdivision1,
+  geo_subdivision2,
+  isp_name,
+  isp_organization,
+  gfx_features_advanced_layers_status,
+  gfx_features_d2d_status,
+  gfx_features_d3d11_status,
+  gfx_features_gpu_process_status,
+  histogram_parent_devtools_aboutdebugging_opened_count_sum,
+  histogram_parent_devtools_animationinspector_opened_count_sum,
+  histogram_parent_devtools_browserconsole_opened_count_sum,
+  histogram_parent_devtools_canvasdebugger_opened_count_sum,
+  histogram_parent_devtools_computedview_opened_count_sum,
+  histogram_parent_devtools_custom_opened_count_sum,
+  histogram_parent_devtools_developertoolbar_opened_count_sum,
+  histogram_parent_devtools_dom_opened_count_sum,
+  histogram_parent_devtools_eyedropper_opened_count_sum,
+  histogram_parent_devtools_fontinspector_opened_count_sum,
+  histogram_parent_devtools_inspector_opened_count_sum,
+  histogram_parent_devtools_jsbrowserdebugger_opened_count_sum,
+  histogram_parent_devtools_jsdebugger_opened_count_sum,
+  histogram_parent_devtools_jsprofiler_opened_count_sum,
+  histogram_parent_devtools_layoutview_opened_count_sum,
+  histogram_parent_devtools_memory_opened_count_sum,
+  histogram_parent_devtools_menu_eyedropper_opened_count_sum,
+  histogram_parent_devtools_netmonitor_opened_count_sum,
+  histogram_parent_devtools_options_opened_count_sum,
+  histogram_parent_devtools_paintflashing_opened_count_sum,
+  histogram_parent_devtools_picker_eyedropper_opened_count_sum,
+  histogram_parent_devtools_responsive_opened_count_sum,
+  histogram_parent_devtools_ruleview_opened_count_sum,
+  histogram_parent_devtools_scratchpad_opened_count_sum,
+  histogram_parent_devtools_scratchpad_window_opened_count_sum,
+  histogram_parent_devtools_shadereditor_opened_count_sum,
+  histogram_parent_devtools_storage_opened_count_sum,
+  histogram_parent_devtools_styleeditor_opened_count_sum,
+  histogram_parent_devtools_webaudioeditor_opened_count_sum,
+  histogram_parent_devtools_webconsole_opened_count_sum,
+  histogram_parent_devtools_webide_opened_count_sum,
+  install_year,
+  is_default_browser,
+  is_wow64,
+  locale,
+  memory_mb,
+  normalized_channel,
+  normalized_os_version,
+  os,
+  os_service_pack_major,
+  os_service_pack_minor,
+  os_version,
+  pings_aggregated_by_this_row,
+  places_bookmarks_count_mean,
+  places_pages_count_mean,
+  plugin_hangs_sum,
+  plugins_infobar_allow_sum,
+  plugins_infobar_block_sum,
+  plugins_infobar_shown_sum,
+  plugins_notification_shown_sum,
+  previous_build_id,
+  profile_age_in_days,
+  profile_creation_date,
+  push_api_notify_sum,
+  sample_id,
+  sandbox_effective_content_process_level,
+  scalar_combined_webrtc_nicer_stun_retransmits_sum,
+  scalar_combined_webrtc_nicer_turn_401s_sum,
+  scalar_combined_webrtc_nicer_turn_403s_sum,
+  scalar_combined_webrtc_nicer_turn_438s_sum,
+  scalar_content_navigator_storage_estimate_count_sum,
+  scalar_content_navigator_storage_persist_count_sum,
+  scalar_parent_aushelper_websense_reg_version,
+  scalar_parent_browser_engagement_max_concurrent_tab_count_max,
+  scalar_parent_browser_engagement_max_concurrent_window_count_max,
+  scalar_parent_browser_engagement_tab_open_event_count_sum,
+  scalar_parent_browser_engagement_total_uri_count_sum,
+  scalar_parent_browser_engagement_unfiltered_uri_count_sum,
+  scalar_parent_browser_engagement_unique_domains_count_max,
+  scalar_parent_browser_engagement_unique_domains_count_mean,
+  scalar_parent_browser_engagement_window_open_event_count_sum,
+  scalar_parent_devtools_accessibility_node_inspected_count_sum,
+  scalar_parent_devtools_accessibility_opened_count_sum,
+  scalar_parent_devtools_accessibility_picker_used_count_sum,
+  scalar_parent_devtools_accessibility_select_accessible_for_node_sum,
+  scalar_parent_devtools_accessibility_service_enabled_count_sum,
+  scalar_parent_devtools_copy_full_css_selector_opened_sum,
+  scalar_parent_devtools_copy_unique_css_selector_opened_sum,
+  scalar_parent_devtools_toolbar_eyedropper_opened_sum,
+  scalar_parent_dom_contentprocess_troubled_due_to_memory_sum,
+  scalar_parent_navigator_storage_estimate_count_sum,
+  scalar_parent_navigator_storage_persist_count_sum,
+  scalar_parent_storage_sync_api_usage_extensions_using_sum,
+  search_cohort,
+  search_count_abouthome,
+  search_count_contextmenu,
+  search_count_newtab,
+  search_count_searchbar,
+  search_count_system,
+  search_count_urlbar,
+  search_count_all,
+  search_count_tagged_sap,
+  search_count_tagged_follow_on,
+  search_count_organic,
+  search_count_urlbar_handoff,
+  session_restored_mean,
+  sessions_started_on_this_day,
+  shutdown_kill_sum,
+  subsession_hours_sum,
+  ssl_handshake_result_failure_sum,
+  ssl_handshake_result_success_sum,
+  sync_configured,
+  sync_count_desktop_mean,
+  sync_count_mobile_mean,
+  sync_count_desktop_sum,
+  sync_count_mobile_sum,
+  telemetry_enabled,
+  timezone_offset,
+  total_hours_sum,
+  update_auto_download,
+  update_channel,
+  update_enabled,
+  vendor,
+  web_notification_shown_sum,
+  windows_build_number,
+  windows_ubr,
+  fxa_configured,
+  trackers_blocked_sum,
+  submission_timestamp_min,
+  ad_clicks_count_all,
+  search_with_ads_count_all,
+  scalar_parent_urlbar_impression_autofill_about_sum,
+  scalar_parent_urlbar_impression_autofill_adaptive_sum,
+  scalar_parent_urlbar_impression_autofill_origin_sum,
+  scalar_parent_urlbar_impression_autofill_other_sum,
+  scalar_parent_urlbar_impression_autofill_preloaded_sum,
+  scalar_parent_urlbar_impression_autofill_url_sum,
+  scalar_parent_telemetry_event_counts_sum,
+  scalar_content_telemetry_event_counts_sum,
+  scalar_parent_urlbar_searchmode_bookmarkmenu_sum,
+  scalar_parent_urlbar_searchmode_handoff_sum,
+  scalar_parent_urlbar_searchmode_keywordoffer_sum,
+  scalar_parent_urlbar_searchmode_oneoff_sum,
+  scalar_parent_urlbar_searchmode_other_sum,
+  scalar_parent_urlbar_searchmode_shortcut_sum,
+  scalar_parent_urlbar_searchmode_tabmenu_sum,
+  scalar_parent_urlbar_searchmode_tabtosearch_sum,
+  scalar_parent_urlbar_searchmode_tabtosearch_onboard_sum,
+  scalar_parent_urlbar_searchmode_topsites_newtab_sum,
+  scalar_parent_urlbar_searchmode_topsites_urlbar_sum,
+  scalar_parent_urlbar_searchmode_touchbar_sum,
+  scalar_parent_urlbar_searchmode_typed_sum,
+  scalar_parent_os_environment_is_taskbar_pinned,
+  scalar_parent_os_environment_launched_via_desktop,
+  scalar_parent_os_environment_launched_via_start_menu,
+  scalar_parent_os_environment_launched_via_taskbar,
+  scalar_parent_os_environment_launched_via_other_shortcut,
+  scalar_parent_os_environment_launched_via_other,
+  search_count_webextension,
+  search_count_alias,
+  search_count_urlbar_searchmode,
+  scalar_parent_browser_ui_interaction_preferences_pane_home_sum,
+  scalar_parent_urlbar_picked_autofill_sum,
+  scalar_parent_urlbar_picked_autofill_about_sum,
+  scalar_parent_urlbar_picked_autofill_adaptive_sum,
+  scalar_parent_urlbar_picked_autofill_origin_sum,
+  scalar_parent_urlbar_picked_autofill_other_sum,
+  scalar_parent_urlbar_picked_autofill_preloaded_sum,
+  scalar_parent_urlbar_picked_autofill_url_sum,
+  scalar_parent_urlbar_picked_bookmark_sum,
+  scalar_parent_urlbar_picked_dynamic_sum,
+  scalar_parent_urlbar_picked_extension_sum,
+  scalar_parent_urlbar_picked_formhistory_sum,
+  scalar_parent_urlbar_picked_history_sum,
+  scalar_parent_urlbar_picked_keyword_sum,
+  scalar_parent_urlbar_picked_remotetab_sum,
+  scalar_parent_urlbar_picked_searchengine_sum,
+  scalar_parent_urlbar_picked_searchsuggestion_sum,
+  scalar_parent_urlbar_picked_switchtab_sum,
+  scalar_parent_urlbar_picked_tabtosearch_sum,
+  scalar_parent_urlbar_picked_tip_sum,
+  scalar_parent_urlbar_picked_topsite_sum,
+  scalar_parent_urlbar_picked_unknown_sum,
+  scalar_parent_urlbar_picked_visiturl_sum,
+  default_private_search_engine,
+  default_private_search_engine_data_load_path,
+  default_private_search_engine_data_name,
+  default_private_search_engine_data_origin,
+  default_private_search_engine_data_submission_url,
+  search_counts,
+  user_pref_browser_search_region,
+  search_with_ads,
+  ad_clicks,
+  search_content_urlbar_sum,
+  search_content_urlbar_handoff_sum,
+  search_content_urlbar_searchmode_sum,
+  search_content_contextmenu_sum,
+  search_content_about_home_sum,
+  search_content_about_newtab_sum,
+  search_content_searchbar_sum,
+  search_content_system_sum,
+  search_content_webextension_sum,
+  search_content_tabhistory_sum,
+  search_content_reload_sum,
+  search_content_unknown_sum,
+  search_withads_urlbar_sum,
+  search_withads_urlbar_handoff_sum,
+  search_withads_urlbar_searchmode_sum,
+  search_withads_contextmenu_sum,
+  search_withads_about_home_sum,
+  search_withads_about_newtab_sum,
+  search_withads_searchbar_sum,
+  search_withads_system_sum,
+  search_withads_webextension_sum,
+  search_withads_tabhistory_sum,
+  search_withads_reload_sum,
+  search_withads_unknown_sum,
+  search_adclicks_urlbar_sum,
+  search_adclicks_urlbar_handoff_sum,
+  search_adclicks_urlbar_searchmode_sum,
+  search_adclicks_contextmenu_sum,
+  search_adclicks_about_home_sum,
+  search_adclicks_about_newtab_sum,
+  search_adclicks_searchbar_sum,
+  search_adclicks_system_sum,
+  search_adclicks_webextension_sum,
+  search_adclicks_tabhistory_sum,
+  search_adclicks_reload_sum,
+  search_adclicks_unknown_sum,
+  update_background,
+  user_pref_browser_search_suggest_enabled,
+  user_pref_browser_widget_in_navbar,
+  user_pref_browser_urlbar_suggest_searches,
+  user_pref_browser_urlbar_show_search_suggestions_first,
+  user_pref_browser_urlbar_suggest_quicksuggest,
+  user_pref_browser_urlbar_suggest_quicksuggest_sponsored,
+  user_pref_browser_urlbar_quicksuggest_onboarding_dialog_choice,
+  scalar_parent_browser_engagement_total_uri_count_normal_and_private_mode_sum,
+  user_pref_browser_newtabpage_enabled,
+  user_pref_app_shield_optoutstudies_enabled,
+  contextual_services_quicksuggest_click_sum,
+  contextual_services_quicksuggest_impression_sum,
+  contextual_services_quicksuggest_help_sum,
+  contextual_services_topsites_click_sum,
+  contextual_services_topsites_impression_sum,
+  user_pref_browser_urlbar_suggest_quicksuggest_nonsponsored,
+  user_pref_browser_urlbar_quicksuggest_data_collection_enabled,
+  scalar_a11y_hcm_foreground,
+  scalar_a11y_hcm_background,
+  a11y_theme,
+  contextual_services_quicksuggest_help_nonsponsored_bestmatch_sum,
+  contextual_services_quicksuggest_help_sponsored_bestmatch_sum,
+  contextual_services_quicksuggest_block_nonsponsored_sum,
+  contextual_services_quicksuggest_block_sponsored_sum,
+  contextual_services_quicksuggest_block_sponsored_bestmatch_sum,
+  contextual_services_quicksuggest_block_nonsponsored_bestmatch_sum,
+  contextual_services_quicksuggest_click_sponsored_bestmatch_sum,
+  contextual_services_quicksuggest_click_nonsponsored_bestmatch_sum,
+  contextual_services_quicksuggest_impression_sponsored_bestmatch_sum,
+  contextual_services_quicksuggest_impression_nonsponsored_bestmatch_sum,
+  user_pref_browser_urlbar_suggest_bestmatch,
+  scalar_parent_browser_ui_interaction_textrecognition_error_sum,
+  text_recognition_interaction_timing_sum,
+  text_recognition_interaction_timing_count_sum,
+  scalar_parent_browser_ui_interaction_content_context_sum,
+  text_recognition_api_performance_sum,
+  text_recognition_api_performance_count_sum,
+  text_recognition_text_length_sum,
+  text_recognition_text_length_count_sum,
+  scalar_parent_os_environment_launched_via_taskbar_private,
+  dom_parentprocess_private_window_used,
+  os_environment_is_taskbar_pinned_any,
+  os_environment_is_taskbar_pinned_private_any,
+  os_environment_is_taskbar_pinned_private,
+  bookmark_migrations_quantity_chrome,
+  bookmark_migrations_quantity_edge,
+  bookmark_migrations_quantity_safari,
+  bookmark_migrations_quantity_all,
+  history_migrations_quantity_chrome,
+  history_migrations_quantity_edge,
+  history_migrations_quantity_safari,
+  history_migrations_quantity_all,
+  logins_migrations_quantity_chrome,
+  logins_migrations_quantity_edge,
+  logins_migrations_quantity_safari,
+  logins_migrations_quantity_all,
+  search_count_urlbar_persisted,
+  search_content_urlbar_persisted_sum,
+  search_withads_urlbar_persisted_sum,
+  search_adclicks_urlbar_persisted_sum,
+  media_play_time_ms_audio_sum,
+  media_play_time_ms_video_sum,
+  contextual_services_quicksuggest_block_dynamic_wikipedia_sum,
+  contextual_services_quicksuggest_block_weather_sum,
+  contextual_services_quicksuggest_click_dynamic_wikipedia_sum,
+  contextual_services_quicksuggest_click_nonsponsored_sum,
+  contextual_services_quicksuggest_click_sponsored_sum,
+  contextual_services_quicksuggest_click_weather_sum,
+  contextual_services_quicksuggest_help_dynamic_wikipedia_sum,
+  contextual_services_quicksuggest_help_nonsponsored_sum,
+  contextual_services_quicksuggest_help_sponsored_sum,
+  contextual_services_quicksuggest_help_weather_sum,
+  contextual_services_quicksuggest_impression_dynamic_wikipedia_sum,
+  contextual_services_quicksuggest_impression_nonsponsored_sum,
+  contextual_services_quicksuggest_impression_sponsored_sum,
+  contextual_services_quicksuggest_impression_weather_sum,
+  places_searchbar_cumulative_searches_sum,
+  places_searchbar_cumulative_filter_count_sum,
+  scalar_parent_sidebar_opened_sum,
+  scalar_parent_sidebar_search_sum,
+  scalar_parent_sidebar_link_sum,
+  places_previousday_visits_mean,
+  places_library_cumulative_bookmark_searches_sum,
+  places_library_cumulative_history_searches_sum,
+  places_bookmarks_searchbar_cumulative_searches_sum,
+  scalar_parent_library_link_sum,
+  scalar_parent_library_opened_sum,
+  scalar_parent_library_search_sum,
+  startup_profile_selection_reason_first,
+  first_document_id,
+  partner_id,
+  distribution_version,
+  distributor,
+  distributor_channel,
+  env_build_platform_version,
+  env_build_xpcom_abi,
+  geo_db_version,
+  apple_model_id,
+  max_subsession_counter,
+  min_subsession_counter,
+  startup_profile_selection_first_ping_only,
+  days_active_bits
+FROM
+  staging a
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/telemetry_derived/clients_last_seen_v2/schema.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/telemetry_derived/clients_last_seen_v2/schema.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/telemetry_derived/clients_last_seen_v2/schema.yaml	2024-05-20 13:10:23.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/telemetry_derived/clients_last_seen_v2/schema.yaml	2024-05-20 13:10:22.000000000 +0000
@@ -2,35 +2,43 @@
 - mode: NULLABLE
   name: submission_date
   type: DATE
-  description: null
+  description: Submission Date
 - mode: NULLABLE
   name: first_seen_date
   type: DATE
+  description: First Seen Date
 - mode: NULLABLE
   name: second_seen_date
   type: DATE
-- description: Bit pattern to identify when the client_id has sent a main ping in the previous 28 days.
-  mode: NULLABLE
+  description: Second Seen Date
+- mode: NULLABLE
   name: days_seen_bits
   type: INTEGER
+  description: Bit pattern to identify when the client_id has sent a main ping in the previous 28 days.
 - mode: NULLABLE
   name: days_visited_1_uri_bits
   type: INTEGER
+  description: Days Visited 1 URI Bits
 - mode: NULLABLE
   name: days_visited_5_uri_bits
   type: INTEGER
+  description: Days Visited 5 URI Bits
 - mode: NULLABLE
   name: days_visited_10_uri_bits
   type: INTEGER
+  description: Days Visited 10 URI Bits
 - mode: NULLABLE
   name: days_had_8_active_ticks_bits
   type: INTEGER
+  description: Days Had 8 Active Ticks Bits
 - mode: NULLABLE
   name: days_opened_dev_tools_bits
   type: INTEGER
+  description: Days Opened Dev Tools Bits
 - mode: NULLABLE
   name: days_interacted_bits
   type: INTEGER
+  description: Days Interacted Bits
 - mode: NULLABLE
   name: days_visited_1_uri_normal_mode_bits
   type: INTEGER
@@ -56,141 +64,133 @@
 - mode: NULLABLE
   name: client_id
   type: STRING
-  description: null
+  description: Client ID
 - mode: NULLABLE
   name: aborts_content_sum
   type: INTEGER
-  description: null
+  description: Aborts Content Sum
 - mode: NULLABLE
   name: aborts_gmplugin_sum
   type: INTEGER
-  description: null
+  description: NULL
 - mode: NULLABLE
   name: aborts_plugin_sum
   type: INTEGER
-  description: null
+  description: Aborts Plugin Sum
 - mode: NULLABLE
   name: active_addons_count_mean
   type: FLOAT
-  description: null
+  description: Active Addons Count Mean
 - fields:
   - mode: NULLABLE
     name: addon_id
     type: STRING
-    description: null
+    description: Add-On Identifier
   - mode: NULLABLE
     name: blocklisted
     type: BOOLEAN
-    description: null
+    description: Blocklisted
   - mode: NULLABLE
     name: name
     type: STRING
-    description: null
+    description: Name
   - mode: NULLABLE
     name: user_disabled
     type: BOOLEAN
-    description: null
+    description: User Disabled
   - mode: NULLABLE
     name: app_disabled
     type: BOOLEAN
-    description: null
+    description: App Disabled
   - mode: NULLABLE
     name: version
     type: STRING
-    description: null
+    description: Version
   - mode: NULLABLE
     name: scope
     type: INTEGER
-    description: null
+    description: Scope
   - mode: NULLABLE
     name: type
     type: STRING
-    description: null
+    description: Type
   - mode: NULLABLE
     name: foreign_install
     type: BOOLEAN
-    description: null
+    description: Foreign Install
   - mode: NULLABLE
     name: has_binary_components
     type: BOOLEAN
-    description: null
+    description: Has Binary Components
   - mode: NULLABLE
     name: install_day
     type: INTEGER
-    description: null
+    description: Install Day
   - mode: NULLABLE
     name: update_day
     type: INTEGER
-    description: null
+    description: Update Day
   - mode: NULLABLE
     name: signed_state
     type: INTEGER
-    description: null
+    description: Signed State
   - mode: NULLABLE
     name: is_system
     type: BOOLEAN
-    description: null
+    description: Is System
   - mode: NULLABLE
     name: is_web_extension
     type: BOOLEAN
-    description: null
+    description: Is Web Extension
   - mode: NULLABLE
     name: multiprocess_compatible
     type: BOOLEAN
-    description: null
+    description: Multiprocess Compatible
   mode: REPEATED
   name: active_addons
   type: RECORD
-  description: null
+  description: Active Addons
 - mode: NULLABLE
   name: active_experiment_branch
   type: STRING
-  description: null
+  description: Active Experiment Branch
 - mode: NULLABLE
   name: active_experiment_id
   type: STRING
-  description: null
+  description: Active Experiment ID
 - mode: NULLABLE
   name: active_hours_sum
   type: FLOAT
-  description: null
+  description: Active Hours Sum
 - mode: NULLABLE
   name: addon_compatibility_check_enabled
   type: BOOLEAN
-  description: null
+  description: Addon Compatibility Check Enabled
 - mode: NULLABLE
   name: app_build_id
   type: STRING
-  description: null
+  description: App Build ID
 - mode: NULLABLE
   name: app_display_version
   type: STRING
-  description: null
+  description: App Display Version
 - mode: NULLABLE
   name: app_name
   type: STRING
-  description: null
+  description: App Name
 - mode: NULLABLE
   name: app_version
   type: STRING
-  description: null
+  description: App Version
 - fields:
-  - mode: NULLABLE
-    name: source
+  - name: source
     type: STRING
-    description: null
-  - mode: NULLABLE
-    name: medium
+  - name: medium
     type: STRING
-    description: null
-  - mode: NULLABLE
-    name: campaign
+  - name: campaign
     type: STRING
-    description: null
-  - mode: NULLABLE
-    name: content
+  - name: content
     type: STRING
-    description: null
   - mode: NULLABLE
     name: experiment
     type: STRING
@@ -200,291 +200,266 @@
   - mode: NULLABLE
     name: dltoken
     type: STRING
-  mode: NULLABLE
+  - mode: NULLABLE
+    name: dlsource
+    type: STRING
+  - mode: NULLABLE
+    name: ua
+    type: STRING
   name: attribution
   type: RECORD
-  description: null
 - mode: NULLABLE
   name: blocklist_enabled
   type: BOOLEAN
-  description: null
+  description: Blocklist Enabled
 - mode: NULLABLE
   name: channel
   type: STRING
-  description: null
+  description: Channel
 - mode: NULLABLE
   name: client_clock_skew_mean
   type: FLOAT
-  description: null
+  description: Client Clock Skew Mean
 - mode: NULLABLE
   name: client_submission_latency_mean
   type: FLOAT
-  description: null
+  description: Client Submission Latency Mean
 - mode: NULLABLE
   name: cpu_cores
   type: INTEGER
-  description: null
+  description: CPU Cores
 - mode: NULLABLE
   name: cpu_count
   type: INTEGER
-  description: null
+  description: CPU Count
 - mode: NULLABLE
   name: cpu_family
   type: INTEGER
-  description: null
+  description: CPU Family
 - mode: NULLABLE
   name: cpu_l2_cache_kb
   type: INTEGER
-  description: null
+  description: CPU L2 Cache KB
 - mode: NULLABLE
   name: cpu_l3_cache_kb
   type: INTEGER
-  description: null
+  description: CPU L3 Cache KB
 - mode: NULLABLE
   name: cpu_model
   type: INTEGER
-  description: null
+  description: CPU Model
 - mode: NULLABLE
   name: cpu_speed_mhz
   type: INTEGER
-  description: null
+  description: CPU Speed MHz
 - mode: NULLABLE
   name: cpu_stepping
   type: INTEGER
-  description: null
-- mode: NULLABLE
-  name: cpu_vendor
+- name: cpu_vendor
   type: STRING
-  description: null
-- mode: NULLABLE
-  name: crashes_detected_content_sum
+- name: crashes_detected_content_sum
   type: INTEGER
-  description: null
-- mode: NULLABLE
-  name: crashes_detected_gmplugin_sum
+- name: crashes_detected_gmplugin_sum
   type: INTEGER
-  description: null
-- mode: NULLABLE
-  name: crashes_detected_plugin_sum
+- name: crashes_detected_plugin_sum
   type: INTEGER
-  description: null
-- mode: NULLABLE
-  name: crash_submit_attempt_content_sum
+- name: crash_submit_attempt_content_sum
   type: INTEGER
-  description: null
-- mode: NULLABLE
-  name: crash_submit_attempt_main_sum
+- name: crash_submit_attempt_main_sum
   type: INTEGER
-  description: null
-- mode: NULLABLE
-  name: crash_submit_attempt_plugin_sum
+- name: crash_submit_attempt_plugin_sum
   type: INTEGER
-  description: null
-- mode: NULLABLE
-  name: crash_submit_success_content_sum
+- name: crash_submit_success_content_sum
   type: INTEGER
-  description: null
-- mode: NULLABLE
-  name: crash_submit_success_main_sum
+- name: crash_submit_success_main_sum
   type: INTEGER
-  description: null
-- mode: NULLABLE
-  name: crash_submit_success_plugin_sum
+- name: crash_submit_success_plugin_sum
   type: INTEGER
-  description: null
 - mode: NULLABLE
   name: default_search_engine
   type: STRING
-  description: null
+  description: Default Search Engine
 - mode: NULLABLE
   name: default_search_engine_data_load_path
   type: STRING
-  description: null
+  description: Default Search Engine Data Load Path
 - mode: NULLABLE
   name: default_search_engine_data_name
   type: STRING
-  description: null
+  description: Default Search Engine Data Name
 - mode: NULLABLE
   name: default_search_engine_data_origin
   type: STRING
-  description: null
+  description: Default Search Engine Data origin
 - mode: NULLABLE
   name: default_search_engine_data_submission_url
   type: STRING
-  description: null
+  description: Default Search Engine Data Submission URL
 - mode: NULLABLE
   name: devtools_toolbox_opened_count_sum
   type: INTEGER
-  description: null
+  description: Dev Tools Toolbox Opened Count Sum
 - mode: NULLABLE
   name: distribution_id
   type: STRING
-  description: null
+  description: Distribution ID
 - mode: NULLABLE
   name: e10s_enabled
   type: BOOLEAN
-  description: null
+  description: E10s Enabled
 - mode: NULLABLE
   name: env_build_arch
   type: STRING
-  description: null
+  description: Environment Build Arch
 - mode: NULLABLE
   name: env_build_id
   type: STRING
-  description: null
+  description: Environment Build ID
 - mode: NULLABLE
   name: env_build_version
   type: STRING
-  description: null
+  description: Environment Build Version
 - mode: REPEATED
   name: environment_settings_intl_accept_languages
   type: STRING
-  description: null
+  description: Environment Settings Intl Accept Languages
 - mode: REPEATED
   name: environment_settings_intl_app_locales
   type: STRING
-  description: null
+  description: Environment Settings Intl App Locales
 - mode: REPEATED
   name: environment_settings_intl_available_locales
   type: STRING
-  description: null
+  description: Environment Settings Intl Available Locales
 - mode: REPEATED
   name: environment_settings_intl_requested_locales
   type: STRING
-  description: null
+  description: Environment Settings Intl Requested Localed
 - mode: REPEATED
   name: environment_settings_intl_system_locales
   type: STRING
-  description: null
 - mode: REPEATED
   name: environment_settings_intl_regional_prefs_locales
   type: STRING
-  description: null
+  description: Environment Settings Intl Regional Prefs Locales
 - fields:
-  - mode: NULLABLE
-    name: key
+  - name: key
     type: STRING
-    description: null
-  - mode: NULLABLE
-    name: value
+  - name: value
     type: STRING
-    description: null
   mode: REPEATED
   name: experiments
   type: RECORD
-  description: null
 - mode: NULLABLE
   name: first_paint_mean
   type: FLOAT
-  description: null
+  description: First Paint Mean
 - mode: NULLABLE
   name: flash_version
   type: STRING
-  description: null
+  description: Flash Version
 - mode: NULLABLE
   name: country
   type: STRING
-  description: null
+  description: Country
 - mode: NULLABLE
   name: city
   type: STRING
-  description: null
+  description: City
 - mode: NULLABLE
   name: geo_subdivision1
   type: STRING
-  description: null
+  description: Geo Subdivision 1
 - mode: NULLABLE
   name: geo_subdivision2
   type: STRING
-  description: null
+  description: Geo Subdivision 2
 - mode: NULLABLE
   name: isp_name
   type: STRING
-  description: null
+  description: ISP Name
 - mode: NULLABLE
   name: isp_organization
   type: STRING
-  description: null
+  description: ISP Organization
 - mode: NULLABLE
   name: gfx_features_advanced_layers_status
   type: STRING
-  description: null
+  description: GFX Features Advanced Layers Status
 - mode: NULLABLE
   name: gfx_features_d2d_status
   type: STRING
-  description: null
+  description: GFX Features D2D Status
 - mode: NULLABLE
   name: gfx_features_d3d11_status
   type: STRING
-  description: null
+  description: GFX Features D3D11 Status
 - mode: NULLABLE
   name: gfx_features_gpu_process_status
   type: STRING
-  description: null
+  description: GFX Features GPU Process Status
 - mode: NULLABLE
   name: histogram_parent_devtools_aboutdebugging_opened_count_sum
   type: INTEGER
-  description: null
+  description: Histogram Parent Dev Tools About Debugging Opened Count Sum
 - mode: NULLABLE
   name: histogram_parent_devtools_animationinspector_opened_count_sum
   type: INTEGER
-  description: null
+  description: Histogram Parent Dev Tools Animation Inspector Opened Count Sum
 - mode: NULLABLE
   name: histogram_parent_devtools_browserconsole_opened_count_sum
   type: INTEGER
-  description: null
+  description: Histogram Parent Dev Tools Browser Console Opened Count Sum
 - mode: NULLABLE
   name: histogram_parent_devtools_canvasdebugger_opened_count_sum
   type: INTEGER
-  description: null
+  description: Histogram Parent Dev Tools Canvas Debugger Opened Count Sum
 - mode: NULLABLE
   name: histogram_parent_devtools_computedview_opened_count_sum
   type: INTEGER
-  description: null
+  description: Histogram Parent Dev Tools Computed View Opened Count Sum
 - mode: NULLABLE
   name: histogram_parent_devtools_custom_opened_count_sum
   type: INTEGER
-  description: null
+  description: Histogram Parent Dev Tools Custom Opened Count Sum
 - mode: NULLABLE
   name: histogram_parent_devtools_developertoolbar_opened_count_sum
   type: INTEGER
-  description: null
+  description: Histogram Parent Dev Tools Developer Toolbar Opened Count Sum
 - mode: NULLABLE
   name: histogram_parent_devtools_dom_opened_count_sum
   type: INTEGER
-  description: null
+  description: Histogram Parent Dev Tools DOM Opened Count Sum
 - mode: NULLABLE
   name: histogram_parent_devtools_eyedropper_opened_count_sum
   type: INTEGER
-  description: null
+  description: Histogram Parent Dev Tools Eyedropper Opened Count Sum
 - mode: NULLABLE
   name: histogram_parent_devtools_fontinspector_opened_count_sum
   type: INTEGER
-  description: null
+  description: Histogram Parent Dev Tools Font Inspector Opened Count Sum
 - mode: NULLABLE
   name: histogram_parent_devtools_inspector_opened_count_sum
   type: INTEGER
-  description: null
+  description: Histogram Parent Dev Tools Inspector Opened Count Sum
 - mode: NULLABLE
   name: histogram_parent_devtools_jsbrowserdebugger_opened_count_sum
   type: INTEGER
-  description: null
+  description: Histogram Parent Dev Tools JS Browser Debugger Opened Count Sum
 - mode: NULLABLE
   name: histogram_parent_devtools_jsdebugger_opened_count_sum
   type: INTEGER
-  description: null
+  description: Histogram Parent Devtools JS Debugger Opened Count Sum
 - mode: NULLABLE
   name: histogram_parent_devtools_jsprofiler_opened_count_sum
   type: INTEGER
-  description: null
+  description: Histogram Parent Dev Tools JS Profiler Opened Count Sum
 - mode: NULLABLE
   name: histogram_parent_devtools_layoutview_opened_count_sum
   type: INTEGER
   description: null
-- mode: NULLABLE
-  name: histogram_parent_devtools_memory_opened_count_sum
+- name: histogram_parent_devtools_memory_opened_count_sum
   type: INTEGER
-  description: null
 - mode: NULLABLE
   name: histogram_parent_devtools_menu_eyedropper_opened_count_sum
   type: INTEGER
@@ -505,15 +480,14 @@
   name: histogram_parent_devtools_picker_eyedropper_opened_count_sum
   type: INTEGER
   description: null
-- mode: NULLABLE
-  name: histogram_parent_devtools_responsive_opened_count_sum
+- name: histogram_parent_devtools_responsive_opened_count_sum
   type: INTEGER
   description: null
 - mode: NULLABLE
   name: histogram_parent_devtools_ruleview_opened_count_sum
   type: INTEGER
   description: null
-- mode: NULLABLE
+- mode:
   name: histogram_parent_devtools_scratchpad_opened_count_sum
   type: INTEGER
   description: null
@@ -548,11 +522,11 @@
 - mode: NULLABLE
   name: install_year
   type: INTEGER
-  description: null
+  description: Install Year
 - mode: NULLABLE
   name: is_default_browser
   type: BOOLEAN
-  description: null
+  description: Is Default Browser
 - mode: NULLABLE
   name: is_wow64
   type: BOOLEAN
@@ -560,598 +534,414 @@
 - mode: NULLABLE
   name: locale
   type: STRING
-  description: null
+  description: Locale
 - mode: NULLABLE
   name: memory_mb
   type: INTEGER
-  description: null
+  description: Memory (MB)
 - mode: NULLABLE
   name: normalized_channel
   type: STRING
-  description: null
+  description: Normalized Channel
 - mode: NULLABLE
   name: normalized_os_version
   type: STRING
-  description: null
+  description: Normalized OS Version
 - mode: NULLABLE
   name: os
   type: STRING
-  description: null
+  description: Operating System
 - mode: NULLABLE
   name: os_service_pack_major
   type: INTEGER
-  description: null
+  description: OS Service Pack Major
 - mode: NULLABLE
   name: os_service_pack_minor
   type: INTEGER
-  description: null
+  description: OS Service Pack Minor
 - mode: NULLABLE
   name: os_version
   type: STRING
-  description: null
+  description: Operating System Version
 - mode: NULLABLE
   name: pings_aggregated_by_this_row
   type: INTEGER
-  description: null
+  description: Pings Aggregated By This Row
 - mode: NULLABLE
   name: places_bookmarks_count_mean
   type: FLOAT
-  description: null
+  description: Places Bookmarks Count Mean
 - mode: NULLABLE
   name: places_pages_count_mean
   type: FLOAT
-  description: null
+  description: Places Pages Count Mean
 - mode: NULLABLE
   name: plugin_hangs_sum
   type: INTEGER
-  description: null
+  description: Plugin Hangs Sum
 - mode: NULLABLE
   name: plugins_infobar_allow_sum
   type: INTEGER
-  description: null
+  description: Plugins Infobar Allow Sum
 - mode: NULLABLE
   name: plugins_infobar_block_sum
   type: INTEGER
-  description: null
+  description: Plugins Infobar Block Sum
 - mode: NULLABLE
   name: plugins_infobar_shown_sum
   type: INTEGER
-  description: null
+  description: Plugins Infobar Shown Sum
 - mode: NULLABLE
   name: plugins_notification_shown_sum
   type: INTEGER
-  description: null
+  description: Plugins Notifications Shown Sum
 - mode: NULLABLE
   name: previous_build_id
   type: STRING
-  description: null
+  description: Previous Build ID
 - mode: NULLABLE
   name: profile_age_in_days
   type: INTEGER
-  description: null
+  description: Profile Age in Days
 - mode: NULLABLE
   name: profile_creation_date
   type: STRING
-  description: null
+  description: Profile Creation Date
 - mode: NULLABLE
   name: push_api_notify_sum
   type: INTEGER
-  description: null
+  description: Push API Notify Sum
 - mode: NULLABLE
   name: sample_id
   type: INTEGER
-  description: null
-- mode: NULLABLE
-  name: sandbox_effective_content_process_level
+  description: Sample ID
+- name: sandbox_effective_content_process_level
   type: INTEGER
-  description: null
-- mode: NULLABLE
-  name: scalar_combined_webrtc_nicer_stun_retransmits_sum
+- name: scalar_combined_webrtc_nicer_stun_retransmits_sum
   type: INTEGER
-  description: null
-- mode: NULLABLE
-  name: scalar_combined_webrtc_nicer_turn_401s_sum
+- name: scalar_combined_webrtc_nicer_turn_401s_sum
   type: INTEGER
-  description: null
-- mode: NULLABLE
-  name: scalar_combined_webrtc_nicer_turn_403s_sum
+- name: scalar_combined_webrtc_nicer_turn_403s_sum
   type: INTEGER
-  description: null
-- mode: NULLABLE
-  name: scalar_combined_webrtc_nicer_turn_438s_sum
+- name: scalar_combined_webrtc_nicer_turn_438s_sum
   type: INTEGER
-  description: null
-- mode: NULLABLE
-  name: scalar_content_navigator_storage_estimate_count_sum
+- name: scalar_content_navigator_storage_estimate_count_sum
   type: INTEGER
-  description: null
-- mode: NULLABLE
-  name: scalar_content_navigator_storage_persist_count_sum
+- name: scalar_content_navigator_storage_persist_count_sum
   type: INTEGER
-  description: null
-- mode: NULLABLE
-  name: scalar_parent_aushelper_websense_reg_version
+- name: scalar_parent_aushelper_websense_reg_version
   type: STRING
-  description: null
-- mode: NULLABLE
-  name: scalar_parent_browser_engagement_max_concurrent_tab_count_max
+- name: scalar_parent_browser_engagement_max_concurrent_tab_count_max
   type: INTEGER
-  description: null
-- mode: NULLABLE
-  name: scalar_parent_browser_engagement_max_concurrent_window_count_max
+- name: scalar_parent_browser_engagement_max_concurrent_window_count_max
   type: INTEGER
-  description: null
-- mode: NULLABLE
-  name: scalar_parent_browser_engagement_tab_open_event_count_sum
+- name: scalar_parent_browser_engagement_tab_open_event_count_sum
   type: INTEGER
-  description: null
-- mode: NULLABLE
-  name: scalar_parent_browser_engagement_total_uri_count_sum
+- name: scalar_parent_browser_engagement_total_uri_count_sum
   type: INTEGER
-  description: null
-- mode: NULLABLE
-  name: scalar_parent_browser_engagement_unfiltered_uri_count_sum
+- name: scalar_parent_browser_engagement_unfiltered_uri_count_sum
   type: INTEGER
-  description: null
-- mode: NULLABLE
-  name: scalar_parent_browser_engagement_unique_domains_count_max
+- name: scalar_parent_browser_engagement_unique_domains_count_max
   type: INTEGER
-  description: null
-- mode: NULLABLE
-  name: scalar_parent_browser_engagement_unique_domains_count_mean
+- name: scalar_parent_browser_engagement_unique_domains_count_mean
   type: FLOAT
-  description: null
-- mode: NULLABLE
-  name: scalar_parent_browser_engagement_window_open_event_count_sum
+- name: scalar_parent_browser_engagement_window_open_event_count_sum
   type: INTEGER
-  description: null
-- mode: NULLABLE
-  name: scalar_parent_devtools_accessibility_node_inspected_count_sum
+- name: scalar_parent_devtools_accessibility_node_inspected_count_sum
   type: INTEGER
-  description: null
-- mode: NULLABLE
-  name: scalar_parent_devtools_accessibility_opened_count_sum
+- name: scalar_parent_devtools_accessibility_opened_count_sum
   type: INTEGER
-  description: null
-- mode: NULLABLE
-  name: scalar_parent_devtools_accessibility_picker_used_count_sum
+- name: scalar_parent_devtools_accessibility_picker_used_count_sum
   type: INTEGER
-  description: null
 - fields:
-  - mode: NULLABLE
-    name: key
+  - name: key
     type: STRING
-    description: null
-  - mode: NULLABLE
-    name: value
+  - name: value
     type: INTEGER
-    description: null
   mode: REPEATED
   name: scalar_parent_devtools_accessibility_select_accessible_for_node_sum
   type: RECORD
-  description: null
-- mode: NULLABLE
-  name: scalar_parent_devtools_accessibility_service_enabled_count_sum
+- name: scalar_parent_devtools_accessibility_service_enabled_count_sum
   type: INTEGER
-  description: null
-- mode: NULLABLE
-  name: scalar_parent_devtools_copy_full_css_selector_opened_sum
+- name: scalar_parent_devtools_copy_full_css_selector_opened_sum
   type: INTEGER
-  description: null
-- mode: NULLABLE
-  name: scalar_parent_devtools_copy_unique_css_selector_opened_sum
+- name: scalar_parent_devtools_copy_unique_css_selector_opened_sum
   type: INTEGER
-  description: null
-- mode: NULLABLE
-  name: scalar_parent_devtools_toolbar_eyedropper_opened_sum
+- name: scalar_parent_devtools_toolbar_eyedropper_opened_sum
   type: INTEGER
-  description: null
-- mode: NULLABLE
-  name: scalar_parent_dom_contentprocess_troubled_due_to_memory_sum
+- name: scalar_parent_dom_contentprocess_troubled_due_to_memory_sum
   type: INTEGER
-  description: null
-- mode: NULLABLE
-  name: scalar_parent_navigator_storage_estimate_count_sum
+- name: scalar_parent_navigator_storage_estimate_count_sum
   type: INTEGER
-  description: null
-- mode: NULLABLE
-  name: scalar_parent_navigator_storage_persist_count_sum
+- name: scalar_parent_navigator_storage_persist_count_sum
   type: INTEGER
-  description: null
-- mode: NULLABLE
-  name: scalar_parent_storage_sync_api_usage_extensions_using_sum
+- name: scalar_parent_storage_sync_api_usage_extensions_using_sum
   type: INTEGER
-  description: null
-- mode: NULLABLE
-  name: search_cohort
+- name: search_cohort
   type: STRING
-  description: null
-- mode: NULLABLE
-  name: search_count_abouthome
+- name: search_count_abouthome
   type: INTEGER
-  description: null
-- mode: NULLABLE
-  name: search_count_contextmenu
+- name: search_count_contextmenu
   type: INTEGER
-  description: null
-- mode: NULLABLE
-  name: search_count_newtab
+- name: search_count_newtab
   type: INTEGER
-  description: null
-- mode: NULLABLE
-  name: search_count_searchbar
+- name: search_count_searchbar
   type: INTEGER
-  description: null
-- mode: NULLABLE
-  name: search_count_system
+- name: search_count_system
   type: INTEGER
-  description: null
-- mode: NULLABLE
-  name: search_count_urlbar
+- name: search_count_urlbar
   type: INTEGER
-  description: null
-- mode: NULLABLE
-  name: search_count_all
+- name: search_count_all
   type: INTEGER
-  description: null
 - mode: NULLABLE
   name: search_count_tagged_sap
   type: INTEGER
-  description: null
 - mode: NULLABLE
   name: search_count_tagged_follow_on
   type: INTEGER
-  description: null
 - mode: NULLABLE
   name: search_count_organic
   type: INTEGER
-  description: null
 - mode: NULLABLE
   name: search_count_urlbar_handoff
   type: INTEGER
-- mode: NULLABLE
-  name: search_count_urlbar_persisted
-  type: INTEGER
-- mode: NULLABLE
-  name: session_restored_mean
+- name: session_restored_mean
   type: FLOAT
-  description: null
-- mode: NULLABLE
-  name: sessions_started_on_this_day
+- name: sessions_started_on_this_day
   type: INTEGER
-  description: null
-- mode: NULLABLE
-  name: shutdown_kill_sum
+- name: shutdown_kill_sum
   type: INTEGER
-  description: null
-- mode: NULLABLE
-  name: subsession_hours_sum
+- name: subsession_hours_sum
   type: NUMERIC
-  description: null
-- mode: NULLABLE
-  name: ssl_handshake_result_failure_sum
+- name: ssl_handshake_result_failure_sum
   type: INTEGER
-  description: null
-- mode: NULLABLE
-  name: ssl_handshake_result_success_sum
+- name: ssl_handshake_result_success_sum
   type: INTEGER
-  description: null
-- mode: NULLABLE
-  name: sync_configured
+- name: sync_configured
   type: BOOLEAN
-  description: null
-- mode: NULLABLE
-  name: sync_count_desktop_mean
+- name: sync_count_desktop_mean
   type: FLOAT
-  description: null
-- mode: NULLABLE
-  name: sync_count_mobile_mean
+- name: sync_count_mobile_mean
   type: FLOAT
-  description: null
-- mode: NULLABLE
-  name: sync_count_desktop_sum
+- name: sync_count_desktop_sum
   type: INTEGER
-  description: null
-- mode: NULLABLE
-  name: sync_count_mobile_sum
+- name: sync_count_mobile_sum
   type: INTEGER
-  description: null
 - mode: NULLABLE
   name: telemetry_enabled
   type: BOOLEAN
-  description: null
+  description: Telemetry Enabled Indicator
 - mode: NULLABLE
   name: timezone_offset
   type: INTEGER
-  description: null
+  description: Timezone Offset
 - mode: NULLABLE
   name: total_hours_sum
   type: NUMERIC
-  description: null
+  description: Total Hours Sum
 - mode: NULLABLE
   name: update_auto_download
   type: BOOLEAN
-  description: null
+  description: Update Auto Download
 - mode: NULLABLE
   name: update_channel
   type: STRING
-  description: null
+  description: Update Channel
 - mode: NULLABLE
   name: update_enabled
   type: BOOLEAN
-  description: null
+  description: Update Enabled
 - mode: NULLABLE
   name: vendor
   type: STRING
-  description: null
+  description: Vendor
 - mode: NULLABLE
   name: web_notification_shown_sum
   type: INTEGER
-  description: null
+  description: Web Notification Shown Sum
 - mode: NULLABLE
   name: windows_build_number
   type: INTEGER
-  description: null
+  description: Windows Build Number
 - mode: NULLABLE
   name: windows_ubr
   type: INTEGER
-  description: null
+  description: Windows UBR
 - mode: NULLABLE
   name: fxa_configured
   type: BOOLEAN
-  description: null
+  description: FXA Configured
 - mode: NULLABLE
   name: trackers_blocked_sum
   type: INTEGER
-  description: null
+  description: Trackers Blocked Sum
 - mode: NULLABLE
   name: submission_timestamp_min
   type: TIMESTAMP
-  description: null
+  description: Minimum Submission Timestamp
 - mode: NULLABLE
   name: ad_clicks_count_all
   type: INTEGER
-  description: null
+  description: Ad Clicks Count All
 - mode: NULLABLE
   name: search_with_ads_count_all
   type: INTEGER
-  description: null
+  description: Search with Ads Count All
 - mode: NULLABLE
   name: scalar_parent_urlbar_impression_autofill_about_sum
   type: INTEGER
-  description: null
+  description: Scalar Parent URL Bar Impression Autofill About Sum
 - mode: NULLABLE
   name: scalar_parent_urlbar_impression_autofill_adaptive_sum
   type: INTEGER
-  description: null
+  description: Scalar Parent URL Bar Impression Autofill Adaptive Sum
 - mode: NULLABLE
   name: scalar_parent_urlbar_impression_autofill_origin_sum
   type: INTEGER
-  description: null
 - mode: NULLABLE
   name: scalar_parent_urlbar_impression_autofill_other_sum
   type: INTEGER
-  description: null
 - mode: NULLABLE
   name: scalar_parent_urlbar_impression_autofill_preloaded_sum
   type: INTEGER
-  description: null
 - mode: NULLABLE
   name: scalar_parent_urlbar_impression_autofill_url_sum
   type: INTEGER
-  description: null
 - fields:
   - mode: NULLABLE
     name: key
     type: STRING
-    description: null
   - mode: NULLABLE
     name: value
     type: INTEGER
-    description: null
   mode: REPEATED
   name: scalar_parent_telemetry_event_counts_sum
   type: RECORD
-  description: null
 - fields:
   - mode: NULLABLE
     name: key
     type: STRING
-    description: null
   - mode: NULLABLE
     name: value
     type: INTEGER
-    description: null
   mode: REPEATED
   name: scalar_content_telemetry_event_counts_sum
   type: RECORD
-  description: null
 - fields:
-  - mode: NULLABLE
-    name: key
+  - name: key
     type: STRING
-    description: null
-  - mode: NULLABLE
-    name: value
+  - name: value
     type: INTEGER
-    description: null
   mode: REPEATED
   name: scalar_parent_urlbar_searchmode_bookmarkmenu_sum
   type: RECORD
-  description: null
 - fields:
-  - mode: NULLABLE
-    name: key
+  - name: key
     type: STRING
-    description: null
-  - mode: NULLABLE
-    name: value
+  - name: value
     type: INTEGER
-    description: null
   mode: REPEATED
   name: scalar_parent_urlbar_searchmode_handoff_sum
   type: RECORD
-  description: null
 - fields:
-  - mode: NULLABLE
-    name: key
+  - name: key
     type: STRING
-    description: null
-  - mode: NULLABLE
-    name: value
+  - name: value
     type: INTEGER
-    description: null
   mode: REPEATED
   name: scalar_parent_urlbar_searchmode_keywordoffer_sum
   type: RECORD
-  description: null
 - fields:
-  - mode: NULLABLE
-    name: key
+  - name: key
     type: STRING
-    description: null
-  - mode: NULLABLE
-    name: value
+  - name: value
     type: INTEGER
-    description: null
   mode: REPEATED
   name: scalar_parent_urlbar_searchmode_oneoff_sum
   type: RECORD
-  description: null
 - fields:
-  - mode: NULLABLE
-    name: key
+  - name: key
     type: STRING
-    description: null
-  - mode: NULLABLE
-    name: value
+  - name: value
     type: INTEGER
-    description: null
   mode: REPEATED
   name: scalar_parent_urlbar_searchmode_other_sum
   type: RECORD
-  description: null
 - fields:
-  - mode: NULLABLE
-    name: key
+  - name: key
     type: STRING
-    description: null
-  - mode: NULLABLE
-    name: value
+  - name: value
     type: INTEGER
-    description: null
   mode: REPEATED
   name: scalar_parent_urlbar_searchmode_shortcut_sum
   type: RECORD
-  description: null
 - fields:
-  - mode: NULLABLE
-    name: key
+  - name: key
     type: STRING
-    description: null
-  - mode: NULLABLE
-    name: value
+  - name: value
     type: INTEGER
-    description: null
   mode: REPEATED
   name: scalar_parent_urlbar_searchmode_tabmenu_sum
   type: RECORD
-  description: null
 - fields:
-  - mode: NULLABLE
-    name: key
+  - name: key
     type: STRING
-    description: null
-  - mode: NULLABLE
-    name: value
+  - name: value
     type: INTEGER
-    description: null
   mode: REPEATED
   name: scalar_parent_urlbar_searchmode_tabtosearch_sum
   type: RECORD
-  description: null
 - fields:
-  - mode: NULLABLE
-    name: key
+  - name: key
     type: STRING
-    description: null
-  - mode: NULLABLE
-    name: value
+  - name: value
     type: INTEGER
-    description: null
   mode: REPEATED
   name: scalar_parent_urlbar_searchmode_tabtosearch_onboard_sum
   type: RECORD
-  description: null
 - fields:
-  - mode: NULLABLE
-    name: key
+  - name: key
     type: STRING
-    description: null
-  - mode: NULLABLE
-    name: value
+  - name: value
     type: INTEGER
-    description: null
   mode: REPEATED
   name: scalar_parent_urlbar_searchmode_topsites_newtab_sum
   type: RECORD
-  description: null
 - fields:
-  - mode: NULLABLE
-    name: key
+  - name: key
     type: STRING
-    description: null
-  - mode: NULLABLE
-    name: value
+  - name: value
     type: INTEGER
-    description: null
   mode: REPEATED
   name: scalar_parent_urlbar_searchmode_topsites_urlbar_sum
   type: RECORD
-  description: null
 - fields:
-  - mode: NULLABLE
-    name: key
+  - name: key
     type: STRING
-    description: null
-  - mode: NULLABLE
-    name: value
+  - name: value
     type: INTEGER
-    description: null
   mode: REPEATED
   name: scalar_parent_urlbar_searchmode_touchbar_sum
   type: RECORD
-  description: null
 - fields:
-  - mode: NULLABLE
-    name: key
+  - name: key
     type: STRING
-    description: null
-  - mode: NULLABLE
-    name: value
+  - name: value
     type: INTEGER
-    description: null
   mode: REPEATED
   name: scalar_parent_urlbar_searchmode_typed_sum
   type: RECORD
-  description: null
-- mode: NULLABLE
-  name: scalar_parent_os_environment_is_taskbar_pinned
+- name: scalar_parent_os_environment_is_taskbar_pinned
   type: BOOLEAN
-- mode: NULLABLE
-  name: scalar_parent_os_environment_launched_via_desktop
+- name: scalar_parent_os_environment_launched_via_desktop
   type: BOOLEAN
-- mode: NULLABLE
-  name: scalar_parent_os_environment_launched_via_start_menu
+- name: scalar_parent_os_environment_launched_via_start_menu
   type: BOOLEAN
-- mode: NULLABLE
-  name: scalar_parent_os_environment_launched_via_taskbar
+- name: scalar_parent_os_environment_launched_via_taskbar
   type: BOOLEAN
-- mode: NULLABLE
-  name: scalar_parent_os_environment_launched_via_other_shortcut
+- name: scalar_parent_os_environment_launched_via_other_shortcut
   type: BOOLEAN
-- mode: NULLABLE
-  name: scalar_parent_os_environment_launched_via_other
+- name: scalar_parent_os_environment_launched_via_other
   type: BOOLEAN
 - mode: NULLABLE
   name: search_count_webextension
@@ -1471,16 +1261,6 @@
     name: value
     type: INTEGER
   mode: REPEATED
-  name: search_content_urlbar_persisted_sum
-  type: RECORD
-- fields:
-  - mode: NULLABLE
-    name: key
-    type: STRING
-  - mode: NULLABLE
-    name: value
-    type: INTEGER
-  mode: REPEATED
   name: search_content_urlbar_searchmode_sum
   type: RECORD
 - fields:
@@ -1513,6 +1293,7 @@
   mode: REPEATED
   name: search_content_about_newtab_sum
   type: RECORD
+  description: Search Content About New Tab Sum
 - fields:
   - mode: NULLABLE
     name: key
@@ -1523,6 +1304,7 @@
   mode: REPEATED
   name: search_content_searchbar_sum
   type: RECORD
+  description: Search Content Search Bar Sum
 - fields:
   - mode: NULLABLE
     name: key
@@ -1533,6 +1315,7 @@
   mode: REPEATED
   name: search_content_system_sum
   type: RECORD
+  description: Search Content System Sum
 - fields:
   - mode: NULLABLE
     name: key
@@ -1543,6 +1326,7 @@
   mode: REPEATED
   name: search_content_webextension_sum
   type: RECORD
+  description: Search Content Web Extension Sum
 - fields:
   - mode: NULLABLE
     name: key
@@ -1553,6 +1337,7 @@
   mode: REPEATED
   name: search_content_tabhistory_sum
   type: RECORD
+  description: Search Content Tab History Sum
 - fields:
   - mode: NULLABLE
     name: key
@@ -1563,6 +1348,7 @@
   mode: REPEATED
   name: search_content_reload_sum
   type: RECORD
+  description: Search Content Reload Sum
 - fields:
   - mode: NULLABLE
     name: key
@@ -1573,6 +1359,7 @@
   mode: REPEATED
   name: search_content_unknown_sum
   type: RECORD
+  description: Search Content Unknown Sum
 - fields:
   - mode: NULLABLE
     name: key
@@ -1583,6 +1370,7 @@
   mode: REPEATED
   name: search_withads_urlbar_sum
   type: RECORD
+  description: Search With Ads URL Bar Sum
 - fields:
   - mode: NULLABLE
     name: key
@@ -1593,16 +1381,7 @@
   mode: REPEATED
   name: search_withads_urlbar_handoff_sum
   type: RECORD
-- fields:
-  - mode: NULLABLE
-    name: key
-    type: STRING
-  - mode: NULLABLE
-    name: value
-    type: INTEGER
-  mode: REPEATED
-  name: search_withads_urlbar_persisted_sum
-  type: RECORD
+  description: Search With Ads URL Bar Handoff Sum
 - fields:
   - mode: NULLABLE
     name: key
@@ -1623,6 +1402,7 @@
   mode: REPEATED
   name: search_withads_contextmenu_sum
   type: RECORD
+  description: Search With Ads Context Menu Sum
 - fields:
   - mode: NULLABLE
     name: key
@@ -1633,6 +1413,7 @@
   mode: REPEATED
   name: search_withads_about_home_sum
   type: RECORD
+  description: Search With Ads About Home Sum
 - fields:
   - mode: NULLABLE
     name: key
@@ -1643,6 +1424,7 @@
   mode: REPEATED
   name: search_withads_about_newtab_sum
   type: RECORD
+  description: Search With Ads About New Tab Sum
 - fields:
   - mode: NULLABLE
     name: key
@@ -1653,6 +1435,7 @@
   mode: REPEATED
   name: search_withads_searchbar_sum
   type: RECORD
+  description: Search With Ads Search Bar Sum
 - fields:
   - mode: NULLABLE
     name: key
@@ -1663,6 +1446,7 @@
   mode: REPEATED
   name: search_withads_system_sum
   type: RECORD
+  description: Search With Ads System Sum
 - fields:
   - mode: NULLABLE
     name: key
@@ -1673,6 +1457,7 @@
   mode: REPEATED
   name: search_withads_webextension_sum
   type: RECORD
+  description: Search With Ads Web Extension Sum
 - fields:
   - mode: NULLABLE
     name: key
@@ -1683,6 +1468,7 @@
   mode: REPEATED
   name: search_withads_tabhistory_sum
   type: RECORD
+  description: Search With Ads Tab History Sum
 - fields:
   - mode: NULLABLE
     name: key
@@ -1731,16 +1517,6 @@
     name: value
     type: INTEGER
   mode: REPEATED
-  name: search_adclicks_urlbar_persisted_sum
-  type: RECORD
-- fields:
-  - mode: NULLABLE
-    name: key
-    type: STRING
-  - mode: NULLABLE
-    name: value
-    type: INTEGER
-  mode: REPEATED
   name: search_adclicks_urlbar_searchmode_sum
   type: RECORD
 - fields:
@@ -1773,6 +1549,7 @@
   mode: REPEATED
   name: search_adclicks_about_newtab_sum
   type: RECORD
+  description: Search Ad Clicks About New Tab Sum
 - fields:
   - mode: NULLABLE
     name: key
@@ -1783,6 +1560,7 @@
   mode: REPEATED
   name: search_adclicks_searchbar_sum
   type: RECORD
+  description: Search Ad Clicks Search Bar Sum
 - fields:
   - mode: NULLABLE
     name: key
@@ -1833,39 +1611,50 @@
   mode: REPEATED
   name: search_adclicks_unknown_sum
   type: RECORD
+  description: Search Ad Clicks Unknown Sum
 - mode: NULLABLE
   name: update_background
   type: BOOLEAN
 - mode: NULLABLE
   name: user_pref_browser_search_suggest_enabled
   type: STRING
+  description: User Preferences Browser Search Suggest Enabled
 - mode: NULLABLE
   name: user_pref_browser_widget_in_navbar
   type: STRING
+  description: User Preferences Browser Widget in Navigation Bar
 - mode: NULLABLE
   name: user_pref_browser_urlbar_suggest_searches
   type: STRING
+  description: User Preferences Browser URL Bar Suggest Searches
 - mode: NULLABLE
   name: user_pref_browser_urlbar_show_search_suggestions_first
   type: STRING
+  description: null
 - mode: NULLABLE
   name: user_pref_browser_urlbar_suggest_quicksuggest
   type: STRING
+  description: null
 - mode: NULLABLE
   name: user_pref_browser_urlbar_suggest_quicksuggest_sponsored
   type: STRING
+  description: null
 - mode: NULLABLE
   name: user_pref_browser_urlbar_quicksuggest_onboarding_dialog_choice
   type: STRING
-- mode: NULLABLE
-  name: scalar_parent_browser_engagement_total_uri_count_normal_and_private_mode_sum
+  description: null
+- name: >-
+    scalar_parent_browser_engagement_total_uri_count_normal_and_private_mode_sum
   type: INTEGER
+  description: null
 - mode: NULLABLE
   name: user_pref_browser_newtabpage_enabled
   type: STRING
+  description: User Preferences Browser New Tab Page Enabled
 - mode: NULLABLE
   name: user_pref_app_shield_optoutstudies_enabled
   type: STRING
+  description: User Preferences App Shield Opt Out Studies Enabled
 - fields:
   - mode: NULLABLE
     name: key
@@ -1876,6 +1665,7 @@
   mode: REPEATED
   name: contextual_services_quicksuggest_click_sum
   type: RECORD
+  description: Contextual Services Quick Suggest Click Sum
 - fields:
   - mode: NULLABLE
     name: key
@@ -1886,6 +1676,7 @@
   mode: REPEATED
   name: contextual_services_quicksuggest_impression_sum
   type: RECORD
+  description: Contextual Services Quick Suggest Impression Sum
 - fields:
   - mode: NULLABLE
     name: key
@@ -1896,6 +1687,7 @@
   mode: REPEATED
   name: contextual_services_quicksuggest_help_sum
   type: RECORD
+  description: Contextual Services Quick Suggest Help Sum
 - fields:
   - mode: NULLABLE
     name: key
@@ -1906,6 +1698,7 @@
   mode: REPEATED
   name: contextual_services_topsites_click_sum
   type: RECORD
+  description: Contextual Services Topsites Click Sum
 - fields:
   - mode: NULLABLE
     name: key
@@ -1916,18 +1709,23 @@
   mode: REPEATED
   name: contextual_services_topsites_impression_sum
   type: RECORD
+  description: Contextual Services Topsites Impression Sum
 - mode: NULLABLE
   name: user_pref_browser_urlbar_suggest_quicksuggest_nonsponsored
   type: STRING
+  description: User Preferences Browser URL Bar Suggest Quick Suggest Non-Sponsored
 - mode: NULLABLE
   name: user_pref_browser_urlbar_quicksuggest_data_collection_enabled
   type: STRING
+  description: User Preferences Browser URL Bar Quick Suggest Data Collection Enabled
 - mode: NULLABLE
   name: scalar_a11y_hcm_foreground
   type: INTEGER
+  description: null
 - mode: NULLABLE
   name: scalar_a11y_hcm_background
   type: INTEGER
+  description: null
 - fields:
   - mode: NULLABLE
     name: key
@@ -1938,6 +1736,7 @@
   mode: REPEATED
   name: a11y_theme
   type: RECORD
+  description: null
 - fields:
   - mode: NULLABLE
     name: key
@@ -1948,6 +1747,7 @@
   mode: REPEATED
   name: contextual_services_quicksuggest_help_nonsponsored_bestmatch_sum
   type: RECORD
+  description: Contextual Services Quick Suggest Help Non-Sponsored Best Match Sum
 - fields:
   - mode: NULLABLE
     name: key
@@ -1958,6 +1758,7 @@
   mode: REPEATED
   name: contextual_services_quicksuggest_help_sponsored_bestmatch_sum
   type: RECORD
+  description: null
 - fields:
   - mode: NULLABLE
     name: key
@@ -1982,12 +1783,15 @@
   - mode: NULLABLE
     name: key
     type: STRING
+    description: null
   - mode: NULLABLE
     name: value
     type: INTEGER
+    description: null
   mode: REPEATED
   name: contextual_services_quicksuggest_block_sponsored_bestmatch_sum
   type: RECORD
+  description: Contextual Services Quick Suggest Block Sponsored Best Match Sum
 - fields:
   - mode: NULLABLE
     name: key
@@ -2008,6 +1812,7 @@
   mode: REPEATED
   name: contextual_services_quicksuggest_click_sponsored_bestmatch_sum
   type: RECORD
+  description: null
 - fields:
   - mode: NULLABLE
     name: key
@@ -2038,18 +1843,23 @@
   mode: REPEATED
   name: contextual_services_quicksuggest_impression_nonsponsored_bestmatch_sum
   type: RECORD
+  description: null
 - mode: NULLABLE
   name: user_pref_browser_urlbar_suggest_bestmatch
   type: STRING
+  description: User Preferences Browser URL Bar Suggest Best Match
 - mode: NULLABLE
   name: scalar_parent_browser_ui_interaction_textrecognition_error_sum
   type: INTEGER
+  description: Scalar Parent Browser UI Interaction Text Recognition Error Sum
 - mode: NULLABLE
   name: text_recognition_interaction_timing_sum
   type: INTEGER
+  description: Text Recognition Interaction Timing Sum
 - mode: NULLABLE
   name: text_recognition_interaction_timing_count_sum
   type: INTEGER
+  description: Text Recognition Interaction Timing Count Sum
 - fields:
   - mode: NULLABLE
     name: key
@@ -2060,63 +1870,75 @@
   mode: REPEATED
   name: scalar_parent_browser_ui_interaction_content_context_sum
   type: RECORD
+  description: Scalar Parent Browser UI Interaction Content Context Sum
 - mode: NULLABLE
   name: text_recognition_api_performance_sum
   type: INTEGER
+  description: Text Recognition API Performance Sum
 - mode: NULLABLE
   name: text_recognition_api_performance_count_sum
   type: INTEGER
+  description: Text Recognition API Performance Count Sum
 - mode: NULLABLE
   name: text_recognition_text_length_sum
   type: INTEGER
+  description: Text Recognition Text Length Sum
 - mode: NULLABLE
   name: text_recognition_text_length_count_sum
   type: INTEGER
-- mode: NULLABLE
-  name: places_searchbar_cumulative_searches_sum
-  type: INTEGER
-- mode: NULLABLE
-  name: places_searchbar_cumulative_filter_count_sum
-  type: INTEGER
+  description: Text Recognition Text Length Count Sum
 - mode: NULLABLE
   name: scalar_parent_os_environment_launched_via_taskbar_private
   type: BOOLEAN
+  description: Scalar Parent OS Environment Launched via Taskbar Private
 - mode: NULLABLE
   name: dom_parentprocess_private_window_used
   type: BOOLEAN
+  description: DOM Parent Process Private Window Used
 - mode: NULLABLE
   name: os_environment_is_taskbar_pinned_any
   type: BOOLEAN
+  description: OS Environment Is Taskbar Pinned Any
 - mode: NULLABLE
   name: os_environment_is_taskbar_pinned_private_any
   type: BOOLEAN
+  description: OS Environment Is Taskbar Pinned Private Any
 - mode: NULLABLE
   name: os_environment_is_taskbar_pinned_private
   type: BOOLEAN
+  description: OS Environment Is Taskbar Pinned Private
 - mode: NULLABLE
   name: bookmark_migrations_quantity_chrome
   type: INTEGER
+  description: Bookmark Migrations Quantity Chrome
 - mode: NULLABLE
   name: bookmark_migrations_quantity_edge
   type: INTEGER
+  description: Bookmark Migrations Quantity Edge
 - mode: NULLABLE
   name: bookmark_migrations_quantity_safari
   type: INTEGER
+  description: Bookmark Migrations Quantity Safari
 - mode: NULLABLE
   name: bookmark_migrations_quantity_all
   type: INTEGER
+  description: Bookmark Migrations Quantity All
 - mode: NULLABLE
   name: history_migrations_quantity_chrome
   type: INTEGER
+  description: History Migrations Quantity Chrome
 - mode: NULLABLE
   name: history_migrations_quantity_edge
   type: INTEGER
+  description: History Migrations Quantity Edge
 - mode: NULLABLE
   name: history_migrations_quantit

⚠️ Only part of the diff is displayed.

Link to full diff

fix: Make column query order match schema order

f7a3a38

kwindau added the WIP label May 16, 2024