diff --git a/sql/search/search_aggregates/view.sql b/sql/search/search_aggregates/view.sql index c05a19b07b..71feebc69a 100644 --- a/sql/search/search_aggregates/view.sql +++ b/sql/search/search_aggregates/view.sql @@ -23,7 +23,8 @@ SELECT os_version, IFNULL(client_count, 0) AS client_count, NULL AS default_private_search_engine, - NULL AS normalized_engine + NULL AS normalized_engine, + NULL AS is_default_browser FROM `moz-fx-data-derived-datasets.search.search_aggregates_v6` WHERE diff --git a/sql/search_derived/search_aggregates_v8/query.sql b/sql/search_derived/search_aggregates_v8/query.sql index 59f1f14c13..d7276625b7 100644 --- a/sql/search_derived/search_aggregates_v8/query.sql +++ b/sql/search_derived/search_aggregates_v8/query.sql @@ -13,6 +13,7 @@ SELECT default_private_search_engine, os, os_version, + is_default_browser, COUNT(*) AS client_count, SUM(organic) AS organic, SUM(tagged_sap) AS tagged_sap, @@ -40,4 +41,5 @@ GROUP BY default_search_engine, default_private_search_engine, os, - os_version + os_version, + is_default_browser diff --git a/sql/search_derived/search_clients_daily_v8/query.sql b/sql/search_derived/search_clients_daily_v8/query.sql index cb02c8712e..9114c4299b 100644 --- a/sql/search_derived/search_clients_daily_v8/query.sql +++ b/sql/search_derived/search_clients_daily_v8/query.sql @@ -159,6 +159,7 @@ WITH udf_mode_last(ARRAY_AGG(os) OVER w1) AS os, udf_mode_last(ARRAY_AGG(os_version) OVER w1) AS os_version, udf_mode_last(ARRAY_AGG(channel) OVER w1) AS channel, + udf_mode_last(ARRAY_AGG(is_default_browser) OVER w1) AS is_default_browser, udf_mode_last(ARRAY_AGG(profile_creation_date) OVER w1) AS profile_creation_date, udf_mode_last(ARRAY_AGG(default_search_engine) OVER w1) AS default_search_engine, udf_mode_last(ARRAY_AGG(default_search_engine_data_load_path) OVER w1) AS default_search_engine_data_load_path, diff --git a/templates/search/search_aggregates/view.sql b/templates/search/search_aggregates/view.sql index c05a19b07b..71feebc69a 100644 --- a/templates/search/search_aggregates/view.sql +++ b/templates/search/search_aggregates/view.sql @@ -23,7 +23,8 @@ SELECT os_version, IFNULL(client_count, 0) AS client_count, NULL AS default_private_search_engine, - NULL AS normalized_engine + NULL AS normalized_engine, + NULL AS is_default_browser FROM `moz-fx-data-derived-datasets.search.search_aggregates_v6` WHERE diff --git a/templates/search_derived/search_aggregates_v8/query.sql b/templates/search_derived/search_aggregates_v8/query.sql index 59f1f14c13..d7276625b7 100644 --- a/templates/search_derived/search_aggregates_v8/query.sql +++ b/templates/search_derived/search_aggregates_v8/query.sql @@ -13,6 +13,7 @@ SELECT default_private_search_engine, os, os_version, + is_default_browser, COUNT(*) AS client_count, SUM(organic) AS organic, SUM(tagged_sap) AS tagged_sap, @@ -40,4 +41,5 @@ GROUP BY default_search_engine, default_private_search_engine, os, - os_version + os_version, + is_default_browser diff --git a/templates/search_derived/search_clients_daily_v8/query.sql b/templates/search_derived/search_clients_daily_v8/query.sql index cfcb51b9e4..d467534dc6 100644 --- a/templates/search_derived/search_clients_daily_v8/query.sql +++ b/templates/search_derived/search_clients_daily_v8/query.sql @@ -121,6 +121,7 @@ WITH udf_mode_last(ARRAY_AGG(os) OVER w1) AS os, udf_mode_last(ARRAY_AGG(os_version) OVER w1) AS os_version, udf_mode_last(ARRAY_AGG(channel) OVER w1) AS channel, + udf_mode_last(ARRAY_AGG(is_default_browser) OVER w1) AS is_default_browser, udf_mode_last(ARRAY_AGG(profile_creation_date) OVER w1) AS profile_creation_date, udf_mode_last(ARRAY_AGG(default_search_engine) OVER w1) AS default_search_engine, udf_mode_last(ARRAY_AGG(default_search_engine_data_load_path) OVER w1) AS default_search_engine_data_load_path, diff --git a/tests/search_derived/search_aggregates_v8/test_aggregation/expect.ndjson b/tests/search_derived/search_aggregates_v8/test_aggregation/expect.ndjson index 4ada9735ed..8c876faf0b 100644 --- a/tests/search_derived/search_aggregates_v8/test_aggregation/expect.ndjson +++ b/tests/search_derived/search_aggregates_v8/test_aggregation/expect.ndjson @@ -1,5 +1,5 @@ -{"submission_date": "2017-01-01", "addon_version": "0.9.5", "app_version": "54.0.1", "country": "DE", "engine": "bing", "normalized_engine": "Bing", "locale": "de", "source": "urlbar", "default_search_engine": "google", "os": "windows", "os_version": "10.0", "client_count": 1, "organic": 0, "tagged_sap": 0, "tagged_follow_on": 0, "sap": 4, "ad_click": 0, "search_with_ads": 0, "unknown": 0} -{"submission_date": "2017-01-01", "addon_version": "0.9.5", "app_version": "54.0.1", "country": "DE", "distribution_id": "totally not null", "engine": "google", "normalized_engine": "Google", "locale": "de", "source": "urlbar", "default_search_engine": "google", "os": "windows", "os_version": "10.0", "client_count": 1, "organic": 0, "tagged_sap": 0, "tagged_follow_on": 0, "sap": 28, "ad_click": 0, "search_with_ads": 0, "unknown": 0} -{"submission_date": "2017-01-01", "addon_version": "0.9.5", "app_version": "54.0.1", "country": "DE", "engine": "yahoo", "normalized_engine": "Other", "locale": "de", "source": "urlbar", "default_search_engine": "google", "os": "windows", "os_version": "10.0", "client_count": 1, "organic": 0, "tagged_sap": 0, "tagged_follow_on": 0, "sap": 4, "ad_click": 0, "search_with_ads": 0, "unknown": 0} -{"submission_date": "2017-01-01", "addon_version": "0.9.6", "app_version": "54.0.1", "country": "US", "engine": "google", "normalized_engine": "Google", "locale": "de", "source": "urlbar", "default_search_engine": "google", "os": "windows", "os_version": "10.0", "client_count": 1, "organic": 0, "tagged_sap": 0, "tagged_follow_on": 0, "sap": 4, "ad_click": 0, "search_with_ads": 0, "unknown": 0} -{"submission_date": "2017-01-01", "app_version": "54.0.1", "country": "DE", "engine": "yahoo", "normalized_engine": "Other", "locale": "de", "source": "urlbar", "default_search_engine": "google", "os": "windows", "os_version": "10.0", "client_count": 1, "organic": 0, "tagged_sap": 0, "tagged_follow_on": 0, "sap": 4, "ad_click": 0, "search_with_ads": 0, "unknown": 0, "default_private_search_engine": "engine1"} +{"submission_date": "2017-01-01", "addon_version": "0.9.5", "app_version": "54.0.1", "country": "DE", "engine": "bing", "normalized_engine": "Bing", "locale": "de", "source": "urlbar", "default_search_engine": "google", "os": "windows", "os_version": "10.0", "client_count": 1, "organic": 0, "tagged_sap": 0, "tagged_follow_on": 0, "sap": 4, "ad_click": 0, "search_with_ads": 0, "unknown": 0, "is_default_browser": false} +{"submission_date": "2017-01-01", "addon_version": "0.9.5", "app_version": "54.0.1", "country": "DE", "distribution_id": "totally not null", "engine": "google", "normalized_engine": "Google", "locale": "de", "source": "urlbar", "default_search_engine": "google", "os": "windows", "os_version": "10.0", "client_count": 1, "organic": 0, "tagged_sap": 0, "tagged_follow_on": 0, "sap": 28, "ad_click": 0, "search_with_ads": 0, "unknown": 0, "is_default_browser": false} +{"submission_date": "2017-01-01", "addon_version": "0.9.5", "app_version": "54.0.1", "country": "DE", "engine": "yahoo", "normalized_engine": "Other", "locale": "de", "source": "urlbar", "default_search_engine": "google", "os": "windows", "os_version": "10.0", "client_count": 1, "organic": 0, "tagged_sap": 0, "tagged_follow_on": 0, "sap": 4, "ad_click": 0, "search_with_ads": 0, "unknown": 0, "is_default_browser": false} +{"submission_date": "2017-01-01", "addon_version": "0.9.6", "app_version": "54.0.1", "country": "US", "engine": "google", "normalized_engine": "Google", "locale": "de", "source": "urlbar", "default_search_engine": "google", "os": "windows", "os_version": "10.0", "client_count": 1, "organic": 0, "tagged_sap": 0, "tagged_follow_on": 0, "sap": 4, "ad_click": 0, "search_with_ads": 0, "unknown": 0, "is_default_browser": false} +{"submission_date": "2017-01-01", "app_version": "54.0.1", "country": "DE", "engine": "yahoo", "normalized_engine": "Other", "locale": "de", "source": "urlbar", "default_search_engine": "google", "os": "windows", "os_version": "10.0", "client_count": 2, "organic": 0, "tagged_sap": 0, "tagged_follow_on": 0, "sap": 8, "ad_click": 0, "search_with_ads": 0, "unknown": 0, "default_private_search_engine": "engine1", "is_default_browser": true} diff --git a/tests/search_derived/search_aggregates_v8/test_aggregation/search_clients_daily_v8.ndjson b/tests/search_derived/search_aggregates_v8/test_aggregation/search_clients_daily_v8.ndjson index 71264bafda..5294b39eca 100644 --- a/tests/search_derived/search_aggregates_v8/test_aggregation/search_clients_daily_v8.ndjson +++ b/tests/search_derived/search_aggregates_v8/test_aggregation/search_clients_daily_v8.ndjson @@ -1,6 +1,7 @@ -{"engine": "google", "normalized_engine": "Google", "locale": "de", "default_search_engine_data_submission_url": "https://www.google.com/search?q=&ie=utf-8&oe=utf-8&client=firefox-b", "user_pref_browser_search_region": "DE", "sample_id": 42, "sap": 4, "default_search_engine_data_load_path": "jar:[app]/omni.ja!browser/google.xml", "os_version": "10.0", "source": "urlbar", "default_search_engine": "google", "app_version": "54.0.1", "channel": "release", "submission_date": "2017-01-01", "client_id": "b", "country": "US", "profile_age_in_days": 366, "profile_creation_date": 16801, "os": "windows", "organic": 0, "tagged_sap": 0, "tagged_follow_on": 0, "ad_click": 0, "search_with_ads": 0, "unknown": 0, "addon_version": "0.9.6"} -{"engine": "google", "normalized_engine": "Google", "locale": "de", "default_search_engine_data_submission_url": "https://www.google.com/search?q=&ie=utf-8&oe=utf-8&client=firefox-b", "user_pref_browser_search_region": "DE", "sample_id": 42, "sap": 28, "default_search_engine_data_load_path": "jar:[app]/omni.ja!browser/google.xml", "os_version": "10.0", "source": "urlbar", "default_search_engine": "google", "app_version": "54.0.1", "channel": "release", "submission_date": "2017-01-01", "client_id": "a", "country": "DE", "profile_age_in_days": 366, "profile_creation_date": 16801, "os": "windows", "organic": 0, "tagged_sap": 0, "tagged_follow_on": 0, "ad_click": 0, "search_with_ads": 0, "unknown": 0, "distribution_id": "totally not null", "addon_version": "0.9.5"} -{"engine": "bing", "normalized_engine": "Bing", "locale": "de", "default_search_engine_data_submission_url": "https://www.google.com/search?q=&ie=utf-8&oe=utf-8&client=firefox-b", "user_pref_browser_search_region": "DE", "sample_id": 42, "sap": 4, "default_search_engine_data_load_path": "jar:[app]/omni.ja!browser/google.xml", "os_version": "10.0", "source": "urlbar", "default_search_engine": "google", "app_version": "54.0.1", "channel": "release", "submission_date": "2017-01-01", "client_id": "a", "country": "DE", "profile_age_in_days": 366, "profile_creation_date": 16801, "os": "windows", "organic": 0, "tagged_sap": 0, "tagged_follow_on": 0, "ad_click": 0, "search_with_ads": 0, "unknown": 0, "addon_version": "0.9.5"} -{"engine": "yahoo", "normalized_engine": "Other", "locale": "de", "default_search_engine_data_submission_url": "https://www.google.com/search?q=&ie=utf-8&oe=utf-8&client=firefox-b", "user_pref_browser_search_region": "DE", "sample_id": 42, "sap": 4, "default_search_engine_data_load_path": "jar:[app]/omni.ja!browser/google.xml", "os_version": "10.0", "source": "urlbar", "default_search_engine": "google", "app_version": "54.0.1", "channel": "release", "submission_date": "2017-01-01", "client_id": "a", "country": "DE", "profile_age_in_days": 366, "profile_creation_date": 16801, "os": "windows", "organic": 0, "tagged_sap": 0, "tagged_follow_on": 0, "ad_click": 0, "search_with_ads": 0, "unknown": 0, "addon_version": "0.9.5"} -{"locale": "de", "default_search_engine_data_submission_url": "https://www.google.com/search?q=&ie=utf-8&oe=utf-8&client=firefox-b", "sample_id": 42, "default_search_engine_data_load_path": "jar:[app]/omni.ja!browser/google.xml", "os_version": "10.0", "default_search_engine": "google", "app_version": "54.0.1", "channel": "release", "submission_date": "2017-01-01", "client_id": "c", "country": "DE", "profile_age_in_days": 366, "profile_creation_date": 16801, "os": "windows", "organic": 0, "tagged_sap": 0, "tagged_follow_on": 0, "ad_click": 0, "search_with_ads": 0, "unknown": 0, "sap": 0} -{"engine": "yahoo", "normalized_engine": "Other", "locale": "de", "default_search_engine_data_submission_url": "https://www.google.com/search?q=&ie=utf-8&oe=utf-8&client=firefox-b", "sample_id": 42, "default_search_engine_data_load_path": "jar:[app]/omni.ja!browser/google.xml", "os_version": "10.0", "source": "urlbar", "default_search_engine": "google", "app_version": "54.0.1", "channel": "release", "submission_date": "2017-01-01", "client_id": "c", "country": "DE", "profile_age_in_days": 366, "profile_creation_date": 16801, "os": "windows", "organic": 0, "tagged_sap": 0, "tagged_follow_on": 0, "ad_click": 0, "search_with_ads": 0, "unknown": 0, "sap": 4, "default_private_search_engine": "engine1", "default_private_search_engine_data_load_path": "engine1.load_path", "default_private_search_engine_data_submission_url": "https://www.engine.com"} +{"engine": "google", "normalized_engine": "Google", "locale": "de", "default_search_engine_data_submission_url": "https://www.google.com/search?q=&ie=utf-8&oe=utf-8&client=firefox-b", "user_pref_browser_search_region": "DE", "sample_id": 42, "sap": 4, "default_search_engine_data_load_path": "jar:[app]/omni.ja!browser/google.xml", "os_version": "10.0", "source": "urlbar", "default_search_engine": "google", "app_version": "54.0.1", "channel": "release", "submission_date": "2017-01-01", "client_id": "b", "country": "US", "profile_age_in_days": 366, "profile_creation_date": 16801, "os": "windows", "organic": 0, "tagged_sap": 0, "tagged_follow_on": 0, "ad_click": 0, "search_with_ads": 0, "unknown": 0, "addon_version": "0.9.6", "is_default_browser": false} +{"engine": "google", "normalized_engine": "Google", "locale": "de", "default_search_engine_data_submission_url": "https://www.google.com/search?q=&ie=utf-8&oe=utf-8&client=firefox-b", "user_pref_browser_search_region": "DE", "sample_id": 42, "sap": 28, "default_search_engine_data_load_path": "jar:[app]/omni.ja!browser/google.xml", "os_version": "10.0", "source": "urlbar", "default_search_engine": "google", "app_version": "54.0.1", "channel": "release", "submission_date": "2017-01-01", "client_id": "a", "country": "DE", "profile_age_in_days": 366, "profile_creation_date": 16801, "os": "windows", "organic": 0, "tagged_sap": 0, "tagged_follow_on": 0, "ad_click": 0, "search_with_ads": 0, "unknown": 0, "distribution_id": "totally not null", "addon_version": "0.9.5", "is_default_browser": false} +{"engine": "bing", "normalized_engine": "Bing", "locale": "de", "default_search_engine_data_submission_url": "https://www.google.com/search?q=&ie=utf-8&oe=utf-8&client=firefox-b", "user_pref_browser_search_region": "DE", "sample_id": 42, "sap": 4, "default_search_engine_data_load_path": "jar:[app]/omni.ja!browser/google.xml", "os_version": "10.0", "source": "urlbar", "default_search_engine": "google", "app_version": "54.0.1", "channel": "release", "submission_date": "2017-01-01", "client_id": "a", "country": "DE", "profile_age_in_days": 366, "profile_creation_date": 16801, "os": "windows", "organic": 0, "tagged_sap": 0, "tagged_follow_on": 0, "ad_click": 0, "search_with_ads": 0, "unknown": 0, "addon_version": "0.9.5", "is_default_browser": false} +{"engine": "yahoo", "normalized_engine": "Other", "locale": "de", "default_search_engine_data_submission_url": "https://www.google.com/search?q=&ie=utf-8&oe=utf-8&client=firefox-b", "user_pref_browser_search_region": "DE", "sample_id": 42, "sap": 4, "default_search_engine_data_load_path": "jar:[app]/omni.ja!browser/google.xml", "os_version": "10.0", "source": "urlbar", "default_search_engine": "google", "app_version": "54.0.1", "channel": "release", "submission_date": "2017-01-01", "client_id": "a", "country": "DE", "profile_age_in_days": 366, "profile_creation_date": 16801, "os": "windows", "organic": 0, "tagged_sap": 0, "tagged_follow_on": 0, "ad_click": 0, "search_with_ads": 0, "unknown": 0, "addon_version": "0.9.5", "is_default_browser": false} +{"locale": "de", "default_search_engine_data_submission_url": "https://www.google.com/search?q=&ie=utf-8&oe=utf-8&client=firefox-b", "sample_id": 42, "default_search_engine_data_load_path": "jar:[app]/omni.ja!browser/google.xml", "os_version": "10.0", "default_search_engine": "google", "app_version": "54.0.1", "channel": "release", "submission_date": "2017-01-01", "client_id": "c", "country": "DE", "profile_age_in_days": 366, "profile_creation_date": 16801, "os": "windows", "organic": 0, "tagged_sap": 0, "tagged_follow_on": 0, "ad_click": 0, "search_with_ads": 0, "unknown": 0, "sap": 0, "is_default_browser": false} +{"engine": "yahoo", "normalized_engine": "Other", "locale": "de", "default_search_engine_data_submission_url": "https://www.google.com/search?q=&ie=utf-8&oe=utf-8&client=firefox-b", "sample_id": 42, "default_search_engine_data_load_path": "jar:[app]/omni.ja!browser/google.xml", "os_version": "10.0", "source": "urlbar", "default_search_engine": "google", "app_version": "54.0.1", "channel": "release", "submission_date": "2017-01-01", "client_id": "c", "country": "DE", "profile_age_in_days": 366, "profile_creation_date": 16801, "os": "windows", "organic": 0, "tagged_sap": 0, "tagged_follow_on": 0, "ad_click": 0, "search_with_ads": 0, "unknown": 0, "sap": 4, "default_private_search_engine": "engine1", "default_private_search_engine_data_load_path": "engine1.load_path", "default_private_search_engine_data_submission_url": "https://www.engine.com", "is_default_browser": true} +{"engine": "yahoo", "normalized_engine": "Other", "locale": "de", "default_search_engine_data_submission_url": "https://www.google.com/search?q=&ie=utf-8&oe=utf-8&client=firefox-b", "sample_id": 42, "default_search_engine_data_load_path": "jar:[app]/omni.ja!browser/google.xml", "os_version": "10.0", "source": "urlbar", "default_search_engine": "google", "app_version": "54.0.1", "channel": "release", "submission_date": "2017-01-01", "client_id": "c2", "country": "DE", "profile_age_in_days": 366, "profile_creation_date": 16801, "os": "windows", "organic": 0, "tagged_sap": 0, "tagged_follow_on": 0, "ad_click": 0, "search_with_ads": 0, "unknown": 0, "sap": 4, "default_private_search_engine": "engine1", "default_private_search_engine_data_load_path": "engine1.load_path", "default_private_search_engine_data_submission_url": "https://www.engine.com", "is_default_browser": true} diff --git a/tests/search_derived/search_aggregates_v8/test_aggregation/search_clients_daily_v8.schema.json b/tests/search_derived/search_aggregates_v8/test_aggregation/search_clients_daily_v8.schema.json index d29e687af6..6261e9fd1c 100644 --- a/tests/search_derived/search_aggregates_v8/test_aggregation/search_clients_daily_v8.schema.json +++ b/tests/search_derived/search_aggregates_v8/test_aggregation/search_clients_daily_v8.schema.json @@ -188,5 +188,10 @@ "type": "INTEGER", "name": "total_uri_count", "mode": "NULLABLE" + }, + { + "type": "BOOLEAN", + "name": "is_default_browser", + "mode": "NULLABLE" } ] diff --git a/tests/search_derived/search_clients_daily_v8/test_aggregation/expect.ndjson b/tests/search_derived/search_clients_daily_v8/test_aggregation/expect.ndjson index 83549f5b2d..c44dca397f 100644 --- a/tests/search_derived/search_clients_daily_v8/test_aggregation/expect.ndjson +++ b/tests/search_derived/search_clients_daily_v8/test_aggregation/expect.ndjson @@ -1,4 +1,4 @@ -{"engine": "google", "normalized_engine": "Google", "locale": "de", "default_search_engine_data_submission_url": "https://www.google.com/search?q=&ie=utf-8&oe=utf-8&client=firefox-b", "user_pref_browser_search_region": "DE", "sample_id": 42, "sap": 4, "default_search_engine_data_load_path": "jar:[app]/omni.ja!browser/google.xml", "os_version": "10.0", "source": "urlbar", "default_search_engine": "google", "app_version": "54.0.1", "channel": "release", "submission_date": "2017-01-01", "client_id": "b", "country": "US", "profile_age_in_days": 366, "profile_creation_date": 16801, "os": "windows", "organic": 0, "tagged_sap": 0, "tagged_follow_on": 0, "ad_click": 0, "search_with_ads": 0, "unknown": 0, "addon_version": "0.9.6", "subsession_hours_sum": 1.0,"sessions_started_on_this_day": 1,"active_addons_count_mean": 2.0,"max_concurrent_tab_count_max": 10,"tab_open_event_count_sum": 5,"active_hours_sum": 0.5,"total_uri_count": 1} +{"engine": "google", "normalized_engine": "Google", "locale": "de", "default_search_engine_data_submission_url": "https://www.google.com/search?q=&ie=utf-8&oe=utf-8&client=firefox-b", "user_pref_browser_search_region": "DE", "sample_id": 42, "sap": 4, "default_search_engine_data_load_path": "jar:[app]/omni.ja!browser/google.xml", "os_version": "10.0", "source": "urlbar", "default_search_engine": "google", "app_version": "54.0.1", "channel": "release", "submission_date": "2017-01-01", "client_id": "b", "country": "US", "profile_age_in_days": 366, "profile_creation_date": 16801, "os": "windows", "organic": 0, "tagged_sap": 0, "tagged_follow_on": 0, "ad_click": 0, "search_with_ads": 0, "unknown": 0, "addon_version": "0.9.6", "subsession_hours_sum": 1.0,"sessions_started_on_this_day": 1,"active_addons_count_mean": 2.0,"max_concurrent_tab_count_max": 10,"tab_open_event_count_sum": 5,"active_hours_sum": 0.5,"total_uri_count": 1, "is_default_browser": false} {"engine": "google", "normalized_engine": "Google", "locale": "de", "default_search_engine_data_submission_url": "https://www.google.com/search?q=&ie=utf-8&oe=utf-8&client=firefox-b", "user_pref_browser_search_region": "DE", "sample_id": 42, "sap": 28, "default_search_engine_data_load_path": "jar:[app]/omni.ja!browser/google.xml", "os_version": "10.0", "source": "urlbar", "default_search_engine": "google", "app_version": "54.0.1", "channel": "release", "submission_date": "2017-01-01", "client_id": "a", "country": "DE", "profile_age_in_days": 366, "profile_creation_date": 16801, "os": "windows", "organic": 0, "tagged_sap": 0, "tagged_follow_on": 0, "ad_click": 0, "search_with_ads": 0, "unknown": 0, "distribution_id": "totally not null", "addon_version": "0.9.5", "subsession_hours_sum": 8.0, "sessions_started_on_this_day": 8, "active_addons_count_mean": 2.0, "max_concurrent_tab_count_max": 10, "tab_open_event_count_sum": 40, "active_hours_sum": 4.0, "total_uri_count": 16} {"engine": "bing", "normalized_engine": "Bing", "locale": "de", "default_search_engine_data_submission_url": "https://www.google.com/search?q=&ie=utf-8&oe=utf-8&client=firefox-b", "user_pref_browser_search_region": "DE", "sample_id": 42, "sap": 4, "default_search_engine_data_load_path": "jar:[app]/omni.ja!browser/google.xml", "os_version": "10.0", "source": "urlbar", "default_search_engine": "google", "app_version": "54.0.1", "channel": "release", "submission_date": "2017-01-01", "client_id": "a", "country": "DE", "profile_age_in_days": 366, "profile_creation_date": 16801, "os": "windows", "organic": 0, "tagged_sap": 0, "tagged_follow_on": 0, "ad_click": 0, "search_with_ads": 0, "unknown": 0, "addon_version": "0.9.5", "subsession_hours_sum": 8.0, "sessions_started_on_this_day": 8, "active_addons_count_mean": 2.0, "max_concurrent_tab_count_max": 10, "tab_open_event_count_sum": 40, "active_hours_sum": 4.0, "total_uri_count": 16} {"engine": "yahoo", "normalized_engine": "Other", "locale": "de", "default_search_engine_data_submission_url": "https://www.google.com/search?q=&ie=utf-8&oe=utf-8&client=firefox-b", "user_pref_browser_search_region": "DE", "sample_id": 42, "sap": 4, "default_search_engine_data_load_path": "jar:[app]/omni.ja!browser/google.xml", "os_version": "10.0", "source": "urlbar", "default_search_engine": "google", "app_version": "54.0.1", "channel": "release", "submission_date": "2017-01-01", "client_id": "a", "country": "DE", "profile_age_in_days": 366, "profile_creation_date": 16801, "os": "windows", "organic": 0, "tagged_sap": 0, "tagged_follow_on": 0, "ad_click": 0, "search_with_ads": 0, "unknown": 0, "addon_version": "0.9.5", "subsession_hours_sum": 8.0, "sessions_started_on_this_day": 8, "active_addons_count_mean": 2.0, "max_concurrent_tab_count_max": 10, "tab_open_event_count_sum": 40, "active_hours_sum": 4.0, "total_uri_count": 16} @@ -6,4 +6,4 @@ {"engine": "google", "normalized_engine": "Google", "locale": "de", "default_search_engine_data_submission_url": "https://www.google.com/search?q=&ie=utf-8&oe=utf-8&client=firefox-b", "user_pref_browser_search_region": "DE", "sample_id": 42, "sap": 8, "default_search_engine_data_load_path": "jar:[app]/omni.ja!browser/google.xml", "os_version": "10.0", "source": "urlbar", "default_search_engine": "google", "app_version": "54.0.1", "channel": "release", "submission_date": "2017-01-01", "client_id": "d", "country": "DE", "profile_age_in_days": 366, "profile_creation_date": 16801, "os": "windows", "organic": 0, "tagged_sap": 0, "tagged_follow_on": 0, "ad_click": 0, "search_with_ads": 0, "unknown": 0, "addon_version": "0.9.4", "subsession_hours_sum": 3.0, "sessions_started_on_this_day": 3, "active_addons_count_mean": 2.0, "max_concurrent_tab_count_max": 10, "tab_open_event_count_sum": 15, "active_hours_sum": 1.5, "total_uri_count": 7} {"engine": "bing", "normalized_engine": "Bing", "locale": "de", "default_search_engine_data_submission_url": "https://www.google.com/search?q=&ie=utf-8&oe=utf-8&client=firefox-b", "user_pref_browser_search_region": "DE", "sample_id": 42, "sap": 4, "default_search_engine_data_load_path": "jar:[app]/omni.ja!browser/google.xml", "os_version": "10.0", "source": "urlbar", "default_search_engine": "google", "app_version": "54.0.1", "channel": "release", "submission_date": "2017-01-01", "client_id": "d", "country": "DE", "profile_age_in_days": 366, "profile_creation_date": 16801, "os": "windows", "organic": 0, "tagged_sap": 0, "tagged_follow_on": 0, "ad_click": 0, "search_with_ads": 0, "unknown": 0, "addon_version": "0.9.4", "subsession_hours_sum": 3.0, "sessions_started_on_this_day": 3, "active_addons_count_mean": 2.0, "max_concurrent_tab_count_max": 10, "tab_open_event_count_sum": 15, "active_hours_sum": 1.5, "total_uri_count": 7} {"engine": "yahoo", "normalized_engine": "Other", "locale": "de", "default_search_engine_data_submission_url": "https://www.google.com/search?q=&ie=utf-8&oe=utf-8&client=firefox-b", "user_pref_browser_search_region": "DE", "sample_id": 42, "sap": 4, "default_search_engine_data_load_path": "jar:[app]/omni.ja!browser/google.xml", "os_version": "10.0", "source": "urlbar", "default_search_engine": "google", "app_version": "54.0.1", "channel": "release", "submission_date": "2017-01-01", "client_id": "d", "country": "DE", "profile_age_in_days": 366, "profile_creation_date": 16801, "os": "windows", "organic": 0, "tagged_sap": 0, "tagged_follow_on": 0, "ad_click": 0, "search_with_ads": 0, "unknown": 0, "addon_version": "0.9.4", "subsession_hours_sum": 3.0, "sessions_started_on_this_day": 3, "active_addons_count_mean": 2.0, "max_concurrent_tab_count_max": 10, "tab_open_event_count_sum": 15, "active_hours_sum": 1.5, "total_uri_count": 7} -{"engine": "google", "normalized_engine": "Google", "locale": "de", "default_search_engine_data_submission_url": "https://www.google.com/search?q=&ie=utf-8&oe=utf-8&client=firefox-b", "user_pref_browser_search_region": "DE", "sample_id": 42, "sap": 4, "default_search_engine_data_load_path": "jar:[app]/omni.ja!browser/google.xml", "os_version": "10.0", "source": "urlbar", "default_search_engine": "google", "app_version": "54.0.1", "channel": "release", "submission_date": "2017-01-01", "client_id": "e", "country": "DE", "profile_age_in_days": 366, "profile_creation_date": 16801, "os": "windows", "organic": 0, "tagged_sap": 0, "tagged_follow_on": 0, "ad_click": 0, "search_with_ads": 0, "unknown": 0, "default_private_search_engine": "engine1", "default_private_search_engine_data_load_path": "engine1.load_path", "default_private_search_engine_data_submission_url": "https://www.engine.com", "subsession_hours_sum": 1.0, "sessions_started_on_this_day": 1, "active_addons_count_mean": 2.0, "max_concurrent_tab_count_max": 10, "tab_open_event_count_sum": 5, "active_hours_sum": 0.5, "total_uri_count": 2} +{"engine": "google", "normalized_engine": "Google", "locale": "de", "default_search_engine_data_submission_url": "https://www.google.com/search?q=&ie=utf-8&oe=utf-8&client=firefox-b", "user_pref_browser_search_region": "DE", "sample_id": 42, "sap": 4, "default_search_engine_data_load_path": "jar:[app]/omni.ja!browser/google.xml", "os_version": "10.0", "source": "urlbar", "default_search_engine": "google", "app_version": "54.0.1", "channel": "release", "submission_date": "2017-01-01", "client_id": "e", "country": "DE", "profile_age_in_days": 366, "profile_creation_date": 16801, "os": "windows", "organic": 0, "tagged_sap": 0, "tagged_follow_on": 0, "ad_click": 0, "search_with_ads": 0, "unknown": 0, "default_private_search_engine": "engine1", "default_private_search_engine_data_load_path": "engine1.load_path", "default_private_search_engine_data_submission_url": "https://www.engine.com", "subsession_hours_sum": 1.0, "sessions_started_on_this_day": 1, "active_addons_count_mean": 2.0, "max_concurrent_tab_count_max": 10, "tab_open_event_count_sum": 5, "active_hours_sum": 0.5, "total_uri_count": 2, "is_default_browser": true} diff --git a/tests/search_derived/search_clients_daily_v8/test_aggregation/telemetry.main_summary.ndjson b/tests/search_derived/search_clients_daily_v8/test_aggregation/telemetry.main_summary.ndjson index 0ba3640a3e..2cf13b379c 100644 --- a/tests/search_derived/search_clients_daily_v8/test_aggregation/telemetry.main_summary.ndjson +++ b/tests/search_derived/search_clients_daily_v8/test_aggregation/telemetry.main_summary.ndjson @@ -1,4 +1,4 @@ -{"locale": "de", "default_search_engine_data_submission_url": "https://www.google.com/search?q=&ie=utf-8&oe=utf-8&client=firefox-b", "submission_date": "2017-01-01", "user_pref_browser_search_region": "DE", "subsession_length": 3600, "search_cohort": null, "scalar_parent_browser_search_with_ads": [], "sample_id": 42, "default_search_engine_data_load_path": "jar:[app]/omni.ja!browser/google.xml", "os_version": "10.0", "distribution_id": null, "default_search_engine": "google", "app_version": "54.0.1", "channel": "release", "scalar_parent_browser_search_ad_clicks": [], "active_ticks": 360, "search_counts": [{"engine": "google", "source": "urlbar", "count": 4}], "scalar_parent_browser_engagement_max_concurrent_tab_count": 10, "client_id": "b", "document_id": "x", "scalar_parent_browser_engagement_tab_open_event_count": 5, "active_addons_count": 2, "country": "US", "subsession_start_date": "2017-01-01 10:00:00", "subsession_counter": 1, "profile_creation_date": 16801, "os": "windows", "active_addons": [{"addon_id": "random@mozilla.com", "version": "0.1", "name": "random"}, {"addon_id": "followonsearch@mozilla.com", "version": "0.9.6", "name": "Follow-on Search Telemetry"}], "scalar_parent_browser_engagement_total_uri_count": 1, "experiments": [{"key": "exp1", "value": "active"}]} +{"locale": "de", "default_search_engine_data_submission_url": "https://www.google.com/search?q=&ie=utf-8&oe=utf-8&client=firefox-b", "submission_date": "2017-01-01", "user_pref_browser_search_region": "DE", "subsession_length": 3600, "search_cohort": null, "scalar_parent_browser_search_with_ads": [], "sample_id": 42, "default_search_engine_data_load_path": "jar:[app]/omni.ja!browser/google.xml", "os_version": "10.0", "distribution_id": null, "default_search_engine": "google", "app_version": "54.0.1", "channel": "release", "scalar_parent_browser_search_ad_clicks": [], "active_ticks": 360, "search_counts": [{"engine": "google", "source": "urlbar", "count": 4}], "scalar_parent_browser_engagement_max_concurrent_tab_count": 10, "client_id": "b", "document_id": "x", "scalar_parent_browser_engagement_tab_open_event_count": 5, "active_addons_count": 2, "country": "US", "subsession_start_date": "2017-01-01 10:00:00", "subsession_counter": 1, "profile_creation_date": 16801, "os": "windows", "active_addons": [{"addon_id": "random@mozilla.com", "version": "0.1", "name": "random"}, {"addon_id": "followonsearch@mozilla.com", "version": "0.9.6", "name": "Follow-on Search Telemetry"}], "scalar_parent_browser_engagement_total_uri_count": 1, "experiments": [{"key": "exp1", "value": "active"}], "is_default_browser": false} {"locale": "de", "default_search_engine_data_submission_url": "https://www.google.com/search?q=&ie=utf-8&oe=utf-8&client=firefox-b", "submission_date": "2017-01-01", "user_pref_browser_search_region": "DE", "subsession_length": 3600, "search_cohort": null, "scalar_parent_browser_search_with_ads": [], "sample_id": 42, "default_search_engine_data_load_path": "jar:[app]/omni.ja!browser/google.xml", "os_version": "10.0", "distribution_id": null, "default_search_engine": "google", "app_version": "52.0.3", "channel": "release", "scalar_parent_browser_search_ad_clicks": [], "active_ticks": 360, "search_counts": [{"engine": "google", "source": "urlbar", "count": 4}], "scalar_parent_browser_engagement_max_concurrent_tab_count": 10, "client_id": "a", "document_id": "x", "scalar_parent_browser_engagement_tab_open_event_count": 5, "active_addons_count": 2, "country": "DE", "subsession_start_date": "2017-01-01 10:00:00", "subsession_counter": 1, "profile_creation_date": 16801, "os": "windows", "active_addons": [{"addon_id": "random@mozilla.com", "version": "0.1", "name": "random"}, {"addon_id": "followonsearch@mozilla.com", "version": "0.9.5", "name": "Follow-on Search Telemetry"}], "scalar_parent_browser_engagement_total_uri_count": 2, "experiments": []} {"locale": "de", "default_search_engine_data_submission_url": "https://www.google.com/search?q=&ie=utf-8&oe=utf-8&client=firefox-b", "submission_date": "2017-01-01", "user_pref_browser_search_region": "DE", "subsession_length": 3600, "search_cohort": null, "scalar_parent_browser_search_with_ads": [], "sample_id": 42, "default_search_engine_data_load_path": "jar:[app]/omni.ja!browser/google.xml", "os_version": "10.0", "distribution_id": "totally not null", "default_search_engine": "google", "app_version": "54.0.1", "channel": "release", "scalar_parent_browser_search_ad_clicks": [], "active_ticks": 360, "search_counts": [{"engine": "google", "source": "urlbar", "count": 4}], "scalar_parent_browser_engagement_max_concurrent_tab_count": 10, "client_id": "a", "document_id": "x", "scalar_parent_browser_engagement_tab_open_event_count": 5, "active_addons_count": 2, "country": "DE", "subsession_start_date": "2017-01-01 10:00:00", "subsession_counter": 1, "profile_creation_date": 16801, "os": "windows", "active_addons": [{"addon_id": "random@mozilla.com", "version": "0.1", "name": "random"}, {"addon_id": "followonsearch@mozilla.com", "version": "0.9.5", "name": "Follow-on Search Telemetry"}], "scalar_parent_browser_engagement_total_uri_count": 2, "experiments": []} {"locale": "de", "default_search_engine_data_submission_url": "https://www.google.com/search?q=&ie=utf-8&oe=utf-8&client=firefox-b", "submission_date": "2017-01-01", "user_pref_browser_search_region": "DE", "subsession_length": 3600, "search_cohort": null, "scalar_parent_browser_search_with_ads": [], "sample_id": 42, "default_search_engine_data_load_path": "jar:[app]/omni.ja!browser/google.xml", "os_version": "10.0", "distribution_id": null, "default_search_engine": "google", "app_version": "54.0.1", "channel": "release", "scalar_parent_browser_search_ad_clicks": [], "active_ticks": 360, "search_counts": [{"engine": "bing", "source": "urlbar", "count": 4}, {"engine": "yahoo", "source": "urlbar", "count": 4}], "scalar_parent_browser_engagement_max_concurrent_tab_count": 10, "client_id": "a", "document_id": "x", "scalar_parent_browser_engagement_tab_open_event_count": 5, "active_addons_count": 2, "country": "DE", "subsession_start_date": "2017-01-01 10:00:00", "subsession_counter": 1, "profile_creation_date": 16801, "os": "windows", "active_addons": [{"addon_id": "random@mozilla.com", "version": "0.1", "name": "random"}, {"addon_id": "followonsearch@mozilla.com", "version": "0.9.5", "name": "Follow-on Search Telemetry"}], "scalar_parent_browser_engagement_total_uri_count": 2, "experiments": []} @@ -11,4 +11,4 @@ {"locale": "de", "default_search_engine_data_submission_url": "https://www.google.com/search?q=&ie=utf-8&oe=utf-8&client=firefox-b", "submission_date": "2017-01-01", "user_pref_browser_search_region": "DE", "subsession_length": 3600, "search_cohort": null, "scalar_parent_browser_search_with_ads": [], "sample_id": 42, "default_search_engine_data_load_path": "jar:[app]/omni.ja!browser/google.xml", "os_version": "10.0", "distribution_id": null, "default_search_engine": "google", "app_version": "54.0.1", "channel": "release", "scalar_parent_browser_search_ad_clicks": [], "active_ticks": 360, "search_counts": [{"engine": "google", "source": "urlbar", "count": 4}, {"engine": "bing", "source": "urlbar", "count": 4}], "scalar_parent_browser_engagement_max_concurrent_tab_count": 10, "client_id": "d", "document_id": "x", "scalar_parent_browser_engagement_tab_open_event_count": 5, "active_addons_count": 2, "country": "DE", "subsession_start_date": "2017-01-01 10:00:00", "subsession_counter": 1, "profile_creation_date": 16801, "os": "windows", "active_addons": [{"addon_id": "followonsearch@mozilla.com", "version": "0.9.4", "name": "Follow-on Search Telemetry"}, {"addon_id": "followonsearch@mozilla.com", "version": "0.9.4", "name": "Follow-on Search Telemetry"}], "scalar_parent_browser_engagement_total_uri_count": 3, "experiments": [{"key": "exp1", "value": "active"}, {"key": "exp3", "value": "active"}]} {"locale": "de", "default_search_engine_data_submission_url": "https://www.google.com/search?q=&ie=utf-8&oe=utf-8&client=firefox-b", "submission_date": "2017-01-01", "user_pref_browser_search_region": "DE", "subsession_length": 3600, "search_cohort": null, "scalar_parent_browser_search_with_ads": [], "sample_id": 42, "default_search_engine_data_load_path": "jar:[app]/omni.ja!browser/google.xml", "os_version": "10.0", "distribution_id": null, "default_search_engine": "google", "app_version": "54.0.1", "channel": "release", "scalar_parent_browser_search_ad_clicks": [], "active_ticks": 360, "search_counts": [{"engine": "google", "source": "urlbar", "count": 4}], "scalar_parent_browser_engagement_max_concurrent_tab_count": 10, "client_id": "d", "document_id": "x", "scalar_parent_browser_engagement_tab_open_event_count": 5, "active_addons_count": 2, "country": "DE", "subsession_start_date": "2017-01-01 10:00:00", "subsession_counter": 1, "profile_creation_date": 16801, "os": "windows", "active_addons": [{"addon_id": "followonsearch@mozilla.com", "version": "0.9.4", "name": "Follow-on Search Telemetry"}, {"addon_id": "followonsearch@mozilla.com", "version": "0.9.4", "name": "Follow-on Search Telemetry"}], "scalar_parent_browser_engagement_total_uri_count": 2, "experiments": [{"key": "exp1", "value": "active"}, {"key": "exp2", "value": "active"}]} {"locale": "de", "default_search_engine_data_submission_url": "https://www.google.com/search?q=&ie=utf-8&oe=utf-8&client=firefox-b", "submission_date": "2017-01-01", "user_pref_browser_search_region": "DE", "subsession_length": 3600, "search_cohort": null, "scalar_parent_browser_search_with_ads": [], "sample_id": 42, "default_search_engine_data_load_path": "jar:[app]/omni.ja!browser/google.xml", "os_version": "10.0", "distribution_id": null, "default_search_engine": "google", "app_version": "54.0.1", "channel": "release", "scalar_parent_browser_search_ad_clicks": [], "active_ticks": 360, "search_counts": [{"engine": "yahoo", "source": "urlbar", "count": 4}], "scalar_parent_browser_engagement_max_concurrent_tab_count": 10, "client_id": "d", "document_id": "x", "scalar_parent_browser_engagement_tab_open_event_count": 5, "active_addons_count": 2, "country": "DE", "subsession_start_date": "2017-01-01 10:00:00", "subsession_counter": 1, "profile_creation_date": 16801, "os": "windows", "active_addons": [{"addon_id": "followonsearch@mozilla.com", "version": "0.9.4", "name": "Follow-on Search Telemetry"}, {"addon_id": "followonsearch@mozilla.com", "version": "0.9.4", "name": "Follow-on Search Telemetry"}], "scalar_parent_browser_engagement_total_uri_count": 2, "experiments": [{"key": "exp4", "value": "active"}]} -{"locale": "de", "default_search_engine_data_submission_url": "https://www.google.com/search?q=&ie=utf-8&oe=utf-8&client=firefox-b", "submission_date": "2017-01-01", "user_pref_browser_search_region": "DE", "subsession_length": 3600, "search_cohort": null, "scalar_parent_browser_search_with_ads": [], "sample_id": 42, "default_search_engine_data_load_path": "jar:[app]/omni.ja!browser/google.xml", "os_version": "10.0", "distribution_id": null, "default_search_engine": "google", "app_version": "54.0.1", "channel": "release", "scalar_parent_browser_search_ad_clicks": [], "active_ticks": 360, "search_counts": [{"engine": "google", "source": "urlbar", "count": 4}], "scalar_parent_browser_engagement_max_concurrent_tab_count": 10, "client_id": "e", "document_id": "x", "scalar_parent_browser_engagement_tab_open_event_count": 5, "active_addons_count": 2, "country": "DE", "subsession_start_date": "2017-01-01 10:00:00", "subsession_counter": 1, "profile_creation_date": 16801, "os": "windows", "active_addons": [], "scalar_parent_browser_engagement_total_uri_count": 2, "experiments": [], "default_private_search_engine_data_submission_url": "https://www.engine.com", "default_private_search_engine_data_load_path": "engine1.load_path", "default_private_search_engine": "engine1"} +{"locale": "de", "default_search_engine_data_submission_url": "https://www.google.com/search?q=&ie=utf-8&oe=utf-8&client=firefox-b", "submission_date": "2017-01-01", "user_pref_browser_search_region": "DE", "subsession_length": 3600, "search_cohort": null, "scalar_parent_browser_search_with_ads": [], "sample_id": 42, "default_search_engine_data_load_path": "jar:[app]/omni.ja!browser/google.xml", "os_version": "10.0", "distribution_id": null, "default_search_engine": "google", "app_version": "54.0.1", "channel": "release", "scalar_parent_browser_search_ad_clicks": [], "active_ticks": 360, "search_counts": [{"engine": "google", "source": "urlbar", "count": 4}], "scalar_parent_browser_engagement_max_concurrent_tab_count": 10, "client_id": "e", "document_id": "x", "scalar_parent_browser_engagement_tab_open_event_count": 5, "active_addons_count": 2, "country": "DE", "subsession_start_date": "2017-01-01 10:00:00", "subsession_counter": 1, "profile_creation_date": 16801, "os": "windows", "active_addons": [], "scalar_parent_browser_engagement_total_uri_count": 2, "experiments": [], "default_private_search_engine_data_submission_url": "https://www.engine.com", "default_private_search_engine_data_load_path": "engine1.load_path", "default_private_search_engine": "engine1", "is_default_browser": true} diff --git a/tests/search_derived/search_clients_daily_v8/test_aggregation/telemetry.main_summary.schema.json b/tests/search_derived/search_clients_daily_v8/test_aggregation/telemetry.main_summary.schema.json index 66d4748d2a..1cf15d4b69 100644 --- a/tests/search_derived/search_clients_daily_v8/test_aggregation/telemetry.main_summary.schema.json +++ b/tests/search_derived/search_clients_daily_v8/test_aggregation/telemetry.main_summary.schema.json @@ -70,6 +70,11 @@ "name": "locale", "mode": "NULLABLE" }, + { + "type": "BOOLEAN", + "name": "is_default_browser", + "mode": "NULLABLE" + }, { "type": "STRING", "name": "default_search_engine",