This commit is contained in:
Anna Scholtz 2021-12-20 15:40:57 -08:00
Родитель 8fa323719f
Коммит f6da873783
87 изменённых файлов: 81 добавлений и 7715 удалений

Просмотреть файл

@ -61,7 +61,7 @@ jobs:
name: Move generated-sql into place
command: |
rm -rf sql/
cp -r /tmp/workspace/generated-sql/sql sql
cp -r /tmp/workspace/generated-sql/sql sql
- run:
name: Verify that SQL is correctly formatted
command: |
@ -188,6 +188,26 @@ jobs:
paths:
- ~/.m2
key: *mvn_cache_key
generate-dags:
docker: *docker
steps:
- checkout
- *restore_venv_cache
- *build
- *restore_mvn_cache
- *java_deps
- *attach_generated_sql
- *copy_generated_sql
- run:
name: Generate DAGs
command: PATH="venv/bin:$PATH" script/generate_airflow_dags
# this task is overwriting the content produced by generate-sql;
# the behaviour here is additive, generated DAGs are just added to
# the generated-sql output
- persist_to_workspace:
root: /tmp/workspace
paths:
- generated-sql
validate-dags:
# based on
# https://github.com/mozilla/telemetry-airflow/blob/main/.circleci/config.yml
@ -217,6 +237,8 @@ jobs:
command: |
git clone https://github.com/mozilla/telemetry-airflow.git
cp -a dags/. telemetry-airflow/dags/
- *attach_generated_sql
- *copy_generated_sql
- run:
command: |
cd telemetry-airflow
@ -230,6 +252,7 @@ jobs:
cd telemetry-airflow
bash bin/test-parse
verify-dags-up-to-date:
# todo: remove this step once we rely on generate-dags completely
docker: *docker
steps:
- checkout
@ -308,7 +331,7 @@ jobs:
--output-dir /tmp/workspace/generated-sql/sql/ \
--target-project moz-fx-data-shared-prod
PATH="venv/bin:$PATH" script/bqetl dependency record \
--skip-existing
--skip-existing \
"/tmp/workspace/generated-sql/sql/"
- persist_to_workspace:
root: /tmp/workspace
@ -336,7 +359,7 @@ jobs:
git commit -m "Auto-push due to change on main branch [ci skip]" \
&& git push \
|| echo "Skipping push since it looks like there were no changes"
deploy:
executor: docker/docker
steps:
@ -392,8 +415,8 @@ jobs:
mkdir -p /tmp/workspace/private-generated-sql
cp -r sql/ /tmp/workspace/private-generated-sql/sql
# Don't depend on dry run for PRs
PATH="venv/bin:$PATH" ./script/generate_sql \
--sql-dir /tmp/workspace/private-generated-sql/sql/ \
PATH="venv/bin:$PATH" script/bqetl generate all \
--output-dir /tmp/workspace/private-generated-sql/sql/ \
--target-project moz-fx-data-shared-prod
- persist_to_workspace:
root: /tmp/workspace
@ -543,7 +566,9 @@ workflows:
requires:
- generate-sql
- integration
- validate-dags
- validate-dags:
requires:
- generate-dags
- verify-dags-up-to-date
- validate-docs:
requires:
@ -564,6 +589,9 @@ workflows:
filters:
branches:
ignore: main
- generate-dags:
requires:
- generate-sql
- docs:
requires:
- generate-sql
@ -607,3 +635,4 @@ workflows:
- private-generate-sql
# can't run in parallel because CIRCLE_BUILD_NUM is same
- build
- generate-sql

Просмотреть файл

@ -1 +0,0 @@
{}

Просмотреть файл

@ -1,6 +0,0 @@
{
"glean-js": {
"name": "glean-js",
"type": "dependency"
}
}

Просмотреть файл

@ -1,98 +0,0 @@
{
"custom": {
"history": [
{
"bugs": [
"https://github.com/mozilla-extensions/bergamot-browser-extension/issues/42"
],
"data_reviews": [
"https://bugzilla.mozilla.org/show_bug.cgi?id=1694813"
],
"dates": {
"first": "2021-03-10 15:28:11",
"last": "2021-03-10 15:28:11"
},
"description": "A custom ping, sending time is fully controlled by the application.\n",
"git-commits": {
"first": "575285a56fcb5451eaa005e16c97781038e0fc84",
"last": "575285a56fcb5451eaa005e16c97781038e0fc84"
},
"include_client_id": true,
"metadata": {},
"no_lint": [],
"notification_emails": [
"anatal-all@mozilla.com"
],
"reasons": {},
"reflog-index": {
"first": 1,
"last": 1
},
"send_if_empty": false,
"source_url": "https://github.com/mozilla-extensions/bergamot-browser-extension/blob/575285a56fcb5451eaa005e16c97781038e0fc84/src/core/ts/background-scripts/background.js/telemetry/pings.yaml#L12"
},
{
"bugs": [
"https://github.com/mozilla-extensions/firefox-translations/issues/42"
],
"data_reviews": [
"https://bugzilla.mozilla.org/show_bug.cgi?id=1694813"
],
"dates": {
"first": "2021-06-10 20:58:23",
"last": "2021-06-10 20:58:23"
},
"description": "A custom ping, sending time is fully controlled by the application.\n",
"git-commits": {
"first": "20dbd50ad6c7c56e5b86572757ac920778fee3be",
"last": "20dbd50ad6c7c56e5b86572757ac920778fee3be"
},
"include_client_id": true,
"metadata": {},
"no_lint": [],
"notification_emails": [
"anatal-all@mozilla.com"
],
"reasons": {},
"reflog-index": {
"first": 0,
"last": 0
},
"send_if_empty": false,
"source_url": "https://github.com/mozilla-extensions/bergamot-browser-extension/blob/20dbd50ad6c7c56e5b86572757ac920778fee3be/src/core/ts/background-scripts/background.js/telemetry/pings.yaml#L12"
},
{
"bugs": [
"https://github.com/mozilla-extensions/firefox-translations/issues/42"
],
"data_reviews": [
"https://bugzilla.mozilla.org/show_bug.cgi?id=1694813"
],
"dates": {
"first": "2021-09-07 20:31:22",
"last": "2021-09-07 20:31:22"
},
"description": "A custom ping, sending time is fully controlled by the application.\n",
"git-commits": {
"first": "2afd6c500391e5dca292d618f4e6c1750f3bae96",
"last": "2afd6c500391e5dca292d618f4e6c1750f3bae96"
},
"include_client_id": true,
"metadata": {},
"no_lint": [],
"notification_emails": [
"anatal-all@mozilla.com"
],
"reasons": {},
"reflog-index": {
"first": 0,
"last": 0
},
"send_if_empty": false,
"source_url": "https://github.com/mozilla-extensions/bergamot-browser-extension/blob/2afd6c500391e5dca292d618f4e6c1750f3bae96/src/core/ts/background-scripts/background.js/telemetry/pings.yaml#L12"
}
],
"in-source": true,
"name": "custom"
}
}

Просмотреть файл

@ -1 +0,0 @@
{}

Просмотреть файл

@ -1,42 +0,0 @@
{
"gecko": {
"name": "gecko",
"type": "dependency"
},
"glean-core": {
"name": "glean-core",
"type": "dependency"
},
"nimbus": {
"name": "nimbus",
"type": "dependency"
},
"org.mozilla.appservices:logins": {
"name": "org.mozilla.appservices:logins",
"type": "dependency"
},
"org.mozilla.components:browser-engine-gecko": {
"name": "org.mozilla.components:browser-engine-gecko",
"type": "dependency"
},
"org.mozilla.components:lib-crash": {
"name": "org.mozilla.components:lib-crash",
"type": "dependency"
},
"org.mozilla.components:places": {
"name": "org.mozilla.components:places",
"type": "dependency"
},
"org.mozilla.components:service-glean": {
"name": "org.mozilla.components:service-glean",
"type": "dependency"
},
"org.mozilla.components:support-migration": {
"name": "org.mozilla.components:support-migration",
"type": "dependency"
},
"org.mozilla.components:support-sync-telemetry": {
"name": "org.mozilla.components:support-sync-telemetry",
"type": "dependency"
}
}

Разница между файлами не показана из-за своего большого размера Загрузить разницу

Просмотреть файл

@ -1,18 +0,0 @@
{
"glean-core": {
"name": "glean-core",
"type": "dependency"
},
"nimbus": {
"name": "nimbus",
"type": "dependency"
},
"org.mozilla.components:lib-crash": {
"name": "org.mozilla.components:lib-crash",
"type": "dependency"
},
"org.mozilla.components:service-glean": {
"name": "org.mozilla.components:service-glean",
"type": "dependency"
}
}

Просмотреть файл

@ -1,68 +0,0 @@
{
"activation": {
"history": [
{
"bugs": [
"https://github.com/mozilla-mobile/focus-android/issues/4545"
],
"data_reviews": [
"https://github.com/mozilla-mobile/focus-android/issues/4901"
],
"dates": {
"first": "2021-06-15 14:24:05",
"last": "2021-06-15 14:24:05"
},
"description": "This ping is intended to provide a measure of the activation of mobile\nproducts. It's generated when Focus starts, right after Glean is\ninitialized.\n",
"git-commits": {
"first": "7addc87b2645c1c66769bb1b32afc4931c6fcbbd",
"last": "7addc87b2645c1c66769bb1b32afc4931c6fcbbd"
},
"include_client_id": false,
"metadata": {},
"no_lint": [],
"notification_emails": [
"jalmeida@mozilla.com"
],
"reasons": {},
"reflog-index": {
"first": 0,
"last": 0
},
"send_if_empty": false,
"source_url": "https://github.com/mozilla-mobile/focus-android/blob/7addc87b2645c1c66769bb1b32afc4931c6fcbbd/app/pings.yaml#L7"
},
{
"bugs": [
"https://github.com/mozilla-mobile/focus-android/issues/4545"
],
"data_reviews": [
"https://github.com/mozilla-mobile/focus-android/issues/4901"
],
"dates": {
"first": "2021-12-12 19:53:45",
"last": "2021-12-12 19:53:45"
},
"description": "This ping is intended to provide a measure of the activation of mobile\nproducts. It's generated when Focus starts, right after Glean is\ninitialized.\n",
"git-commits": {
"first": "aaa496badf2f1d7e3affc226e37e0dcf5987096f",
"last": "aaa496badf2f1d7e3affc226e37e0dcf5987096f"
},
"include_client_id": false,
"metadata": {},
"no_lint": [],
"notification_emails": [
"jalmeida@mozilla.com"
],
"reasons": {},
"reflog-index": {
"first": 0,
"last": 0
},
"send_if_empty": false,
"source_url": "https://github.com/mozilla-mobile/focus-android/blob/aaa496badf2f1d7e3affc226e37e0dcf5987096f/app/pings.yaml#L7"
}
],
"in-source": true,
"name": "activation"
}
}

Просмотреть файл

@ -1,10 +0,0 @@
{
"glean-core": {
"name": "glean-core",
"type": "dependency"
},
"nimbus": {
"name": "nimbus",
"type": "dependency"
}
}

Просмотреть файл

@ -1 +0,0 @@
{}

Просмотреть файл

@ -1,10 +0,0 @@
{
"glean-core": {
"name": "glean-core",
"type": "dependency"
},
"org.mozilla.components:service-glean": {
"name": "org.mozilla.components:service-glean",
"type": "dependency"
}
}

Просмотреть файл

@ -1 +0,0 @@
{}

Просмотреть файл

@ -1,10 +0,0 @@
{
"glean-core": {
"name": "glean-core",
"type": "dependency"
},
"org.mozilla.components:service-glean": {
"name": "org.mozilla.components:service-glean",
"type": "dependency"
}
}

Просмотреть файл

@ -1 +0,0 @@
{}

Просмотреть файл

@ -1,18 +0,0 @@
{
"glean-core": {
"name": "glean-core",
"type": "dependency"
},
"nimbus": {
"name": "nimbus",
"type": "dependency"
},
"org.mozilla.appservices:logins": {
"name": "org.mozilla.appservices:logins",
"type": "dependency"
},
"org.mozilla.components:service-glean": {
"name": "org.mozilla.components:service-glean",
"type": "dependency"
}
}

Просмотреть файл

@ -1 +0,0 @@
{}

Просмотреть файл

@ -1,18 +0,0 @@
{
"glean-core": {
"name": "glean-core",
"type": "dependency"
},
"nimbus": {
"name": "nimbus",
"type": "dependency"
},
"org.mozilla.components:lib-crash": {
"name": "org.mozilla.components:lib-crash",
"type": "dependency"
},
"org.mozilla.components:service-glean": {
"name": "org.mozilla.components:service-glean",
"type": "dependency"
}
}

Просмотреть файл

@ -1,68 +0,0 @@
{
"activation": {
"history": [
{
"bugs": [
"https://github.com/mozilla-mobile/focus-android/issues/4545"
],
"data_reviews": [
"https://github.com/mozilla-mobile/focus-android/issues/4901"
],
"dates": {
"first": "2021-06-15 14:24:05",
"last": "2021-06-15 14:24:05"
},
"description": "This ping is intended to provide a measure of the activation of mobile\nproducts. It's generated when Focus starts, right after Glean is\ninitialized.\n",
"git-commits": {
"first": "7addc87b2645c1c66769bb1b32afc4931c6fcbbd",
"last": "7addc87b2645c1c66769bb1b32afc4931c6fcbbd"
},
"include_client_id": false,
"metadata": {},
"no_lint": [],
"notification_emails": [
"jalmeida@mozilla.com"
],
"reasons": {},
"reflog-index": {
"first": 0,
"last": 0
},
"send_if_empty": false,
"source_url": "https://github.com/mozilla-mobile/focus-android/blob/7addc87b2645c1c66769bb1b32afc4931c6fcbbd/app/pings.yaml#L7"
},
{
"bugs": [
"https://github.com/mozilla-mobile/focus-android/issues/4545"
],
"data_reviews": [
"https://github.com/mozilla-mobile/focus-android/issues/4901"
],
"dates": {
"first": "2021-12-12 19:53:45",
"last": "2021-12-12 19:53:45"
},
"description": "This ping is intended to provide a measure of the activation of mobile\nproducts. It's generated when Focus starts, right after Glean is\ninitialized.\n",
"git-commits": {
"first": "aaa496badf2f1d7e3affc226e37e0dcf5987096f",
"last": "aaa496badf2f1d7e3affc226e37e0dcf5987096f"
},
"include_client_id": false,
"metadata": {},
"no_lint": [],
"notification_emails": [
"jalmeida@mozilla.com"
],
"reasons": {},
"reflog-index": {
"first": 0,
"last": 0
},
"send_if_empty": false,
"source_url": "https://github.com/mozilla-mobile/focus-android/blob/aaa496badf2f1d7e3affc226e37e0dcf5987096f/app/pings.yaml#L7"
}
],
"in-source": true,
"name": "activation"
}
}

Просмотреть файл

@ -1,10 +0,0 @@
{
"glean-core": {
"name": "glean-core",
"type": "dependency"
},
"nimbus": {
"name": "nimbus",
"type": "dependency"
}
}

Просмотреть файл

@ -1 +0,0 @@
{}

Просмотреть файл

@ -1,6 +0,0 @@
{
"glean-core": {
"name": "glean-core",
"type": "dependency"
}
}

Просмотреть файл

@ -1,70 +0,0 @@
{
"launch": {
"history": [
{
"bugs": [
"https://github.com/MozillaReality/FirefoxRealityPC/pull/198"
],
"data_reviews": [
"https://github.com/MozillaReality/FirefoxRealityPC/pull/198#issuecomment-657786864"
],
"dates": {
"first": "2020-07-15 21:42:11",
"last": "2020-07-15 21:42:11"
},
"description": "This ping is sent when Firefox Reality bootstrap finishes its task of asking Firefox desktop to launch and before the bootstrap is quit.\n",
"git-commits": {
"first": "622497c73a8f7e0222b400bb423eff98319e7ba3",
"last": "622497c73a8f7e0222b400bb423eff98319e7ba3"
},
"include_client_id": true,
"metadata": {},
"no_lint": [],
"notification_emails": [
"fxr-telemetry@mozilla.com",
"dmu@mozilla.com"
],
"reasons": {},
"reflog-index": {
"first": 0,
"last": 0
},
"send_if_empty": false,
"source_url": "https://github.com/MozillaReality/FirefoxRealityPC/blob/622497c73a8f7e0222b400bb423eff98319e7ba3/Source/FirefoxRealityUnity/pings.yaml#L8"
},
{
"bugs": [
"https://github.com/MozillaReality/FirefoxRealityPC/pull/198"
],
"data_reviews": [
"https://github.com/MozillaReality/FirefoxRealityPC/pull/198#issuecomment-657786864"
],
"dates": {
"first": "2021-01-04 23:18:34",
"last": "2021-01-04 23:18:34"
},
"description": "This ping is sent when Firefox Reality bootstrap finishes its task of asking Firefox desktop to launch and before the bootstrap is quit.\n",
"git-commits": {
"first": "5d91e85ab48eeef093f3c4b0d4b4b30fb6513061",
"last": "5d91e85ab48eeef093f3c4b0d4b4b30fb6513061"
},
"include_client_id": true,
"metadata": {},
"no_lint": [],
"notification_emails": [
"fxr-telemetry@mozilla.com",
"dmu@mozilla.com"
],
"reasons": {},
"reflog-index": {
"first": 0,
"last": 0
},
"send_if_empty": false,
"source_url": "https://github.com/MozillaReality/FirefoxRealityPC/blob/5d91e85ab48eeef093f3c4b0d4b4b30fb6513061/Source/FirefoxRealityUnity/pings.yaml#L8"
}
],
"in-source": true,
"name": "launch"
}
}

Просмотреть файл

@ -1,14 +0,0 @@
{
"glean-core": {
"name": "glean-core",
"type": "dependency"
},
"org.mozilla.components:service-glean": {
"name": "org.mozilla.components:service-glean",
"type": "dependency"
},
"org.mozilla.components:support-sync-telemetry": {
"name": "org.mozilla.components:support-sync-telemetry",
"type": "dependency"
}
}

Просмотреть файл

@ -1,132 +0,0 @@
{
"session-end": {
"history": [
{
"bugs": [
"https://github.com/MozillaReality/FirefoxReality/issues/2230"
],
"data_reviews": [
"https://github.com/MozillaReality/FirefoxReality/pull/2241#issuecomment-557740258"
],
"dates": {
"first": "2019-11-25 10:53:04",
"last": "2019-11-25 10:53:04"
},
"description": "This ping is sent at the end of a session (when Firefox Reality switches to the background). We usually send search and UI control metrics at the end of a session.\n",
"git-commits": {
"first": "87543c362a47810d149eb109b6a82e6b06c19aa4",
"last": "87543c362a47810d149eb109b6a82e6b06c19aa4"
},
"include_client_id": true,
"metadata": {},
"no_lint": [],
"notification_emails": [
"fxr-telemetry@mozilla.com",
"dmu@mozilla.com"
],
"reasons": {},
"reflog-index": {
"first": 2,
"last": 2
},
"send_if_empty": false,
"source_url": "https://github.com/MozillaReality/FirefoxReality/blob/87543c362a47810d149eb109b6a82e6b06c19aa4/app/pings.yaml#L7"
},
{
"bugs": [
"https://github.com/MozillaReality/FirefoxReality/issues/2230"
],
"data_reviews": [
"https://github.com/MozillaReality/FirefoxReality/pull/2241#issuecomment-557740258"
],
"dates": {
"first": "2020-03-26 23:12:37",
"last": "2020-03-26 23:12:37"
},
"description": "This ping is sent at the end of a session (when Firefox Reality switches to the background). We usually send search and UI control metrics at the end of a session.\n",
"git-commits": {
"first": "3db73db963838d3980c52b00368f8c483fdba6b1",
"last": "3db73db963838d3980c52b00368f8c483fdba6b1"
},
"include_client_id": true,
"metadata": {},
"no_lint": [],
"notification_emails": [
"fxr-telemetry@mozilla.com",
"dmu@mozilla.com"
],
"reasons": {},
"reflog-index": {
"first": 1,
"last": 1
},
"send_if_empty": false,
"source_url": "https://github.com/MozillaReality/FirefoxReality/blob/3db73db963838d3980c52b00368f8c483fdba6b1/app/pings.yaml#L7"
},
{
"bugs": [
"https://github.com/MozillaReality/FirefoxReality/issues/2230"
],
"data_reviews": [
"https://github.com/MozillaReality/FirefoxReality/pull/2241#issuecomment-557740258"
],
"dates": {
"first": "2020-06-12 17:02:14",
"last": "2020-06-12 17:02:14"
},
"description": "This ping is sent at the end of a session (when Firefox Reality switches to the background). We usually send search and UI control metrics at the end of a session.\n",
"git-commits": {
"first": "f9f8606372e64b04c417256452f24ea335fd5808",
"last": "f9f8606372e64b04c417256452f24ea335fd5808"
},
"include_client_id": true,
"metadata": {},
"no_lint": [],
"notification_emails": [
"fxr-telemetry@mozilla.com",
"dmu@mozilla.com"
],
"reasons": {},
"reflog-index": {
"first": 0,
"last": 0
},
"send_if_empty": false,
"source_url": "https://github.com/MozillaReality/FirefoxReality/blob/f9f8606372e64b04c417256452f24ea335fd5808/app/pings.yaml#L8"
},
{
"bugs": [
"https://github.com/MozillaReality/FirefoxReality/issues/2230"
],
"data_reviews": [
"https://github.com/MozillaReality/FirefoxReality/pull/2241#issuecomment-557740258"
],
"dates": {
"first": "2021-12-02 11:28:03",
"last": "2021-12-02 11:28:03"
},
"description": "This ping is sent at the end of a session (when Firefox Reality switches to the background). We usually send search and UI control metrics at the end of a session.\n",
"git-commits": {
"first": "bc6f43f64e241ebe737778f8327c2dd6375ed507",
"last": "bc6f43f64e241ebe737778f8327c2dd6375ed507"
},
"include_client_id": true,
"metadata": {},
"no_lint": [],
"notification_emails": [
"fxr-telemetry@mozilla.com",
"dmu@mozilla.com"
],
"reasons": {},
"reflog-index": {
"first": 0,
"last": 0
},
"send_if_empty": false,
"source_url": "https://github.com/MozillaReality/FirefoxReality/blob/bc6f43f64e241ebe737778f8327c2dd6375ed507/app/pings.yaml#L8"
}
],
"in-source": true,
"name": "session-end"
}
}

Просмотреть файл

@ -1,39 +0,0 @@
{
"fog-validation": {
"history": [
{
"bugs": [
"https://bugzilla.mozilla.org/1664461"
],
"data_reviews": [
"https://bugzilla.mozilla.org/show_bug.cgi?id=1664461"
],
"dates": {
"first": "2020-10-09 22:43:28",
"last": "2020-10-09 22:43:28"
},
"description": "This ping is intended to evaluate the behaviour of FOG before\nit ships beyond Nightly.\nThis is a temporary ping.\nIt is sent one hour after FOG is initialized, and every hour thereafter.\n",
"git-commits": {
"first": "83b7b325568919ddd91828ff3bfb6b96041faa9c",
"last": "83b7b325568919ddd91828ff3bfb6b96041faa9c"
},
"include_client_id": true,
"metadata": {},
"no_lint": [],
"notification_emails": [
"chutten@mozilla.com",
"glean-team@mozilla.com"
],
"reasons": {},
"reflog-index": {
"first": 2,
"last": 2
},
"send_if_empty": true,
"source_url": "https://github.com/mozilla/gecko-dev/blob/83b7b325568919ddd91828ff3bfb6b96041faa9c/toolkit/components/glean/pings.yaml#L15"
}
],
"in-source": false,
"name": "fog-validation"
}
}

Просмотреть файл

@ -1 +0,0 @@
{}

Разница между файлами не показана из-за своего большого размера Загрузить разницу

Просмотреть файл

@ -1,98 +0,0 @@
{
"deletion-request": {
"history": [
{
"bugs": [
"https://bugzilla.mozilla.org/1587095"
],
"data_reviews": [
"https://bugzilla.mozilla.org/show_bug.cgi?id=1587095#c6"
],
"dates": {
"first": "2021-02-16 18:06:58",
"last": "2021-02-16 18:06:58"
},
"description": "This ping is submitted when a user opts out of\nsending technical and interaction data to Mozilla.\nThis ping is intended to communicate to the Data Pipeline\nthat the user wishes to have their reported Telemetry data deleted.\nAs such it attempts to send itself at the moment the user\nopts out of data collection.\n",
"git-commits": {
"first": "a340092586b31ade0722610713b25a7eb0bc41a2",
"last": "a340092586b31ade0722610713b25a7eb0bc41a2"
},
"include_client_id": true,
"metadata": {},
"no_lint": [],
"notification_emails": [
"glean-team@mozilla.com"
],
"reasons": {},
"reflog-index": {
"first": 1,
"last": 1
},
"send_if_empty": true,
"source_url": "https://github.com/mozilla/glean.js/blob/a340092586b31ade0722610713b25a7eb0bc41a2/glean/src/pings.yaml#L12"
},
{
"bugs": [
"https://bugzilla.mozilla.org/1587095"
],
"data_reviews": [
"https://bugzilla.mozilla.org/show_bug.cgi?id=1587095#c6"
],
"dates": {
"first": "2021-11-18 10:36:44",
"last": "2021-11-18 10:36:44"
},
"description": "This ping is submitted when a user opts out of\nsending technical and interaction data to Mozilla.\nThis ping is intended to communicate to the Data Pipeline\nthat the user wishes to have their reported Telemetry data deleted.\nAs such it attempts to send itself at the moment the user\nopts out of data collection.\n",
"git-commits": {
"first": "998550fd8006e5e5ce8c5b49ffd220ee3b83ca48",
"last": "998550fd8006e5e5ce8c5b49ffd220ee3b83ca48"
},
"include_client_id": true,
"metadata": {},
"no_lint": [],
"notification_emails": [
"glean-team@mozilla.com"
],
"reasons": {},
"reflog-index": {
"first": 0,
"last": 0
},
"send_if_empty": true,
"source_url": "https://github.com/mozilla/glean.js/blob/998550fd8006e5e5ce8c5b49ffd220ee3b83ca48/glean/src/pings.yaml#L10"
},
{
"bugs": [
"https://bugzilla.mozilla.org/1587095"
],
"data_reviews": [
"https://bugzilla.mozilla.org/show_bug.cgi?id=1587095#c6"
],
"dates": {
"first": "2021-12-09 09:55:45",
"last": "2021-12-09 09:55:45"
},
"description": "This ping is submitted when a user opts out of\nsending technical and interaction data to Mozilla.\nThis ping is intended to communicate to the Data Pipeline\nthat the user wishes to have their reported Telemetry data deleted.\nAs such it attempts to send itself at the moment the user\nopts out of data collection.\n",
"git-commits": {
"first": "f57b86e441442351b282631fc8e265e380ba8df4",
"last": "f57b86e441442351b282631fc8e265e380ba8df4"
},
"include_client_id": true,
"metadata": {},
"no_lint": [],
"notification_emails": [
"glean-team@mozilla.com"
],
"reasons": {},
"reflog-index": {
"first": 0,
"last": 0
},
"send_if_empty": true,
"source_url": "https://github.com/mozilla/glean.js/blob/f57b86e441442351b282631fc8e265e380ba8df4/glean/src/pings.yaml#L10"
}
],
"in-source": true,
"name": "deletion-request"
}
}

Просмотреть файл

@ -1 +0,0 @@
{}

Просмотреть файл

@ -1,14 +0,0 @@
{
"glean-core": {
"name": "glean-core",
"type": "dependency"
},
"org.mozilla.components:service-glean": {
"name": "org.mozilla.components:service-glean",
"type": "dependency"
},
"org.mozilla.components:support-sync-telemetry": {
"name": "org.mozilla.components:support-sync-telemetry",
"type": "dependency"
}
}

Просмотреть файл

@ -1 +0,0 @@
{}

Просмотреть файл

@ -1,10 +0,0 @@
{
"glean-core": {
"name": "glean-core",
"type": "dependency"
},
"org.mozilla.components:service-glean": {
"name": "org.mozilla.components:service-glean",
"type": "dependency"
}
}

Просмотреть файл

@ -1 +0,0 @@
{}

Просмотреть файл

@ -1 +0,0 @@
{}

Просмотреть файл

@ -1,10 +0,0 @@
{
"glean-core": {
"name": "glean-core",
"type": "dependency"
},
"org.mozilla.components:service-glean": {
"name": "org.mozilla.components:service-glean",
"type": "dependency"
}
}

Просмотреть файл

@ -1,101 +0,0 @@
{
"usage": {
"history": [
{
"bugs": [
"https://bugzilla.mozilla.org/show_bug.cgi?id=1291053"
],
"data_reviews": [
"https://bugzilla.mozilla.org/show_bug.cgi?id=1291053#c34"
],
"dates": {
"first": "2020-09-09 23:51:57",
"last": "2020-09-09 23:51:57"
},
"description": "Sent when the mach invocation is completed (regardless of result). Contains information about the mach invocation that was made, its result, and some details about the current environment and hardware.\n",
"git-commits": {
"first": "565f11ba0a9f4febcc981b3e97eba3ce11a2262a",
"last": "565f11ba0a9f4febcc981b3e97eba3ce11a2262a"
},
"include_client_id": true,
"metadata": {},
"no_lint": [],
"notification_emails": [
"build-telemetry@mozilla.com",
"mhentges@mozilla.com"
],
"reasons": {},
"reflog-index": {
"first": 1,
"last": 1
},
"send_if_empty": false,
"source_url": "https://github.com/mozilla/gecko-dev/blob/565f11ba0a9f4febcc981b3e97eba3ce11a2262a/python/mach/pings.yaml#L7"
},
{
"bugs": [
"https://bugzilla.mozilla.org/show_bug.cgi?id=1291053"
],
"data_reviews": [
"https://bugzilla.mozilla.org/show_bug.cgi?id=1291053#c34"
],
"dates": {
"first": "2020-09-15 21:15:20",
"last": "2020-09-15 21:15:20"
},
"description": "Sent when the mach invocation is completed (regardless of result). Contains information about the mach invocation that was made, its result, and some details about the current environment and hardware.\n",
"git-commits": {
"first": "648ccad85b2319984db72a8d173e2f1857103330",
"last": "648ccad85b2319984db72a8d173e2f1857103330"
},
"include_client_id": true,
"metadata": {},
"no_lint": [],
"notification_emails": [
"build-telemetry@mozilla.com",
"mhentges@mozilla.com"
],
"reasons": {},
"reflog-index": {
"first": 0,
"last": 0
},
"send_if_empty": false,
"source_url": "https://github.com/mozilla/gecko-dev/blob/648ccad85b2319984db72a8d173e2f1857103330/python/mach/pings.yaml#L10"
},
{
"bugs": [
"https://bugzilla.mozilla.org/show_bug.cgi?id=1291053"
],
"data_reviews": [
"https://bugzilla.mozilla.org/show_bug.cgi?id=1291053#c34"
],
"dates": {
"first": "2021-12-12 18:02:07",
"last": "2021-12-12 18:02:07"
},
"description": "Sent when the mach invocation is completed (regardless of result). Contains information about the mach invocation that was made, its result, and some details about the current environment and hardware.\n",
"git-commits": {
"first": "4646b826a25d3825cf209db890862b45fa09ffc3",
"last": "4646b826a25d3825cf209db890862b45fa09ffc3"
},
"include_client_id": true,
"metadata": {},
"no_lint": [],
"notification_emails": [
"build-telemetry@mozilla.com",
"mhentges@mozilla.com"
],
"reasons": {},
"reflog-index": {
"first": 0,
"last": 0
},
"send_if_empty": false,
"source_url": "https://github.com/mozilla/gecko-dev/blob/4646b826a25d3825cf209db890862b45fa09ffc3/python/mach/pings.yaml#L10"
}
],
"in-source": true,
"name": "usage"
}
}

Просмотреть файл

@ -1,6 +0,0 @@
{
"glean-js": {
"name": "glean-js",
"type": "dependency"
}
}

Просмотреть файл

@ -1,68 +0,0 @@
{
"main": {
"history": [
{
"bugs": [
"https://bugzilla.mozilla.org/show_bug.cgi?id=1708637"
],
"data_reviews": [
"https://bugzilla.mozilla.org/show_bug.cgi?id=1711123"
],
"dates": {
"first": "2021-06-08 09:42:22",
"last": "2021-06-08 09:42:22"
},
"description": "A simple ping to send glean events generated by the Mozilla VPN client.\n",
"git-commits": {
"first": "866b232a07741e0533f6a6e7e3b3b8fa2463bcf1",
"last": "866b232a07741e0533f6a6e7e3b3b8fa2463bcf1"
},
"include_client_id": true,
"metadata": {},
"no_lint": [],
"notification_emails": [
"amarchesini@mozilla.com"
],
"reasons": {},
"reflog-index": {
"first": 0,
"last": 0
},
"send_if_empty": false,
"source_url": "https://github.com/mozilla-mobile/mozilla-vpn-client/blob/866b232a07741e0533f6a6e7e3b3b8fa2463bcf1/glean/pings.yaml#L12"
},
{
"bugs": [
"https://bugzilla.mozilla.org/show_bug.cgi?id=1708637"
],
"data_reviews": [
"https://bugzilla.mozilla.org/show_bug.cgi?id=1711123"
],
"dates": {
"first": "2021-12-11 15:31:56",
"last": "2021-12-11 15:31:56"
},
"description": "A simple ping to send glean events generated by the Mozilla VPN client.\n",
"git-commits": {
"first": "a31b3040569a36d66c939d1f7974271c3f686c3d",
"last": "a31b3040569a36d66c939d1f7974271c3f686c3d"
},
"include_client_id": true,
"metadata": {},
"no_lint": [],
"notification_emails": [
"amarchesini@mozilla.com"
],
"reasons": {},
"reflog-index": {
"first": 0,
"last": 0
},
"send_if_empty": false,
"source_url": "https://github.com/mozilla-mobile/mozilla-vpn-client/blob/a31b3040569a36d66c939d1f7974271c3f686c3d/glean/pings.yaml#L12"
}
],
"in-source": true,
"name": "main"
}
}

Просмотреть файл

@ -1,10 +0,0 @@
{
"glean-core": {
"name": "glean-core",
"type": "dependency"
},
"org.mozilla.components:service-glean": {
"name": "org.mozilla.components:service-glean",
"type": "dependency"
}
}

Просмотреть файл

@ -1,68 +0,0 @@
{
"usage": {
"history": [
{
"bugs": [
"https://bugzilla.mozilla.org/show_bug.cgi?id=1581647"
],
"data_reviews": [
"https://bugzilla.mozilla.org/show_bug.cgi?id=1581647#c9"
],
"dates": {
"first": "2020-04-08 14:58:59",
"last": "2020-04-08 14:58:59"
},
"description": "A ping to record usage of mozregression. The purpose of this data gathering is only to improve mozregression itself by understanding the scope of its environment and usage, and will not be broadly shared except in aggregated form. Although not a consumer product, mozregression strives to follow Mozilla's general guidelines on [lean data practices](https://www.mozilla.org/en-US/about/policy/lean-data/) and is also subject to Mozilla's [privacy policy](https://www.mozilla.org/en-US/privacy/websites/).\n",
"git-commits": {
"first": "ad72896e1bd294685544dd593fd0c19b7fe9a231",
"last": "ad72896e1bd294685544dd593fd0c19b7fe9a231"
},
"include_client_id": true,
"metadata": {},
"no_lint": [],
"notification_emails": [
"wlachance@mozilla.com"
],
"reasons": {},
"reflog-index": {
"first": 0,
"last": 0
},
"send_if_empty": false,
"source_url": "https://github.com/mozilla/mozregression/blob/ad72896e1bd294685544dd593fd0c19b7fe9a231/mozregression/pings.yaml#L4"
},
{
"bugs": [
"https://bugzilla.mozilla.org/show_bug.cgi?id=1581647"
],
"data_reviews": [
"https://bugzilla.mozilla.org/show_bug.cgi?id=1581647#c9"
],
"dates": {
"first": "2021-12-05 13:44:10",
"last": "2021-12-05 13:44:10"
},
"description": "A ping to record usage of mozregression. The purpose of this data gathering is only to improve mozregression itself by understanding the scope of its environment and usage, and will not be broadly shared except in aggregated form. Although not a consumer product, mozregression strives to follow Mozilla's general guidelines on [lean data practices](https://www.mozilla.org/en-US/about/policy/lean-data/) and is also subject to Mozilla's [privacy policy](https://www.mozilla.org/en-US/privacy/websites/).\n",
"git-commits": {
"first": "ad85ca7646bf44b2f2312a5cc45d25616f727d73",
"last": "ad85ca7646bf44b2f2312a5cc45d25616f727d73"
},
"include_client_id": true,
"metadata": {},
"no_lint": [],
"notification_emails": [
"wlachance@mozilla.com"
],
"reasons": {},
"reflog-index": {
"first": 0,
"last": 0
},
"send_if_empty": false,
"source_url": "https://github.com/mozilla/mozregression/blob/ad85ca7646bf44b2f2312a5cc45d25616f727d73/mozregression/pings.yaml#L4"
}
],
"in-source": true,
"name": "usage"
}
}

Просмотреть файл

@ -1 +0,0 @@
{}

Просмотреть файл

@ -1,14 +0,0 @@
{
"glean-core": {
"name": "glean-core",
"type": "dependency"
},
"org.mozilla.components:lib-crash": {
"name": "org.mozilla.components:lib-crash",
"type": "dependency"
},
"org.mozilla.components:service-glean": {
"name": "org.mozilla.components:service-glean",
"type": "dependency"
}
}

Просмотреть файл

@ -1 +0,0 @@
{}

Разница между файлами не показана из-за своего большого размера Загрузить разницу

Просмотреть файл

@ -1,128 +0,0 @@
{
"migration": {
"history": [
{
"bugs": [
"https://github.com/mozilla-mobile/fenix/issues/5888"
],
"data_reviews": [
"https://github.com/mozilla-mobile/android-components/pull/5483#issuecomment-573971458"
],
"dates": {
"first": "2020-01-14 04:44:15",
"last": "2020-01-14 04:44:15"
},
"description": "A ping sent after a Fennec->Fenix migration was completed.\n",
"git-commits": {
"first": "de1f46edbf9ac27f7fa680130d361043eccce10c",
"last": "de1f46edbf9ac27f7fa680130d361043eccce10c"
},
"include_client_id": true,
"metadata": {},
"no_lint": [],
"notification_emails": [
"fenix-core@mozilla.com"
],
"reasons": {},
"reflog-index": {
"first": 2,
"last": 2
},
"send_if_empty": false,
"source_url": "https://github.com/mozilla-mobile/android-components/blob/de1f46edbf9ac27f7fa680130d361043eccce10c/components/support/migration/pings.yaml#L7"
},
{
"bugs": [
"https://github.com/mozilla-mobile/fenix/issues/5888"
],
"data_reviews": [
"https://github.com/mozilla-mobile/android-components/pull/5483#issuecomment-573971458"
],
"dates": {
"first": "2020-05-11 12:25:30",
"last": "2020-05-11 12:25:30"
},
"description": "A ping sent after a Fennec->Fenix migration was completed.\n",
"git-commits": {
"first": "321215304df372c25225da1073c563c7f6e2c41e",
"last": "321215304df372c25225da1073c563c7f6e2c41e"
},
"include_client_id": true,
"metadata": {},
"no_lint": [],
"notification_emails": [
"fenix-core@mozilla.com"
],
"reasons": {},
"reflog-index": {
"first": 1,
"last": 1
},
"send_if_empty": false,
"source_url": "https://github.com/mozilla-mobile/android-components/blob/321215304df372c25225da1073c563c7f6e2c41e/components/support/migration/pings.yaml#L8"
},
{
"bugs": [
"https://github.com/mozilla-mobile/fenix/issues/5888"
],
"data_reviews": [
"https://github.com/mozilla-mobile/android-components/pull/5483#issuecomment-573971458"
],
"dates": {
"first": "2021-03-29 14:27:14",
"last": "2021-03-29 14:27:14"
},
"description": "A ping sent after a Fennec->Fenix migration was completed.\n",
"git-commits": {
"first": "19fb560697aff5dde6d437d42209474f52a34f1b",
"last": "19fb560697aff5dde6d437d42209474f52a34f1b"
},
"include_client_id": true,
"metadata": {},
"no_lint": [],
"notification_emails": [
"fenix-core@mozilla.com"
],
"reasons": {},
"reflog-index": {
"first": 0,
"last": 0
},
"send_if_empty": false,
"source_url": "https://github.com/mozilla-mobile/android-components/blob/19fb560697aff5dde6d437d42209474f52a34f1b/components/support/migration/pings.yaml#L8"
},
{
"bugs": [
"https://github.com/mozilla-mobile/fenix/issues/5888"
],
"data_reviews": [
"https://github.com/mozilla-mobile/android-components/pull/5483#issuecomment-573971458"
],
"dates": {
"first": "2021-12-13 00:22:15",
"last": "2021-12-13 00:22:15"
},
"description": "A ping sent after a Fennec->Fenix migration was completed.\n",
"git-commits": {
"first": "e18be9f02525adc6f2b1901991a4412a803ee6ce",
"last": "e18be9f02525adc6f2b1901991a4412a803ee6ce"
},
"include_client_id": true,
"metadata": {},
"no_lint": [],
"notification_emails": [
"fenix-core@mozilla.com"
],
"reasons": {},
"reflog-index": {
"first": 0,
"last": 0
},
"send_if_empty": false,
"source_url": "https://github.com/mozilla-mobile/android-components/blob/e18be9f02525adc6f2b1901991a4412a803ee6ce/components/support/migration/pings.yaml#L8"
}
],
"in-source": true,
"name": "migration"
}
}

Разница между файлами не показана из-за своего большого размера Загрузить разницу

Просмотреть файл

@ -4,7 +4,6 @@ import click
from pathlib import Path
import importlib.util
from inspect import getmembers
import sys
SQL_GENERATORS_DIR = "sql_generators"
@ -37,9 +36,6 @@ def generate_group():
# rename command to name of query generator
cmd = generate_cmd[0]
cmd.name = path.name
cmd.context_settings = dict(
ignore_unknown_options=True, allow_extra_args=True
)
commands.append(cmd)
# add commands for generating queries to `generate` click group
@ -69,7 +65,7 @@ generate = generate_group()
)
@click.pass_context
def generate_all(ctx, output_dir, target_project):
"""Run all SQL generators"""
for _, cmd in generate.commands.items():
"""Run all SQL generators."""
for _, cmd in reversed(generate.commands.items()):
if cmd.name != "all":
ctx.forward(cmd)

Просмотреть файл

@ -37,7 +37,8 @@ def validate(project_dirs):
for root, dirs, files in os.walk(project_dir):
if os.path.basename(root) == EXAMPLE_DIR:
for file in files:
sql_files = (f for f in files if os.path.splitext(f)[1] == ".sql")
for file in sql_files:
dry_run_sql = sub_local_routines(
(Path(root) / file).read_text(),
project_dir,

Просмотреть файл

@ -151,6 +151,14 @@ SKIP = {
"sql/moz-fx-data-shared-prod/regrets_reporter_derived/regrets_reporter_summary_v1/*.sql", # noqa E501
recursive=True,
),
*glob.glob(
"sql/moz-fx-data-shared-prod/mlhackweek_search/**/*.sql", recursive=True
),
*glob.glob(
"sql/moz-fx-data-shared-prod/regrets_reporter_ucs/**/*.sql", recursive=True
),
"sql/moz-fx-data-shared-prod/telemetry/xfocsp_error_report/view.sql",
"sql/moz-fx-data-shared-prod/telemetry/regrets_reporter_update/view.sql",
# Materialized views
"sql/moz-fx-data-shared-prod/telemetry_derived/experiment_search_events_live_v1/init.sql", # noqa E501
"sql/moz-fx-data-shared-prod/telemetry_derived/experiment_events_live_v1/init.sql", # noqa E501

Просмотреть файл

@ -31,6 +31,19 @@ SKIP_VALIDATION = {
"sql/moz-fx-data-test-project/test/simple_view/view.sql",
# Access Denied
"sql/moz-fx-data-shared-prod/telemetry/experiment_enrollment_cumulative_population_estimate/view.sql", # noqa E501
"sql/moz-fx-data-shared-prod/mlhackweek_search/events/view.sql",
"sql/moz-fx-data-shared-prod/regrets_reporter_ucs/deletion_request/view.sql",
"sql/moz-fx-data-shared-prod/mlhackweek_search/custom/view.sql",
"sql/moz-fx-data-shared-prod/regrets_reporter_ucs/regret_details/view.sql",
"sql/moz-fx-data-shared-prod/regrets_reporter_ucs/video_data/view.sql",
"sql/moz-fx-data-shared-prod/mlhackweek_search/deletion_request/view.sql",
"sql/moz-fx-data-shared-prod/mlhackweek_search/baseline/view.sql",
"sql/moz-fx-data-shared-prod/telemetry/regrets_reporter_update/view.sql",
"sql/moz-fx-data-shared-prod/regrets_reporter_ucs/video_index/view.sql",
"sql/moz-fx-data-shared-prod/telemetry/xfocsp_error_report/view.sql",
"sql/moz-fx-data-shared-prod/mlhackweek_search/metrics/view.sql",
"sql/moz-fx-data-shared-prod/regrets_reporter_ucs/main_events/view.sql",
"sql/moz-fx-data-shared-prod/mlhackweek_search/action/view.sql",
}
# skip publishing these views

Просмотреть файл

@ -35,7 +35,6 @@ setup(
"google-cloud-bigquery",
"google-cloud-storage",
"Jinja2",
"pyjnius",
"pathos",
"pyarrow",
"pytest-black",

Просмотреть файл

@ -7,8 +7,8 @@ import click
import yaml
from jinja2 import Environment, FileSystemLoader
from bigquery_etl.cli.query import update
from bigquery_etl.format_sql.formatter import reformat
from bigquery_etl.schema import SCHEMA_FILE, Schema
from bigquery_etl.util.common import write_sql
FILE_PATH = Path(os.path.dirname(__file__))
@ -59,6 +59,19 @@ def generate_metadata(project, dataset, destination_table, write_dir):
)
def generate_schema(project, dataset, destination_table, write_dir):
"""Generate the table schema."""
# get schema
table_schema = Schema.for_table(project, dataset, destination_table)
query_schema = Schema.from_query_file(
write_dir / project / dataset / destination_table / "query.sql",
use_cloud_function=True,
)
query_schema.merge(table_schema)
schema_path = write_dir / project / dataset / destination_table / SCHEMA_FILE
query_schema.to_yaml_file(schema_path)
@click.command("generate")
@click.option(
"--target-project",
@ -91,4 +104,4 @@ def generate(ctx, target_project, dataset, destination_table, output_dir):
generate_query(target_project, dataset, destination_table, output_dir)
generate_view(target_project, dataset, destination_table, output_dir)
generate_metadata(target_project, dataset, destination_table, output_dir)
ctx.invoke(update, name=f"{dataset}.{destination_table}", project_id=target_project)
generate_schema(target_project, dataset, destination_table, output_dir)

0
sql_generators/glean_usage/__init__.py Executable file → Normal file
Просмотреть файл

0
sql_generators/glean_usage/baseline_clients_daily.py Executable file → Normal file
Просмотреть файл

Просмотреть файл

Просмотреть файл

0
sql_generators/glean_usage/clients_last_seen_joined.py Executable file → Normal file
Просмотреть файл

0
sql_generators/glean_usage/common.py Executable file → Normal file
Просмотреть файл

0
sql_generators/glean_usage/events_unnested.py Executable file → Normal file
Просмотреть файл

9
sql_generators/glean_usage/glean_app_ping_views.py Executable file → Normal file
Просмотреть файл

@ -7,6 +7,7 @@ import os
from mozilla_schema_generator.glean_ping import GleanPing
from bigquery_etl.format_sql.formatter import reformat
from bigquery_etl.util.common import get_table_dir, write_sql
from sql_generators.glean_usage.common import GleanTable
@ -77,9 +78,11 @@ class GleanAppPingViews(GleanTable):
output_dir,
full_view_id,
"view.sql",
VIEW_QUERY_TEMPLATE.format(
full_view_id=full_view_id,
target=underlying_view_id,
reformat(
VIEW_QUERY_TEMPLATE.format(
full_view_id=full_view_id,
target=underlying_view_id,
)
),
)
write_sql(

0
sql_generators/glean_usage/metrics_clients_daily.py Executable file → Normal file
Просмотреть файл

Просмотреть файл

Просмотреть файл

Просмотреть файл

Просмотреть файл

Просмотреть файл

Просмотреть файл

Просмотреть файл

Просмотреть файл

Просмотреть файл

Просмотреть файл

Просмотреть файл

Просмотреть файл

Просмотреть файл

Просмотреть файл

Просмотреть файл

Просмотреть файл

Просмотреть файл

0
sql_generators/glean_usage/templates/macros.sql Executable file → Normal file
Просмотреть файл

Просмотреть файл

Просмотреть файл

Просмотреть файл

Просмотреть файл

Просмотреть файл

Просмотреть файл

Просмотреть файл