From 8f474c79a4ea332b027feb53fabccbb4a053ab8e Mon Sep 17 00:00:00 2001 From: Curtis Morales Date: Wed, 5 Jun 2024 10:40:14 -0400 Subject: [PATCH] Hardcode normalized_os as iOS in event_aggregates (#5725) --- .../event_aggregates_suggest_v1/query.sql | 4 +++- .../contextual_services_derived/event_aggregates_v1/query.sql | 4 +++- .../moz-fx-data-shared-prod.firefox_ios.fx_suggest.yaml | 2 -- .../moz-fx-data-shared-prod.firefox_ios.fx_suggest.yaml | 2 -- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sql/moz-fx-data-shared-prod/contextual_services_derived/event_aggregates_suggest_v1/query.sql b/sql/moz-fx-data-shared-prod/contextual_services_derived/event_aggregates_suggest_v1/query.sql index f339a098ac..eb0ef23ce0 100644 --- a/sql/moz-fx-data-shared-prod/contextual_services_derived/event_aggregates_suggest_v1/query.sql +++ b/sql/moz-fx-data-shared-prod/contextual_services_derived/event_aggregates_suggest_v1/query.sql @@ -134,7 +134,9 @@ combined AS ( 'phone' AS form_factor, normalized_country_code AS country, metrics.string.fx_suggest_advertiser AS advertiser, - SPLIT(metadata.user_agent.os, ' ')[SAFE_OFFSET(0)] AS normalized_os, + -- This is now hardcoded, we can use the derived `normalized_os` once + -- https://bugzilla.mozilla.org/show_bug.cgi?id=1773722 is fixed + 'iOS' AS normalized_os, client_info.app_channel AS release_channel, metrics.quantity.fx_suggest_position AS position, -- Only remote settings is in use on mobile diff --git a/sql/moz-fx-data-shared-prod/contextual_services_derived/event_aggregates_v1/query.sql b/sql/moz-fx-data-shared-prod/contextual_services_derived/event_aggregates_v1/query.sql index 269203b520..3d2e7b431c 100644 --- a/sql/moz-fx-data-shared-prod/contextual_services_derived/event_aggregates_v1/query.sql +++ b/sql/moz-fx-data-shared-prod/contextual_services_derived/event_aggregates_v1/query.sql @@ -158,7 +158,9 @@ combined AS ( 'remote settings' AS provider, -- Only standard suggestions are in use on mobile 'firefox-suggest' AS match_type, - SPLIT(metadata.user_agent.os, ' ')[SAFE_OFFSET(0)] AS normalized_os, + -- This is now hardcoded, we can use the derived `normalized_os` once + -- https://bugzilla.mozilla.org/show_bug.cgi?id=1773722 is fixed + 'iOS' AS normalized_os, -- This is the opt-in for Merino, not in use on mobile CAST(NULL AS BOOLEAN) AS suggest_data_sharing_enabled, blocks.query_type, diff --git a/tests/sql/moz-fx-data-shared-prod/contextual_services_derived/event_aggregates_v1/test_aggregation/moz-fx-data-shared-prod.firefox_ios.fx_suggest.yaml b/tests/sql/moz-fx-data-shared-prod/contextual_services_derived/event_aggregates_v1/test_aggregation/moz-fx-data-shared-prod.firefox_ios.fx_suggest.yaml index ed4393f842..cad94652b6 100644 --- a/tests/sql/moz-fx-data-shared-prod/contextual_services_derived/event_aggregates_v1/test_aggregation/moz-fx-data-shared-prod.firefox_ios.fx_suggest.yaml +++ b/tests/sql/moz-fx-data-shared-prod/contextual_services_derived/event_aggregates_v1/test_aggregation/moz-fx-data-shared-prod.firefox_ios.fx_suggest.yaml @@ -12,8 +12,6 @@ metadata: geo: subdivision1: DC - user_agent: - os: iOS 17 client_info: app_channel: release normalized_country_code: US diff --git a/tests/sql/moz-fx-data-shared-prod/contextual_services_derived/event_aggregates_v1/test_overactive_filter/moz-fx-data-shared-prod.firefox_ios.fx_suggest.yaml b/tests/sql/moz-fx-data-shared-prod/contextual_services_derived/event_aggregates_v1/test_overactive_filter/moz-fx-data-shared-prod.firefox_ios.fx_suggest.yaml index 0e89e59ac7..5872453d79 100644 --- a/tests/sql/moz-fx-data-shared-prod/contextual_services_derived/event_aggregates_v1/test_overactive_filter/moz-fx-data-shared-prod.firefox_ios.fx_suggest.yaml +++ b/tests/sql/moz-fx-data-shared-prod/contextual_services_derived/event_aggregates_v1/test_overactive_filter/moz-fx-data-shared-prod.firefox_ios.fx_suggest.yaml @@ -13,8 +13,6 @@ metadata: geo: subdivision1: DC - user_agent: - os: iOS 17 client_info: app_channel: release normalized_country_code: US