[DENG-4255] Add mobile search and search_clients_last_seen_v2 to shre…

…dder
mozilla · Jul 12, 2024 · 476f364 · 476f364
1 parent 83b0b2e
commit 476f364
Showing 1 changed file with 28 additions and 4 deletions.
diff --git a/bigquery_etl/shredder/config.py b/bigquery_etl/shredder/config.py
@@ -138,6 +138,24 @@ def fields(self) -> tuple[str, ...]:
         "mozilla_lockbox",
     )
 )
+# mobile search uses Firefox/Focus/Klar for Android and iOS, as well as core pings
+MOBILE_SEARCH_SOURCES = (
+    tuple(
+        DeleteSource(
+            table=f"{app_name}.deletion_request",
+            field=GLEAN_CLIENT_ID,
+        )
+        for app_name in (
+            "fenix",
+            "firefox_ios",
+            "focus_android",
+            "focus_ios",
+            "klar_android",
+            "klar_ios",
+        )
+    )
+    + LEGACY_MOBILE_SOURCES
+)
 USER_CHARACTERISTICS_SRC = DeleteSource(
     table="firefox_desktop_stable.deletion_request_v1",
     field=USER_CHARACTERISTICS_ID,
@@ -155,7 +173,7 @@ def fields(self) -> tuple[str, ...]:
 )
 
 LEGACY_MOBILE_IDS = tuple(CLIENT_ID for _ in LEGACY_MOBILE_SOURCES)
-
+MOBILE_SEARCH_IDS = tuple(CLIENT_ID for _ in MOBILE_SEARCH_SOURCES)
 
 client_id_target = partial(DeleteTarget, field=CLIENT_ID)
 glean_target = partial(DeleteTarget, field=GLEAN_CLIENT_ID)
@@ -167,14 +185,20 @@ def fields(self) -> tuple[str, ...]:
 DELETE_TARGETS: DeleteIndex = {
     # Other
     client_id_target(table="search_derived.acer_cohort_v1"): DESKTOP_SRC,
-    client_id_target(
-        table="search_derived.mobile_search_clients_daily_v1"
-    ): DESKTOP_SRC,
+    DeleteTarget(
+        table="search_derived.mobile_search_clients_daily_v1",
+        field=MOBILE_SEARCH_IDS,
+    ): MOBILE_SEARCH_SOURCES,
+    DeleteTarget(
+        table="search_derived.mobile_search_clients_last_seen_v1",
+        field=MOBILE_SEARCH_IDS,
+    ): MOBILE_SEARCH_SOURCES,
     client_id_target(table="search_derived.search_clients_daily_v8"): DESKTOP_SRC,
     client_id_target(
         table="telemetry_derived.desktop_engagement_clients_v1"
     ): DESKTOP_SRC,
     client_id_target(table="search_derived.search_clients_last_seen_v1"): DESKTOP_SRC,
+    client_id_target(table="search_derived.search_clients_last_seen_v2"): DESKTOP_SRC,
     client_id_target(
         table="telemetry_derived.clients_daily_histogram_aggregates_v1"
     ): DESKTOP_SRC,