Update experiment_search_aggregates to pick up metric configuration f…

…or telemetry (#5600)
mozilla · May 16, 2024 · 77f8fac · 77f8fac
1 parent 645a3ec
commit 77f8fac
Showing 1 changed file with 23 additions and 23 deletions.
diff --git a/sql_generators/experiment_monitoring/templates/experiment_search_aggregates_v1/query.sql b/sql_generators/experiment_monitoring/templates/experiment_search_aggregates_v1/query.sql
@@ -7,30 +7,30 @@ WITH
       submission_timestamp,
       unnested_experiments.key AS experiment,
       unnested_experiments.value AS branch,
-      SUM(
-        (
-          SELECT
-            SUM(value.value)
-          FROM
-            UNNEST(payload.processes.parent.keyed_scalars.browser_search_ad_clicks) AS value
-        )
-      ) AS ad_clicks_count,
-      SUM(
-        (
-          SELECT
-            SUM(value.value)
-          FROM
-            UNNEST(payload.processes.parent.keyed_scalars.browser_search_with_ads) AS value
-        )
-      ) AS search_with_ads_count,
-      SUM(
-        (
-          SELECT
-            SUM(`moz-fx-data-shared-prod`.udf.extract_histogram_sum(value.value))
-          FROM
-            UNNEST(payload.keyed_histograms.search_counts) AS value
+      {% for metric_name, metric in search_metrics['telemetry'].items() -%}
+        {% if metric == None %}
+          SUM(0)
+        {% elif metric_name == "search_count" %}
+        SUM(
+          (
+            SELECT
+              SUM(`moz-fx-data-shared-prod`.udf.extract_histogram_sum(value.value))
+            FROM
+              UNNEST(payload.keyed_histograms.search_counts) AS value
+          )
         )
-      ) AS search_count
+        {% else %}
+          SUM(
+            (
+              SELECT
+                SUM(value.value)
+              FROM
+                UNNEST({{ metric }}) AS value
+            )
+          )
+        {% endif %}
+        AS {{ metric_name }},
+      {% endfor -%}
     FROM
       `moz-fx-data-shared-prod.telemetry_stable.main_v5`
     LEFT JOIN