Pull country from metrics in quick_suggest ping

[curtismorales]

Description

This PR changes tables that are directly downstream of the quick_suggest tables to pull country from metrics rather than from metadata, in accordance with a change to the ping in Firefox 140.

I still need to update the tests, so I'm leaving this as a draft for now.

Related Tickets & Documents

• AD-869

Reviewer, please follow this checklist

[dataops-ci-bot]

Integration report for "Merge branch 'main' into AD-869-update-suggest-derived-tables"

sql.diff

Click to expand!

diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/contextual_services_derived/event_aggregates_suggest_v1/query.sql /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/contextual_services_derived/event_aggregates_suggest_v1/query.sql
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/contextual_services_derived/event_aggregates_suggest_v1/query.sql	2025-08-07 21:17:07.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/contextual_services_derived/event_aggregates_suggest_v1/query.sql	2025-08-07 21:11:29.000000000 +0000
@@ -14,7 +14,14 @@
     metrics.uuid.quick_suggest_context_id AS context_id,
     DATE(submission_timestamp) AS submission_date,
     'desktop' AS form_factor,
-    normalized_country_code AS country,
+    -- As of Firefox 140, the quick_suggest ping is sent via OHTTP and now
+    -- receives geo information from the client rather than from Glean ingestion's
+    -- IP geolocation. We no longer send subdivision, only country.
+    IF(
+      SAFE_CAST(metadata.user_agent.version AS INT64) >= 140,
+      metrics.string.quick_suggest_country,
+      normalized_country_code
+    ) AS country,
     LOWER(metrics.string.quick_suggest_advertiser) AS advertiser,
     SPLIT(metadata.user_agent.os, ' ')[SAFE_OFFSET(0)] AS normalized_os,
     client_info.app_channel AS release_channel,
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/contextual_services_derived/event_aggregates_v1/query.sql /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/contextual_services_derived/event_aggregates_v1/query.sql
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/contextual_services_derived/event_aggregates_v1/query.sql	2025-08-07 21:17:07.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/contextual_services_derived/event_aggregates_v1/query.sql	2025-08-07 21:11:29.000000000 +0000
@@ -20,8 +20,19 @@
       "impression"
     ) AS event_type,
     'desktop' AS form_factor,
-    normalized_country_code AS country,
-    metadata.geo.subdivision1 AS subdivision1,
+    -- As of Firefox 140, the quick_suggest ping is sent via OHTTP and now
+    -- receives geo information from the client rather than from Glean ingestion's
+    -- IP geolocation. We no longer send subdivision, only country.
+    IF(
+      SAFE_CAST(metadata.user_agent.version AS INT64) >= 140,
+      metrics.string.quick_suggest_country,
+      normalized_country_code
+    ) AS country,
+    IF(
+      SAFE_CAST(metadata.user_agent.version AS INT64) >= 140,
+      CAST(NULL AS STRING),
+      metadata.geo.subdivision1
+    ) AS subdivision1,
     metrics.string.quick_suggest_advertiser AS advertiser,
     client_info.app_channel AS release_channel,
     metrics.quantity.quick_suggest_position AS position,
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/contextual_services_derived/request_payload_suggest_v2/query.sql /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/contextual_services_derived/request_payload_suggest_v2/query.sql
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/contextual_services_derived/request_payload_suggest_v2/query.sql	2025-08-07 21:17:07.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/contextual_services_derived/request_payload_suggest_v2/query.sql	2025-08-07 21:11:29.000000000 +0000
@@ -18,8 +18,19 @@
       "click",
       "impression"
     ) AS interaction_type,
-    metadata.geo.country AS country_code,
-    metadata.geo.subdivision1 AS region_code,
+    -- As of Firefox 140, the quick_suggest ping is sent via OHTTP and now
+    -- receives geo information from the client rather than from Glean ingestion's
+    -- IP geolocation. We no longer send subdivision, only country.
+    IF(
+      SAFE_CAST(metadata.user_agent.version AS INT64) >= 140,
+      metrics.string.quick_suggest_country,
+      metadata.geo.country
+    ) AS country_code,
+    IF(
+      SAFE_CAST(metadata.user_agent.version AS INT64) >= 140,
+      CAST(NULL AS STRING),
+      metadata.geo.subdivision1
+    ) AS region_code,
     metadata.user_agent.os AS os_family,
     metadata.user_agent.version AS product_version,
   FROM
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/search_terms_derived/suggest_impression_sanitized_v3/query.sql /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/search_terms_derived/suggest_impression_sanitized_v3/query.sql
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/search_terms_derived/suggest_impression_sanitized_v3/query.sql	2025-08-07 21:17:07.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/search_terms_derived/suggest_impression_sanitized_v3/query.sql	2025-08-07 21:11:30.000000000 +0000
@@ -45,8 +45,16 @@
     sample_id,
     metrics.boolean.quick_suggest_is_clicked AS is_clicked,
     client_info.locale AS locale,
-    metadata.geo.country,
-    metadata.geo.subdivision1 AS region,
+    IF(
+      SAFE_CAST(metadata.user_agent.version AS INT64) >= 140,
+      metrics.string.quick_suggest_country,
+      metadata.geo.country
+    ) AS country,
+    IF(
+      SAFE_CAST(metadata.user_agent.version AS INT64) >= 140,
+      CAST(NULL AS STRING),
+      metadata.geo.subdivision1
+    ) AS region,
     normalized_os,
     normalized_os_version,
     normalized_channel,

Link to full diff