fix: baseline_clients_daily to only grab distribution_id for fenix app (#5614)

sql_generators/glean_usage/common.py

@@ -36,6 +36,8 @@ NO_BASELINE_PING_APPS = (
     "mozregression",
 )
 
+APPS_WITH_DISTRIBUTION_ID = ("fenix",)
+
 
 def write_dataset_metadata(output_dir, full_table_id, derived_dataset_metadata=False):
     """
@@ -238,6 +240,7 @@ class GleanTable:
             project_id=project_id,
             derived_dataset=derived_dataset,
             app_name=app_name,
+            has_distribution_id=app_name in APPS_WITH_DISTRIBUTION_ID,
         )
 
         render_kwargs.update(self.custom_render_kwargs)

sql_generators/glean_usage/templates/baseline_clients_daily_v1.query.sql

@@ -24,7 +24,11 @@ WITH base AS (
     normalized_channel,
     normalized_os,
     normalized_os_version,
+    {% if has_distribution_id %}
+    metrics.string.metrics_distribution_id AS distribution_id,
+    {% else %}
     CAST(NULL AS STRING) AS distribution_id,
+    {% endif %}
     metadata.geo.subdivision1 AS geo_subdivision,
   FROM
     `{{ baseline_table }}`

tests/sql/moz-fx-data-shared-prod/org_mozilla_ios_firefox_derived/baseline_clients_first_seen_v1/test_aggregation/org_mozilla_ios_firefox_stable.baseline_v1.schema.json

@@ -275,12 +275,6 @@
             "type": "STRING",
             "name": "glean_baseline_locale",
             "mode": "NULLABLE"
-          },
-          {
-            "description": "",
-            "type": "STRING",
-            "name": "metrics_distribution_id",
-            "mode": "NULLABLE"
           }
         ],
         "type": "RECORD",

tests/sql/moz-fx-data-shared-prod/org_mozilla_ios_firefox_derived/baseline_clients_first_seen_v1/test_init/org_mozilla_ios_firefox_stable.baseline_v1.schema.json

@@ -275,12 +275,6 @@
             "type": "STRING",
             "name": "glean_baseline_locale",
             "mode": "NULLABLE"
-          },
-          {
-            "description": "",
-            "type": "STRING",
-            "name": "metrics_distribution_id",
-            "mode": "NULLABLE"
           }
         ],
         "type": "RECORD",