Skip to content

Commit 82308b9

Browse files
akkomaredugfilho
andauthored
Bug 1866469 - Exclude use_counters from GLAM ETL (#4603)
* Bug 1866469 - Exclude use_counters from GLAM ETL * Attempt to fix tests --------- Co-authored-by: Eduardo Filho <[email protected]>
1 parent e1a94c9 commit 82308b9

File tree

5 files changed

+20
-17
lines changed

5 files changed

+20
-17
lines changed

script/glam/generate_glean_sql

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,12 @@ function write_clients_daily_aggregates {
6060

6161
# e.g. baseline_v1
6262
local tables;
63+
# we're excluding use_counters because they are not supported in GLAM
64+
# and generated query is too big to run
6365
tables=$(
6466
bq ls "$qualified" \
6567
| grep TABLE \
68+
| grep -v use_counters \
6669
| awk '{print $1}'
6770
)
6871
# generate all of the schemas in parallel

tests/sql/moz-fx-data-shared-prod/fenix_derived/firefox_android_clients_v1/test_baseline_no_first_session_with_activations/expect.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,31 +9,31 @@
99
last_reported_device_model: model-2
1010
last_reported_channel: release
1111
activated: true
12-
install_source: com.android.vending
1312
channel: release
13+
install_source: com.android.vending
1414
metadata:
15+
install_source__source_ping: metrics
16+
install_source__source_ping_datetime: 2023-01-01T00:00:00
17+
min_metrics_ping_submission_date: 2023-01-01
1518
reported_metrics_ping: true
1619
reported_first_session_ping: false
1720
reported_baseline_ping: true
18-
min_metrics_ping_submission_date: 2023-01-01
19-
install_source__source_ping_datetime: '2023-01-01T00:00:00'
20-
install_source__source_ping: metrics
2121
- client_id: client-2
2222
sample_id: 50
2323
first_seen_date: 2022-12-25
2424
submission_date: 2022-12-25
2525
device_model: model-2
26+
last_reported_device_model: model-2
2627
adjust_network: Organic
2728
last_reported_adjust_network: Organic
28-
last_reported_device_model: model-2
2929
activated: false
3030
metadata:
31+
adjust_network__source_ping: metrics
32+
adjust_network__source_ping_datetime: 2023-01-01T00:00:00
3133
reported_metrics_ping: true
3234
reported_first_session_ping: false
3335
reported_baseline_ping: false
3436
min_metrics_ping_submission_date: 2023-01-01
35-
adjust_network__source_ping: metrics
36-
adjust_network__source_ping_datetime: '2023-01-01T00:00:00'
3737
- client_id: client-3
3838
sample_id: 50
3939
adjust_network: Organic

tests/sql/moz-fx-data-shared-prod/fenix_derived/firefox_android_clients_v1/test_first_session_no_baseline/expect.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,18 @@
3030
adjust_network__source_ping_datetime: '2023-05-02T00:00:00'
3131
- client_id: client-3
3232
sample_id: 70
33+
install_source: com.android.vending
3334
first_seen_date: 2023-05-01
3435
submission_date: 2023-05-02
3536
first_run_date: 2023-05-01
3637
last_reported_date: 2023-05-02
3738
last_reported_channel: release
3839
channel: release
3940
activated: false
40-
install_source: com.android.vending
4141
metadata:
42+
install_source__source_ping_datetime: 2023-05-02T00:00:00
43+
min_metrics_ping_submission_date: 2023-05-02
4244
reported_first_session_ping: false
4345
reported_metrics_ping: true
4446
reported_baseline_ping: true
4547
install_source__source_ping: metrics
46-
install_source__source_ping_datetime: '2023-05-02T00:00:00'
47-
min_metrics_ping_submission_date: 2023-05-02

tests/sql/moz-fx-data-shared-prod/fenix_derived/firefox_android_clients_v1/test_first_session_seq/expect.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,20 @@
3131
- client_id: client-3
3232
sample_id: 70
3333
first_seen_date: 2023-05-01
34+
install_source: com.android.vending
3435
submission_date: 2023-05-02
3536
first_run_date: 2023-05-01
3637
last_reported_date: 2023-05-02
3738
last_reported_channel: release
3839
adjust_network: Untrusted Devices
3940
channel: release
4041
activated: false
41-
install_source: com.android.vending
4242
metadata:
4343
reported_first_session_ping: true
4444
reported_metrics_ping: true
4545
reported_baseline_ping: true
4646
install_source__source_ping: metrics
47-
install_source__source_ping_datetime: '2023-05-02T00:00:00'
47+
install_source__source_ping_datetime: 2023-05-02T00:00:00
4848
min_metrics_ping_submission_date: 2023-05-02
4949
min_first_session_ping_submission_date: 2023-05-02
5050
min_first_session_ping_run_date: 2023-05-01

tests/sql/moz-fx-data-shared-prod/fenix_derived/firefox_android_clients_v1/test_only_metrics_ping/expect.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@
99
last_reported_country: CA
1010
sample_id: 54
1111
activated: false
12-
adjust_network: 'Organic'
13-
last_reported_adjust_network: 'Organic'
12+
adjust_network: Organic
13+
last_reported_adjust_network: Organic
1414
channel: release
1515
metadata:
16+
adjust_network__source_ping: metrics
17+
adjust_network__source_ping_datetime: 2023-01-01T00:00:00
18+
min_metrics_ping_submission_date: 2023-01-01
1619
reported_first_session_ping: false
1720
reported_metrics_ping: true
1821
reported_baseline_ping: true
19-
min_metrics_ping_submission_date: 2023-01-01
20-
adjust_network__source_ping_datetime: '2023-01-01T00:00:00'
21-
adjust_network__source_ping: metrics
2222
- client_id: client-2
2323
install_source: 'Test Install Source'
2424
sample_id: 40

0 commit comments

Comments
 (0)