Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use client_info.app_channel for event monitoring channels #4575

Merged
merged 1 commit into from
Nov 16, 2023
Merged

Use client_info.app_channel for event monitoring channels #4575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions sql_generators/glean_usage/templates/event_error_monitoring_aggregates_v1.query.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,7 @@
WITH event_counters AS (
SELECT
DATE(submission_timestamp) AS submission_date,
"{{ dataset['canonical_app_name'] }}" AS normalized_app_name,
{% if app_name == "fenix" -%}
mozfun.norm.fenix_app_info("{{ dataset['bq_dataset_family'] }}", app_build).channel AS channel,
{% else %}
"{{ dataset.get('app_channel', 'release') }}" AS channel,
{% endif %}
client_info.app_channel AS channel,
metrics.labeled_counter
FROM
`{{ project_id }}.{{ dataset['bq_dataset_family'] }}_stable.events_v1`
Expand Down
2 changes: 1 addition & 1 deletion sql_generators/glean_usage/templates/event_monitoring_aggregates_v1.metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ bigquery:
clustering:
fields:
- event_name
- normalized_channel
- channel
- normalized_app_name
12 changes: 4 additions & 8 deletions sql_generators/glean_usage/templates/event_monitoring_aggregates_v1.query.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,7 @@
event_extra.key AS event_extra_key,
normalized_country_code AS country,
"{{ dataset['canonical_app_name'] }}" AS normalized_app_name,
{% if app_name == "fenix" -%}
mozfun.norm.fenix_app_info("{{ dataset['bq_dataset_family'] }}", app_build).channel AS normalized_channel,
{% else %}
"{{ dataset.get('app_channel', 'release') }}" AS normalized_channel,
{% endif %}
client_info.app_channel AS channel,
client_info.app_display_version AS version,
-- Access experiment information.
-- Additional iteration is necessary to aggregate total event count across experiments
Expand Down Expand Up @@ -84,7 +80,7 @@
event_extra_key,
country,
normalized_app_name,
normalized_channel,
channel,
version,
experiment,
experiment_branch
Expand Down Expand Up @@ -121,7 +117,7 @@
CAST(NULL AS STRING) AS event_extra_key,
normalized_country_code AS country,
"{{ dataset['canonical_app_name'] }}" AS normalized_app_name,
normalized_channel,
client_info.app_channel AS channel,
client_info.app_display_version AS version,
-- Access experiment information.
-- Additional iteration is necessary to aggregate total event count across experiments
Expand Down Expand Up @@ -163,7 +159,7 @@
event_extra_key,
country,
normalized_app_name,
normalized_channel,
channel,
version,
experiment,
experiment_branch
Expand Down
4 changes: 2 additions & 2 deletions sql_generators/glean_usage/templates/event_monitoring_live.view.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ SELECT
event_extra_key,
country,
normalized_app_name,
normalized_channel,
channel,
version,
experiment,
experiment_branch,
Expand All @@ -32,7 +32,7 @@ SELECT
event_extra_key,
country,
normalized_app_name,
normalized_channel,
channel,
version,
experiment,
experiment_branch,
Expand Down
6 changes: 3 additions & 3 deletions sql_generators/glean_usage/templates/event_monitoring_live_v1.init.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ IF
event_extra.key AS event_extra_key,
normalized_country_code AS country,
'{{ app_name }}' AS normalized_app_name,
normalized_channel,
client_info.app_channel AS channel,
client_info.app_display_version AS version,
-- Access experiment information.
-- Additional iteration is necessary to aggregate total event count across experiments
Expand Down Expand Up @@ -123,7 +123,7 @@ IF
NULL AS event_extra_key,
normalized_country_code AS country,
'{{ app_name }}' AS normalized_app_name,
normalized_channel,
client_info.app_channel AS channel,
client_info.app_display_version AS VERSION,
-- Access experiment information.
-- Additional iteration is necessary to aggregate total event count across experiments
Expand Down Expand Up @@ -167,7 +167,7 @@ IF
event_extra_key,
country,
normalized_app_name,
normalized_channel,
channel,
version,
experiment,
experiment_branch