add data from desktop_cohort_daily_retention to cohort_daily_stats, n… (#4711)

* add data from desktop_cohort_daily_retention to cohort_daily_stats, normalize desktop normalized_app_name to 'Firefox Desktop'

* add fakespot_daily_events_rollup to bqetl_project skip list

* Update sql/moz-fx-data-shared-prod/telemetry/cohort_daily_statistics/view.sql

Co-authored-by: Sean Rose <1994030+sean-rose@users.noreply.github.com>

* add new line at end of file

---------

Co-authored-by: Sean Rose <1994030+sean-rose@users.noreply.github.com>

bqetl_project.yaml

@@ -55,6 +55,7 @@ dry_run:
   - sql/moz-fx-data-shared-prod/accounts_db_external/**/*.sql
   - sql/moz-fx-data-shared-prod/accounts_db_nonprod_external/**/*.sql
   - sql/moz-fx-data-shared-prod/accounts_db/fxa_oauth_clients/view.sql
+  - sql/moz-fx-data-shared-prod/ads/fakespot_daily_events_rollup/view.sql
   - sql/moz-fx-data-shared-prod/firefox_accounts_derived/fxa_content_events_v1/query.sql
   - sql/moz-fx-data-shared-prod/firefox_accounts_derived/fxa_auth_bounce_events_v1/query.sql
   - sql/moz-fx-data-shared-prod/firefox_accounts_derived/fxa_auth_events_v1/query.sql

sql/moz-fx-data-shared-prod/telemetry/cohort_daily_statistics/view.sql

@@ -2,8 +2,39 @@ CREATE OR REPLACE VIEW
   `moz-fx-data-shared-prod.telemetry.cohort_daily_statistics`
 AS
 SELECT
-  *
+  activity_date,
+  cohort_date,
+  normalized_app_name,
+  normalized_channel,
+  normalized_os,
+  normalized_os_version,
+  attribution_source,
+  attribution_medium,
+  attribution_campaign,
+  attribution_content,
+  attribution_experiment,
+  attribution_variation,
+  num_clients_active_on_day,
+  num_clients_in_cohort
 FROM
   `moz-fx-data-shared-prod.telemetry_derived.cohort_daily_statistics_v1`
 WHERE
   normalized_app_name != "Firefox Desktop"
+UNION ALL
+SELECT
+  submission_date AS activity_date,
+  first_seen_date AS cohort_date,
+  "Firefox Desktop" AS normalized_app_name,
+  normalized_channel,
+  normalized_os,
+  normalized_os_version,
+  attribution_source,
+  attribution_medium,
+  attribution_campaign,
+  attribution_content,
+  attribution_experiment,
+  CAST(NULL AS STRING) AS attribution_variation,
+  num_clients_active_on_day,
+  num_clients_in_cohort
+FROM
+  `moz-fx-data-shared-prod.telemetry_derived.desktop_cohort_daily_retention_v1`