CONSVC 1800: Add os to the Contextual Services derived dataset (#3027)

* CONSVC 1800: Add os to the Contextual Services derived dataset

* Review fixes

Co-authored-by: Jeff Klukas <jklukas@mozilla.com>

sql/moz-fx-data-shared-prod/contextual_services_derived/event_aggregates_v1/init.sql

@@ -21,3 +21,4 @@ SELECT
   CAST(NULL AS INT64) AS event_count,
   CAST(NULL AS INT64) AS user_count,
   CAST(NULL AS STRING) AS match_type,
+  CAST(NULL AS STRING) AS normalized_os,

sql/moz-fx-data-shared-prod/contextual_services_derived/event_aggregates_v1/query.sql

@@ -20,6 +20,7 @@ WITH combined AS (
     END
     AS provider,
     match_type,
+    SPLIT(metadata.user_agent.os, ' ')[SAFE_OFFSET(0)] AS normalized_os,
   FROM
     contextual_services.quicksuggest_impression
   UNION ALL
@@ -44,6 +45,7 @@ WITH combined AS (
     END
     AS provider,
     match_type,
+    SPLIT(metadata.user_agent.os, ' ')[SAFE_OFFSET(0)] AS normalized_os,
   FROM
     contextual_services.quicksuggest_click
   UNION ALL
@@ -69,6 +71,7 @@ WITH combined AS (
     AS provider,
     -- `match_type` is only available for `quicksuggest_*` tables
     NULL AS match_type,
+    SPLIT(metadata.user_agent.os, ' ')[SAFE_OFFSET(0)] AS normalized_os,
   FROM
     contextual_services.topsites_impression
   UNION ALL
@@ -94,6 +97,7 @@ WITH combined AS (
     AS provider,
     -- `match_type` is only available for `quicksuggest_*` tables
     NULL AS match_type,
+    SPLIT(metadata.user_agent.os, ' ')[SAFE_OFFSET(0)] AS normalized_os,
   FROM
     contextual_services.topsites_click
   UNION ALL
@@ -123,6 +127,7 @@ WITH combined AS (
     AS provider,
     -- `match_type` is only available for `quicksuggest_*` tables
     NULL AS match_type,
+    normalized_os,
   FROM
     org_mozilla_firefox.topsites_impression
   UNION ALL
@@ -150,6 +155,7 @@ WITH combined AS (
     AS provider,
     -- `match_type` is only available for `quicksuggest_*` tables
     NULL AS match_type,
+    normalized_os,
   FROM
     org_mozilla_firefox_beta.topsites_impression
   UNION ALL
@@ -177,6 +183,7 @@ WITH combined AS (
     AS provider,
     -- `match_type` is only available for `quicksuggest_*` tables
     NULL AS match_type,
+    normalized_os,
   FROM
     org_mozilla_fenix.topsites_impression
 ),
@@ -217,4 +224,5 @@ GROUP BY
   release_channel,
   position,
   provider,
-  match_type
+  match_type,
+  normalized_os

tests/sql/moz-fx-data-shared-prod/contextual_services_derived/event_aggregates_v1/test_aggregation/contextual_services.quicksuggest_click.yaml

@@ -4,6 +4,8 @@
   metadata:
     geo:
       subdivision1: AZ
+    user_agent:
+      os: "Windows 11"
   normalized_country_code: US
   advertiser: ad1
   release_channel: release

tests/sql/moz-fx-data-shared-prod/contextual_services_derived/event_aggregates_v1/test_aggregation/contextual_services.quicksuggest_impression.yaml

@@ -4,6 +4,8 @@
   metadata:
     geo:
       subdivision1: AZ
+    user_agent:
+      os: "Windows 11"
   normalized_country_code: US
   advertiser: ad1
   release_channel: release

tests/sql/moz-fx-data-shared-prod/contextual_services_derived/event_aggregates_v1/test_aggregation/contextual_services.topsites_click.yaml

@@ -4,6 +4,8 @@
   metadata:
     geo:
       subdivision1: AZ
+    user_agent:
+      os: "Windows 11"
   normalized_country_code: US
   advertiser: ad1
   release_channel: release

tests/sql/moz-fx-data-shared-prod/contextual_services_derived/event_aggregates_v1/test_aggregation/contextual_services.topsites_impression.yaml

@@ -5,6 +5,8 @@
   metadata:
     geo:
       subdivision1: AZ
+    user_agent:
+      os: "Windows 11"
   normalized_country_code: US
   advertiser: ad1
   release_channel: release

tests/sql/moz-fx-data-shared-prod/contextual_services_derived/event_aggregates_v1/test_aggregation/expect.yaml

@@ -10,6 +10,7 @@
   advertiser: ad1
   release_channel: release
   match_type: "firefox-suggest"
+  normalized_os: Windows
   position: 1
   event_count: 1
   user_count: 1
@@ -25,6 +26,7 @@
   subdivision1: AZ
   advertiser: ad1
   release_channel: release
+  normalized_os: Windows
   position: 1
   event_count: 1
   user_count: 1
@@ -45,6 +47,7 @@
   subdivision1: NY
   advertiser: ad3
   release_channel: release
+  normalized_os: Android
   position: 1
   event_count: 1
   user_count: 1

tests/sql/moz-fx-data-shared-prod/contextual_services_derived/event_aggregates_v1/test_aggregation/org_mozilla_fenix.topsites_impression.yaml

@@ -16,3 +16,4 @@
     geo:
       subdivision1: NY
   normalized_country_code: US
+  normalized_os: Android

tests/sql/moz-fx-data-shared-prod/contextual_services_derived/event_aggregates_v1/test_aggregation/org_mozilla_firefox.topsites_impression.yaml

@@ -16,3 +16,4 @@
     geo:
       subdivision1: NY
   normalized_country_code: US
+  normalized_os: Android

tests/sql/moz-fx-data-shared-prod/contextual_services_derived/event_aggregates_v1/test_aggregation/org_mozilla_firefox_beta.topsites_impression.yaml

@@ -16,3 +16,4 @@
     geo:
       subdivision1: NY
   normalized_country_code: US
+  normalized_os: Android

tests/sql/moz-fx-data-shared-prod/contextual_services_derived/event_aggregates_v1/test_overactive_filter/contextual_services.quicksuggest_click.yaml

@@ -5,6 +5,8 @@
   metadata:
     geo:
       subdivision1: AZ
+    user_agent:
+      os: "Windows 11"
   normalized_country_code: US
   advertiser: ad1
   release_channel: release

tests/sql/moz-fx-data-shared-prod/contextual_services_derived/event_aggregates_v1/test_overactive_filter/contextual_services.quicksuggest_impression.yaml

@@ -5,6 +5,8 @@
   metadata:
     geo:
       subdivision1: AZ
+    user_agent:
+      os: "Windows 11"
   normalized_country_code: US
   advertiser: ad1
   release_channel: release

tests/sql/moz-fx-data-shared-prod/contextual_services_derived/event_aggregates_v1/test_overactive_filter/contextual_services.topsites_click.yaml

@@ -5,6 +5,8 @@
   metadata:
     geo:
       subdivision1: AZ
+    user_agent:
+      os: "Windows 11"
   normalized_country_code: US
   advertiser: ad1
   release_channel: release

tests/sql/moz-fx-data-shared-prod/contextual_services_derived/event_aggregates_v1/test_overactive_filter/contextual_services.topsites_impression.yaml

@@ -5,6 +5,8 @@
   metadata:
     geo:
       subdivision1: AZ
+    user_agent:
+      os: "Windows 11"
   normalized_country_code: US
   advertiser: ad1
   release_channel: release

tests/sql/moz-fx-data-shared-prod/contextual_services_derived/event_aggregates_v1/test_overactive_filter/expect.yaml

@@ -10,6 +10,7 @@
   advertiser: ad1
   release_channel: release
   match_type: "firefox-suggest"
+  normalized_os: Windows
   position: 1
   event_count: 52
   user_count: 2
@@ -27,6 +28,7 @@
   subdivision1: AZ
   advertiser: ad1
   release_channel: release
+  normalized_os: Windows
   position: 1
   event_count: 52
   user_count: 2
@@ -44,6 +46,7 @@
   subdivision1: NY
   advertiser: ad3
   release_channel: release
+  normalized_os: Android
   position: 1
   event_count: 1
   user_count: 1

tests/sql/moz-fx-data-shared-prod/contextual_services_derived/event_aggregates_v1/test_overactive_filter/org_mozilla_fenix.topsites_impression.yaml

@@ -16,3 +16,4 @@
     geo:
       subdivision1: NY
   normalized_country_code: US
+  normalized_os: Android

tests/sql/moz-fx-data-shared-prod/contextual_services_derived/event_aggregates_v1/test_overactive_filter/org_mozilla_firefox.topsites_impression.yaml

@@ -16,3 +16,4 @@
     geo:
       subdivision1: NY
   normalized_country_code: US
+  normalized_os: Android

tests/sql/moz-fx-data-shared-prod/contextual_services_derived/event_aggregates_v1/test_overactive_filter/org_mozilla_firefox_beta.topsites_impression.yaml

@@ -16,3 +16,4 @@
     geo:
       subdivision1: NY
   normalized_country_code: US
+  normalized_os: Android