Skip to content

feat: update filter for desktop_conversions#9469

Open
kik-kik wants to merge 1 commit into
mainfrom
feat/DENG-10688/desktop_conversion-filter-update
Open

feat: update filter for desktop_conversions#9469
kik-kik wants to merge 1 commit into
mainfrom
feat/DENG-10688/desktop_conversion-filter-update

Conversation

@kik-kik

@kik-kik kik-kik commented May 29, 2026

Copy link
Copy Markdown
Contributor

feat: update filter for desktop_conversions

@kik-kik kik-kik requested a review from scottbedwell May 29, 2026 16:14
@kik-kik kik-kik self-assigned this May 29, 2026

@github-actions github-actions Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR expands the country-allowlist filter used by the firefoxdotcom.desktop_conversion_events view and the fbclid_desktop_conversion_events_export_v1 Python query, growing each list from a handful of countries to ~40, and also reformats a multi-line logging.info call.

Overall the change is mechanical and low-risk — both filter lists are kept alphabetically sorted, which is consistent with the surrounding style. A few things worth a second look before merging:

  • The header comment in view.sql still names only the five original countries and is now misleading.
  • The two country lists are not identical: query.py also includes "China" and "Hong Kong". Worth confirming this is intentional and, if so, capturing the reason in a comment; if not, the two lists should be reconciled.
  • Maintaining two hand-edited copies of essentially the same list invites drift on the next update — a shared source (lookup table, mozfun constant, or generator) would remove that risk.
  • The unrelated logging reformat could live in its own commit to keep this change scoped.

No correctness concerns with the country names themselves (alphabetized, double-quoted, including the correct "Türkiye" spelling). Inline notes on the specific lines.

Comment thread sql/moz-fx-data-shared-prod/firefoxdotcom/desktop_conversion_events/view.sql Outdated
Comment on lines +228 to +236
logging.info(
"Event payload: event_name=%s, event_time=%s, event_id=%s, action_source=%s, fbc=%s"
% (event.event_name, event.event_time, event.event_id, event.action_source, event.user_data.fbc)
% (
event.event_name,
event.event_time,
event.event_id,
event.action_source,
event.user_data.fbc,
)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nitpick: This logging reformat is unrelated to the country-filter change in the PR title/scope. Not a problem, just calling it out — keeping unrelated style tweaks in a separate commit makes the country-list change easier to audit/revert.

@github-actions

This comment has been minimized.

@kik-kik kik-kik force-pushed the feat/DENG-10688/desktop_conversion-filter-update branch 3 times, most recently from 08de809 to da99379 Compare June 9, 2026 15:56
@github-actions

This comment has been minimized.

@github-actions

github-actions Bot commented Jun 9, 2026

Copy link
Copy Markdown
Contributor

Integration report for "feat: update filter for desktop_conversions"

sql.diff

Click to expand!
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/firefoxdotcom/desktop_conversion_events/view.sql /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/firefoxdotcom/desktop_conversion_events/view.sql
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/firefoxdotcom/desktop_conversion_events/view.sql	2026-06-09 16:05:39.125164271 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/firefoxdotcom/desktop_conversion_events/view.sql	2026-06-09 16:05:32.843188710 +0000
@@ -11,17 +11,56 @@
     UNNEST(gclid_array) AS gclid
   WHERE
     country IN (
-      "Australia",
+      "Albania",
       "Argentina",
+      "Australia",
       "Bangladesh",
+      "Bulgaria",
+      "Brazil",
       "Canada",
-      "Japan",
-      "India",
+      "Chile",
+      "China",
+      "Colombia",
+      "Cyprus",
+      "Czechia",
+      "Ecuador",
+      "Estonia",
+      "Finland",
+      "Greece",
+      "Guatemala",
+      "Hong Kong",
+      "Croatia",
+      "Hungary",
       "Indonesia",
+      "India",
+      "Japan",
+      "South Korea",
+      "Lithuania",
+      "Luxembourg",
+      "Latvia",
+      "North Macedonia",
+      "Malta",
       "Mexico",
+      "Malaysia",
+      "Nigeria",
+      "New Zealand",
+      "Panama",
+      "Philippines",
+      "Poland",
+      "Portugal",
+      "Romania",
+      "Sweden",
+      "Singapore",
+      "Slovenia",
+      "Slovakia",
+      "El Salvador",
+      "Thailand",
+      "Türkiye",
+      "Taiwan",
       "United States",
       "Vietnam",
-      "Thailand"
+      "Kosovo",
+      "South Africa"
     )
   GROUP BY
     gclid

Link to full diff

@kik-kik kik-kik force-pushed the feat/DENG-10688/desktop_conversion-filter-update branch from da99379 to 54b55cc Compare June 10, 2026 15:05
@kik-kik kik-kik requested a review from a team as a code owner June 10, 2026 15:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant