DENG-476 - Update internet outages to reference main_v5 (#4432)

mozilla · Dec 11, 2023 · 1f696af · 1f696af
1 parent 2040cf6
commit 1f696af
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 24 deletions.
diff --git a/dags/bqetl_internet_outages.py b/dags/bqetl_internet_outages.py
@@ -84,10 +84,10 @@
     internet_outages__global_outages__v1.set_upstream(
         wait_for_copy_deduplicate_main_ping
     )
-    wait_for_telemetry_derived__clients_daily__v6 = ExternalTaskSensor(
-        task_id="wait_for_telemetry_derived__clients_daily__v6",
+    wait_for_telemetry_derived__clients_daily_joined__v1 = ExternalTaskSensor(
+        task_id="wait_for_telemetry_derived__clients_daily_joined__v1",
         external_dag_id="bqetl_main_summary",
-        external_task_id="telemetry_derived__clients_daily__v6",
+        external_task_id="telemetry_derived__clients_daily_joined__v1",
         execution_delta=datetime.timedelta(seconds=18000),
         check_existence=True,
         mode="reschedule",
@@ -97,5 +97,5 @@
     )
 
     internet_outages__global_outages__v1.set_upstream(
-        wait_for_telemetry_derived__clients_daily__v6
+        wait_for_telemetry_derived__clients_daily_joined__v1
     )
diff --git a/dags/bqetl_main_summary.py b/dags/bqetl_main_summary.py
@@ -139,13 +139,6 @@
             external_task_id="wait_for_telemetry_derived__clients_daily__v6",
         )
 
-        ExternalTaskMarker(
-            task_id="bqetl_internet_outages__wait_for_telemetry_derived__clients_daily__v6",
-            external_dag_id="bqetl_internet_outages",
-            external_task_id="wait_for_telemetry_derived__clients_daily__v6",
-            execution_date="{{ (execution_date - macros.timedelta(days=-1, seconds=68400)).isoformat() }}",
-        )
-
         ExternalTaskMarker(
             task_id="jetstream__wait_for_clients_daily",
             external_dag_id="jetstream",
@@ -222,6 +215,13 @@
             execution_date="{{ (execution_date - macros.timedelta(seconds=7200)).isoformat() }}",
         )
 
+        ExternalTaskMarker(
+            task_id="bqetl_internet_outages__wait_for_telemetry_derived__clients_daily_joined__v1",
+            external_dag_id="bqetl_internet_outages",
+            external_task_id="wait_for_telemetry_derived__clients_daily_joined__v1",
+            execution_date="{{ (execution_date - macros.timedelta(days=-1, seconds=68400)).isoformat() }}",
+        )
+
         ExternalTaskMarker(
             task_id="bqetl_search__wait_for_telemetry_derived__clients_daily_joined__v1",
             external_dag_id="bqetl_search",

diff --git a/sql/moz-fx-data-shared-prod/internet_outages/global_outages_v1/metadata.yaml b/sql/moz-fx-data-shared-prod/internet_outages/global_outages_v1/metadata.yaml
@@ -62,18 +62,6 @@ labels:
   - '1640204'
 scheduling:
   dag_name: bqetl_internet_outages
-  # provide this value so that DAG generation does not have to dry run the
-  # query to get it, and that would be slow because main_v4 is referenced
-  referenced_tables:
-  - - moz-fx-data-shared-prod
-    - telemetry_stable
-    - main_v4
-  - - moz-fx-data-shared-prod
-    - telemetry_derived
-    - clients_daily_v6
-  - - moz-fx-data-shared-prod
-    - telemetry_stable
-    - health_v4
 bigquery:
   time_partitioning:
     type: day

diff --git a/sql/moz-fx-data-shared-prod/internet_outages/global_outages_v1/query.sql b/sql/moz-fx-data-shared-prod/internet_outages/global_outages_v1/query.sql
@@ -229,7 +229,7 @@ histogram_data_sample AS (
       payload.processes.content.histograms.http_page_tls_handshake
     ).values AS tls_handshake,
   FROM
-    telemetry_stable.main_v4
+    telemetry_stable.main_v5
   WHERE
     DATE(submission_timestamp) = @submission_date
     -- Restrict to Firefox.