From c1c690e3a651e940b68443cef301ae2f8e90411b Mon Sep 17 00:00:00 2001
From: Katie Windau <153020235+kwindau@users.noreply.github.com>
Date: Wed, 21 Aug 2024 12:23:27 -0500
Subject: [PATCH] DENG-4564 add profile_group_id to urlbar_clients_daily_v1
 (#6079)

* DENG-4564 add profile_group_id to urlbar_clients_daily_v1

* DENG-4564 Add description for profile_group_id

* DENG-4564 add profile_group_id to the urlbar_clients_daily_v1 sql tests
---
 .../telemetry_derived/urlbar_clients_daily_v1/query.sql      | 2 ++
 .../telemetry_derived/urlbar_clients_daily_v1/schema.yaml    | 4 ++++
 ...rod.telemetry_derived.clients_daily_joined_v1.schema.json | 5 +++++
 .../test_overactive_filter/expect.yaml                       | 2 ++
 ...hared-prod.telemetry_derived.clients_daily_joined_v1.yaml | 2 ++
 5 files changed, 15 insertions(+)

diff --git a/sql/moz-fx-data-shared-prod/telemetry_derived/urlbar_clients_daily_v1/query.sql b/sql/moz-fx-data-shared-prod/telemetry_derived/urlbar_clients_daily_v1/query.sql
index f8f40a80d7..7611674772 100644
--- a/sql/moz-fx-data-shared-prod/telemetry_derived/urlbar_clients_daily_v1/query.sql
+++ b/sql/moz-fx-data-shared-prod/telemetry_derived/urlbar_clients_daily_v1/query.sql
@@ -35,6 +35,7 @@ WITH combined_urlbar_picked AS (
   SELECT
     submission_date,
     client_id,
+    profile_group_id,
     default_search_engine,
     experiments,
     app_version,
@@ -174,6 +175,7 @@ SELECT
   count_picked_by_type,
   count_picked_by_position,
   urlbar_picked_by_type_by_position,
+  combined_urlbar_picked.profile_group_id
 FROM
   combined_urlbar_picked
 FULL OUTER JOIN
diff --git a/sql/moz-fx-data-shared-prod/telemetry_derived/urlbar_clients_daily_v1/schema.yaml b/sql/moz-fx-data-shared-prod/telemetry_derived/urlbar_clients_daily_v1/schema.yaml
index 126071888b..851af60230 100644
--- a/sql/moz-fx-data-shared-prod/telemetry_derived/urlbar_clients_daily_v1/schema.yaml
+++ b/sql/moz-fx-data-shared-prod/telemetry_derived/urlbar_clients_daily_v1/schema.yaml
@@ -100,3 +100,7 @@ fields:
   mode: REPEATED
   name: experiments
   type: RECORD
+- mode: NULLABLE
+  name: profile_group_id
+  type: STRING
+  description: A UUID identifying the profile's group on a single device and allowing user-oriented correlation of data
diff --git a/tests/sql/moz-fx-data-shared-prod/telemetry_derived/urlbar_clients_daily_v1/moz-fx-data-shared-prod.telemetry_derived.clients_daily_joined_v1.schema.json b/tests/sql/moz-fx-data-shared-prod/telemetry_derived/urlbar_clients_daily_v1/moz-fx-data-shared-prod.telemetry_derived.clients_daily_joined_v1.schema.json
index 86e6651ead..1a0c5883e8 100644
--- a/tests/sql/moz-fx-data-shared-prod/telemetry_derived/urlbar_clients_daily_v1/moz-fx-data-shared-prod.telemetry_derived.clients_daily_joined_v1.schema.json
+++ b/tests/sql/moz-fx-data-shared-prod/telemetry_derived/urlbar_clients_daily_v1/moz-fx-data-shared-prod.telemetry_derived.clients_daily_joined_v1.schema.json
@@ -372,5 +372,10 @@
     "mode": "REPEATED",
     "name": "experiments",
     "type": "RECORD"
+  },
+  {
+    "mode": "NULLABLE",
+    "name": "profile_group_id",
+    "type": "STRING"
   }
 ]
diff --git a/tests/sql/moz-fx-data-shared-prod/telemetry_derived/urlbar_clients_daily_v1/test_overactive_filter/expect.yaml b/tests/sql/moz-fx-data-shared-prod/telemetry_derived/urlbar_clients_daily_v1/test_overactive_filter/expect.yaml
index cf9c5011f7..260cba654b 100644
--- a/tests/sql/moz-fx-data-shared-prod/telemetry_derived/urlbar_clients_daily_v1/test_overactive_filter/expect.yaml
+++ b/tests/sql/moz-fx-data-shared-prod/telemetry_derived/urlbar_clients_daily_v1/test_overactive_filter/expect.yaml
@@ -8,6 +8,7 @@
   locale: "en-US"
   search_region: "US"
   country: "US"
+  profile_group_id: "profile_group_id_1"
   suggest_enabled: true
   in_navbar: true
   suggest_searches: true
@@ -73,6 +74,7 @@
       value: "experiment_value"
 - <<: *base
   client_id: "client_2"
+  profile_group_id: "profile_group_id_2"
   count_picked_total: 21
   count_picked_by_type:
     - key: "autofill"
diff --git a/tests/sql/moz-fx-data-shared-prod/telemetry_derived/urlbar_clients_daily_v1/test_overactive_filter/moz-fx-data-shared-prod.telemetry_derived.clients_daily_joined_v1.yaml b/tests/sql/moz-fx-data-shared-prod/telemetry_derived/urlbar_clients_daily_v1/test_overactive_filter/moz-fx-data-shared-prod.telemetry_derived.clients_daily_joined_v1.yaml
index 31de704148..beb215281c 100644
--- a/tests/sql/moz-fx-data-shared-prod/telemetry_derived/urlbar_clients_daily_v1/test_overactive_filter/moz-fx-data-shared-prod.telemetry_derived.clients_daily_joined_v1.yaml
+++ b/tests/sql/moz-fx-data-shared-prod/telemetry_derived/urlbar_clients_daily_v1/test_overactive_filter/moz-fx-data-shared-prod.telemetry_derived.clients_daily_joined_v1.yaml
@@ -7,6 +7,7 @@
   normalized_channel: "nightly"
   locale: "en-US"
   country: "US"
+  profile_group_id: "profile_group_id_1"
   user_pref_browser_search_region: "US"
   user_pref_browser_search_suggest_enabled: true
   user_pref_browser_widget_in_navbar: true
@@ -41,6 +42,7 @@
       value: "experiment_value"
 - <<: *base
   client_id: "client_2"
+  profile_group_id: "profile_group_id_2"
   scalar_parent_urlbar_picked_autofill_sum:
     - key: "0"
       value: 6