add document_id field to serp_events_v2 (#8089)

* add document_id field

* add additional fields so SAP and SERP are the same

* update schema

* add search_mode for grouping

* add more columns

Author: kbammarito

sql_generators/serp_events_v2/templates/desktop_query.sql

@@ -97,7 +97,16 @@ impressions AS (
     mozfun.map.get_key(event.extra, 'provider') AS search_engine,
     mozfun.map.get_key(event.extra, 'partner_code') AS partner_code,
     mozfun.map.get_key(event.extra, 'source') AS sap_source,
-    COALESCE(SAFE_CAST(mozfun.map.get_key(event.extra, 'tagged') AS bool), FALSE) AS is_tagged
+    COALESCE(SAFE_CAST(mozfun.map.get_key(event.extra, 'tagged') AS bool), FALSE) AS is_tagged,
+    document_id,
+    mozfun.map.get_key(event.extra, 'overridden_by_third_party') AS overridden_by_third_party,
+    ping_info.start_time as subsession_start_time,
+    ping_info.end_time as subsession_end_time,
+    ping_info.seq AS subsession_counter,
+    mozfun.map.get_key(event.extra, 'search_mode') AS search_mode,
+    normalized_os,
+    normalized_os_version,
+    client_info.first_run_date as first_run_date
   FROM
     serp_events
   WHERE
@@ -253,7 +262,16 @@ SELECT
   browser_engagement_active_ticks,
   browser_engagement_uri_count,
   browser_engagement_tab_open_event_count,
-  browser_engagement_max_concurrent_tab_count
+  browser_engagement_max_concurrent_tab_count,
+  document_id,
+  overridden_by_third_party,
+  subsession_start_time,
+  subsession_end_time,
+  subsession_counter,
+  search_mode,
+  normalized_os,
+  normalized_os_version,
+  first_run_date
 FROM
   -- 1 row per impression_id
   impressions

sql_generators/serp_events_v2/templates/schema.yaml

@@ -206,3 +206,30 @@ fields:
   - mode: NULLABLE
     name: browser_engagement_max_concurrent_tab_count
     type: INTEGER
+  - mode: NULLABLE
+    name: document_id
+    type: STRING
+  - mode: NULLABLE
+    name: overridden_by_third_party
+    type: STRING
+  - mode: NULLABLE
+    name: subsession_start_time
+    type: STRING
+  - mode: NULLABLE
+    name: subsession_end_time
+    type: STRING
+  - mode: NULLABLE
+    name: subsession_counter
+    type: INTEGER
+  - mode: NULLABLE
+    name: search_mode
+    type: STRING
+  - mode: NULLABLE
+    name: normalized_os
+    type: STRING
+  - mode: NULLABLE
+    name: normalized_os_version
+    type: STRING
+  - mode: NULLABLE
+    name: first_run_date
+    type: STRING