diff --git a/schemas/firefox-accounts/activity-flow-metrics/activity-flow-metrics.1.schema.json b/schemas/firefox-accounts/activity-flow-metrics/activity-flow-metrics.1.schema.json deleted file mode 100644 index 0f5f24fab..000000000 --- a/schemas/firefox-accounts/activity-flow-metrics/activity-flow-metrics.1.schema.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-04/schema#", - "mozPipelineMetadata": { - "bq_dataset_family": "firefox_accounts", - "bq_metadata_format": "structured", - "bq_table": "activity_flow_metrics_v1", - "expiration_policy": { - "delete_after_days": 10000 - } - }, - "properties": {}, - "title": "activity-flow-metrics", - "type": "object" -} diff --git a/schemas/firefox-accounts/amplitude-event/amplitude-event.1.schema.json b/schemas/firefox-accounts/amplitude-event/amplitude-event.1.schema.json deleted file mode 100644 index 56786e95e..000000000 --- a/schemas/firefox-accounts/amplitude-event/amplitude-event.1.schema.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-04/schema#", - "mozPipelineMetadata": { - "bq_dataset_family": "firefox_accounts", - "bq_metadata_format": "structured", - "bq_table": "amplitude_event_v1", - "expiration_policy": { - "delete_after_days": 10000 - } - }, - "properties": { - "op": { - "description": "Pre-existing Firefox Accounts metrics field used to identify Amplitude metrics events.", - "enum": [ - "amplitudeEvent" - ], - "type": "string" - } - }, - "required": [ - "op" - ], - "title": "amplitude-event", - "type": "object" -} diff --git a/schemas/telemetry/block-autoplay/block-autoplay.1.schema.json b/schemas/telemetry/block-autoplay/block-autoplay.1.schema.json deleted file mode 100644 index 7ec3bcc05..000000000 --- a/schemas/telemetry/block-autoplay/block-autoplay.1.schema.json +++ /dev/null @@ -1,337 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-04/schema#", - "mozPipelineMetadata": { - "bq_dataset_family": "telemetry", - "bq_metadata_format": "telemetry", - "bq_table": "block_autoplay_v1", - "expiration_policy": { - "delete_after_days": 10000 - } - }, - "properties": { - "application": { - "additionalProperties": false, - "properties": { - "architecture": { - "type": "string" - }, - "buildId": { - "pattern": "^[0-9]{10}", - "type": "string" - }, - "channel": { - "type": "string" - }, - "displayVersion": { - "pattern": "^[0-9]{2,3}\\.", - "type": "string" - }, - "name": { - "type": "string" - }, - "platformVersion": { - "pattern": "^[0-9]{2,3}\\.", - "type": "string" - }, - "vendor": { - "type": "string" - }, - "version": { - "pattern": "^[0-9]{2,3}\\.", - "type": "string" - }, - "xpcomAbi": { - "type": "string" - } - }, - "required": [ - "architecture", - "buildId", - "channel", - "name", - "platformVersion", - "version", - "vendor", - "xpcomAbi" - ], - "type": "object" - }, - "clientId": { - "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$", - "type": "string" - }, - "creationDate": { - "pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}\\.[0-9]{3}Z$", - "type": "string" - }, - "id": { - "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$", - "type": "string" - }, - "payload": { - "additionalProperties": false, - "properties": { - "branch": { - "enum": [ - "control", - "allow-and-notRemember", - "deny-and-notRemember", - "allow-and-remember", - "deny-and-remember" - ], - "type": "string" - }, - "id": { - "minimum": 0, - "type": "integer" - }, - "payload": { - "oneOf": [ - { - "additionalProperties": false, - "properties": { - "counters": { - "additionalProperties": false, - "properties": { - "totalBlockedAudibleMedia": { - "minimum": 0, - "type": "integer" - }, - "totalPages": { - "minimum": 0, - "type": "integer" - }, - "totalPagesAM": { - "minimum": 0, - "type": "integer" - } - }, - "required": [ - "totalPages", - "totalPagesAM", - "totalBlockedAudibleMedia" - ], - "type": "object" - }, - "type": { - "enum": [ - "counts" - ], - "type": "string" - } - }, - "required": [ - "type", - "counters" - ] - }, - { - "additionalProperties": false, - "properties": { - "promptResponse": { - "items": { - "oneOf": [ - { - "additionalProperties": false, - "properties": { - "allowAutoplay": { - "type": "boolean" - }, - "interact": { - "enum": [ - "interact" - ], - "type": "string" - }, - "pageId": { - "type": "string" - }, - "rememberCheckbox": { - "type": "boolean" - }, - "responseTime": { - "minimum": 0, - "type": "number" - }, - "timestamp": { - "type": "integer" - } - }, - "required": [ - "pageId", - "timestamp", - "responseTime", - "interact", - "rememberCheckbox", - "allowAutoplay" - ] - }, - { - "additionalProperties": false, - "properties": { - "interact": { - "enum": [ - "escape", - "ignore" - ], - "type": "string" - }, - "pageId": { - "type": "string" - }, - "responseTime": { - "minimum": 0, - "type": "number" - }, - "timestamp": { - "type": "integer" - } - }, - "required": [ - "pageId", - "timestamp", - "responseTime", - "interact" - ] - } - ], - "type": "object" - }, - "type": "array" - }, - "type": { - "enum": [ - "prompt" - ], - "type": "string" - } - }, - "required": [ - "type", - "promptResponse" - ] - }, - { - "additionalProperties": false, - "properties": { - "settingsChanged": { - "items": { - "oneOf": [ - { - "additionalProperties": false, - "properties": { - "globalSettings": { - "additionalProperties": false, - "properties": { - "allowAutoplay": { - "enum": [ - "allow", - "block", - "ask" - ], - "type": "string" - } - }, - "required": [ - "allowAutoplay" - ], - "type": "object" - }, - "timestamp": { - "type": "integer" - } - }, - "required": [ - "globalSettings", - "timestamp" - ] - }, - { - "properties": { - "pageSpecific": { - "additionalProperties": false, - "properties": { - "allowAutoplay": { - "enum": [ - "allow", - "block", - "default" - ], - "type": "string" - }, - "pageId": { - "type": "string" - } - }, - "required": [ - "pageId", - "allowAutoplay" - ], - "type": "object" - }, - "timestamp": { - "type": "integer" - } - }, - "required": [ - "pageSpecific", - "timestamp" - ] - } - ], - "type": "object" - }, - "type": "array" - }, - "type": { - "enum": [ - "settings" - ], - "type": "string" - } - }, - "required": [ - "type", - "settingsChanged" - ] - } - ], - "type": "object" - } - }, - "required": [ - "id", - "branch", - "payload" - ], - "type": "object" - }, - "profileGroupId": { - "description": "A UUID identifying the profile's group on a single device and allowing user-oriented correlation of data", - "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$", - "type": "string" - }, - "type": { - "enum": [ - "block-autoplay" - ], - "type": "string" - }, - "version": { - "maximum": 4, - "minimum": 4, - "type": "number" - } - }, - "required": [ - "type", - "id", - "creationDate", - "version", - "application", - "clientId", - "payload" - ], - "title": "block-autoplay", - "type": "object" -} diff --git a/templates/firefox-accounts/activity-flow-metrics/activity-flow-metrics.1.schema.json b/templates/firefox-accounts/activity-flow-metrics/activity-flow-metrics.1.schema.json deleted file mode 100644 index aaf4de3b2..000000000 --- a/templates/firefox-accounts/activity-flow-metrics/activity-flow-metrics.1.schema.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-04/schema#", - "mozPipelineMetadata": { - "expiration_policy": { - "delete_after_days": 10000 - } - }, - "type": "object", - "title": "activity-flow-metrics", - "properties": { - } -} diff --git a/templates/firefox-accounts/amplitude-event/amplitude-event.1.schema.json b/templates/firefox-accounts/amplitude-event/amplitude-event.1.schema.json deleted file mode 100644 index 5689a332f..000000000 --- a/templates/firefox-accounts/amplitude-event/amplitude-event.1.schema.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-04/schema#", - "mozPipelineMetadata": { - "expiration_policy": { - "delete_after_days": 10000 - } - }, - "type": "object", - "title": "amplitude-event", - "properties": { - "op": { - "description": "Pre-existing Firefox Accounts metrics field used to identify Amplitude metrics events.", - "type": "string", - "enum": [ "amplitudeEvent" ] - } - }, - "required": [ - "op" - ] -} diff --git a/templates/telemetry/block-autoplay/block-autoplay.1.schema.json b/templates/telemetry/block-autoplay/block-autoplay.1.schema.json deleted file mode 100644 index c22e53611..000000000 --- a/templates/telemetry/block-autoplay/block-autoplay.1.schema.json +++ /dev/null @@ -1,268 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-04/schema#", - "mozPipelineMetadata": { - "expiration_policy": { - "delete_after_days": 10000 - } - }, - "type": "object", - "title": "block-autoplay", - "properties": { - "type": { - "type": "string", - "enum": [ "block-autoplay" ] - }, - @TELEMETRY_ID_1_JSON@, - @TELEMETRY_CREATIONDATE_1_JSON@, - "version": { - "type": "number", - "maximum": 4, - "minimum": 4 - }, - @TELEMETRY_APPLICATION_1_JSON@, - @TELEMETRY_CLIENTID_1_JSON@, - "payload": { - "type": "object", - "properties": { - "id": { - "type": "integer", - "minimum": 0 - }, - "branch": { - "type": "string", - "enum": [ - "control", - "allow-and-notRemember", - "deny-and-notRemember", - "allow-and-remember", - "deny-and-remember" - ] - }, - "payload": { - "type": "object", - "oneOf": [ - { - "properties": { - "type": { - "type": "string", - "enum": [ "counts"] - }, - "counters": { - "type": "object", - "properties": { - "totalBlockedAudibleMedia": { - "minimum": 0, - "type": "integer" - }, - "totalPages": { - "minimum": 0, - "type": "integer" - }, - "totalPagesAM": { - "minimum": 0, - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "totalPages", - "totalPagesAM", - "totalBlockedAudibleMedia" - ] - } - }, - "additionalProperties": false, - "required": [ - "type", - "counters" - ] - }, - { - "additionalProperties": false, - "properties": { - "promptResponse": { - "items": { - "oneOf": [ - { - "additionalProperties": false, - "properties": { - "pageId": { - "type": "string" - }, - "timestamp": { - "type": "integer" - }, - "responseTime": { - "type": "number", - "minimum": 0 - }, - "interact": { - "type": "string", - "enum": [ - "interact" - ] - }, - "allowAutoplay": { - "type": "boolean" - }, - "rememberCheckbox": { - "type": "boolean" - } - }, - "required": [ - "pageId", - "timestamp", - "responseTime", - "interact", - "rememberCheckbox", - "allowAutoplay" - ] - }, - { - "additionalProperties": false, - "properties": { - "pageId": { - "type": "string" - }, - "timestamp": { - "type": "integer" - }, - "responseTime": { - "type": "number", - "minimum": 0 - }, - "interact": { - "type": "string", - "enum": [ - "escape", - "ignore" - ] - } - }, - "required": [ - "pageId", - "timestamp", - "responseTime", - "interact" - ] - } - ], - "type": "object" - }, - "type": "array" - }, - "type": { - "enum": [ - "prompt" - ], - "type": "string" - } - }, - "required": [ - "type", - "promptResponse" - ] - }, - { - "properties": { - "type": { - "type": "string", - "enum": [ "settings" ] - }, - "settingsChanged": { - "items": { - "type": "object", - "oneOf": [ - { - "properties": { - "globalSettings": { - "type": "object", - "properties": { - "allowAutoplay": { - "type": "string", - "enum": [ - "allow", - "block", - "ask" - ] - } - }, - "additionalProperties": false, - "required": [ - "allowAutoplay" - ] - }, - "timestamp": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "globalSettings", - "timestamp" - ] - }, - { - "properties": { - "pageSpecific": { - "type": "object", - "properties": { - "allowAutoplay": { - "type": "string", - "enum": [ - "allow", - "block", - "default" - ] - }, - "pageId": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "pageId", - "allowAutoplay" - ] - }, - "timestamp": { - "type": "integer" - } - }, - "required": [ - "pageSpecific", - "timestamp" - ] - } - ] - }, - "type": "array" - } - }, - "additionalProperties": false, - "required": [ - "type", - "settingsChanged" - ] - } - ] - } - }, - "additionalProperties": false, - "required": [ - "id", - "branch", - "payload" - ] - } - }, - "required": [ - "type", - "id", - "creationDate", - "version", - "application", - "clientId", - "payload" - ] -} diff --git a/tests/test_telemetry_version.py b/tests/test_telemetry_version.py index 9588c6704..9c60890e5 100644 --- a/tests/test_telemetry_version.py +++ b/tests/test_telemetry_version.py @@ -13,7 +13,7 @@ "android-anr-report": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10], "sync": [4, 5], "mobile-metrics": [1], - "block-autoplay": [1, 4], + "block-autoplay": [4], } diff --git a/validation/firefox-accounts/activity-flow-metrics.1.sample.pass.json b/validation/firefox-accounts/activity-flow-metrics.1.sample.pass.json deleted file mode 100644 index c16f0afea..000000000 --- a/validation/firefox-accounts/activity-flow-metrics.1.sample.pass.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "document_id": "12345678-1234-5678-9abc-0123456789ab", - "document_namespace": "firefox-accounts", - "document_type": "activity-flow-metrics", - "document_version": "1", - "submission_timestamp": "2020-03-14T00:25:58.413Z" -} diff --git a/validation/firefox-accounts/amplitude-event.1.fxa-auth-server--fxa_login--success.pass.json b/validation/firefox-accounts/amplitude-event.1.fxa-auth-server--fxa_login--success.pass.json deleted file mode 100644 index 5ea408cff..000000000 --- a/validation/firefox-accounts/amplitude-event.1.fxa-auth-server--fxa_login--success.pass.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "event_type": "fxa_login - success", - "country": "United States", - "time": 1584635442022, - "os_name": "Windows", - "app_version": "162.3", - "language": "en", - "region": "Oregon", - "op": "amplitudeEvent", - "user_id": "4c86e262edbc48c6804c728a2e5711f0", - "user_properties": "{\"ua_browser\":\"Firefox\",\"ua_version\":\"76.0\"}", - "os_version": "8.1", - "event_properties": "{}" -} diff --git a/validation/firefox-accounts/amplitude-event.1.fxa-content-server--fxa_reg--view.pass.json b/validation/firefox-accounts/amplitude-event.1.fxa-content-server--fxa_reg--view.pass.json deleted file mode 100644 index 74c46c8a8..000000000 --- a/validation/firefox-accounts/amplitude-event.1.fxa-content-server--fxa_reg--view.pass.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "session_id": 1584630379123, - "region": "Ontario", - "op": "amplitudeEvent", - "os_version": "10", - "user_properties": "{\"flow_id\":\"a2433a8201097b064cff25d1f08c62f9b47167e91994306a07eea0e6a5988123\",\"ua_browser\":\"Firefox\",\"ua_version\":\"74.0\",\"$append\":{\"fxa_services_used\":\"undefined_oauth\"}}", - "device_id": "33c6a63e28d64dae90c93609ff430900", - "event_properties": "{\"service\":\"undefined_oauth\",\"oauth_client_id\":\"e6eb0d1e856335fc\"}", - "event_type": "fxa_reg - view", - "country": "Canada", - "time": 1584630383466, - "os_name": "Windows", - "app_version": "162.1", - "language": "en" -} diff --git a/validation/firefox-accounts/amplitude-event.1.fxa-payments-server--fxa_pay_setup--engage.pass.json b/validation/firefox-accounts/amplitude-event.1.fxa-payments-server--fxa_pay_setup--engage.pass.json deleted file mode 100644 index 8cd66f3aa..000000000 --- a/validation/firefox-accounts/amplitude-event.1.fxa-payments-server--fxa_pay_setup--engage.pass.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "op": "amplitudeEvent", - "event_type": "fxa_pay_setup - engage", - "time": 1584621762045, - "os_name": "Windows", - "app_version": "162.1", - "os_version": "10", - "user_properties": "{\"flow_id\":\"cdb4d564b76249355c8d9e8d0741db2b192f4cd7185ef5a1c197c2cf06d32610\",\"ua_browser\":\"Firefox\",\"ua_version\":\"72.0\"}", - "device_id": "61e8366b8d374ad08f49b59c79904bab", - "session_id": "1584261684526", - "event_properties": "{\"plan_id\":\"plan_FiJ55YK6UYftPa\",\"product_id\":\"prod_FiJ42WCzZNRSbS\"}" -} diff --git a/validation/telemetry/block-autoplay.1.counters.pass.json b/validation/telemetry/block-autoplay.1.counters.pass.json deleted file mode 100644 index a47521b5b..000000000 --- a/validation/telemetry/block-autoplay.1.counters.pass.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "type": "block-autoplay", - "id": "36d2c19a-30d0-f441-88cf-5c477de3275e", - "creationDate": "2018-08-21T21:25:43.172Z", - "version": 4, - "clientId": "71b6cac2-b7fb-f04e-9768-366ab51d3cfa", - "application": { - "architecture": "x86-64", - "buildId": "20180821100053", - "name": "Firefox", - "version": "63.0a1", - "displayVersion": "63.0a1", - "vendor": "Mozilla", - "platformVersion": "63.0a1", - "xpcomAbi": "x86_64-gcc3", - "channel": "nightly" - }, - "payload": { - "id": 15, - "branch": "control", - "payload": { - "type": "counts", - "counters": { - "totalPages": 300, - "totalPagesAM": 100, - "totalBlockedAudibleMedia": 50 - } - } - } -} diff --git a/validation/telemetry/block-autoplay.1.prompt.pass.json b/validation/telemetry/block-autoplay.1.prompt.pass.json deleted file mode 100644 index 7f75eed00..000000000 --- a/validation/telemetry/block-autoplay.1.prompt.pass.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "type": "block-autoplay", - "id": "36d2c19a-30d0-f441-88cf-5c477de3275e", - "creationDate": "2018-08-21T21:25:43.172Z", - "version": 4, - "clientId": "71b6cac2-b7fb-f04e-9768-366ab51d3cfa", - "application": { - "architecture": "x86-64", - "buildId": "20180821100053", - "name": "Firefox", - "version": "63.0a1", - "displayVersion": "63.0a1", - "vendor": "Mozilla", - "platformVersion": "63.0a1", - "xpcomAbi": "x86_64-gcc3", - "channel": "nightly" - }, - "payload": { - "id": 10, - "branch": "allow-and-notRemember", - "payload": { - "type": "prompt", - "promptResponse": [ - { - "pageId": "cwnvsc7gllrdfgwssnpo", - "timestamp": 1532567717284, - "responseTime": 1.5, - "interact": "interact", - "allowAutoplay": false, - "rememberCheckbox": false - }, - { - "pageId": "cwnvsc7gllrdfgwssnpo", - "timestamp": 1535489632269, - "responseTime": 0, - "interact": "escape" - }, - { - "pageId": "cwnvsc7gllrdfgwssnpo", - "timestamp": 1535489636047, - "responseTime": 5, - "interact": "ignore" - } - ] - } - } -} diff --git a/validation/telemetry/block-autoplay.1.settings.pass.json b/validation/telemetry/block-autoplay.1.settings.pass.json deleted file mode 100644 index f7f316f5a..000000000 --- a/validation/telemetry/block-autoplay.1.settings.pass.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "type": "block-autoplay", - "id": "36d2c19a-30d0-f441-88cf-5c477de3275e", - "creationDate": "2018-08-21T21:25:43.172Z", - "version": 4, - "clientId": "71b6cac2-b7fb-f04e-9768-366ab51d3cfa", - "application": { - "architecture": "x86-64", - "buildId": "20180821100053", - "name": "Firefox", - "version": "63.0a1", - "displayVersion": "63.0a1", - "vendor": "Mozilla", - "platformVersion": "63.0a1", - "xpcomAbi": "x86_64-gcc3", - "channel": "nightly" - }, - "payload": { - "id": 20, - "branch": "allow-and-remember", - "payload": { - "type": "settings", - "settingsChanged": [ - { - "timestamp": 1532567696509, - "globalSettings": { - "allowAutoplay": "allow" - } - }, - { - "timestamp":1532567697598, - "globalSettings":{ - "allowAutoplay": "ask" - } - }, - { - "timestamp":1532567697798, - "globalSettings":{ - "allowAutoplay": "block" - } - }, - { - "timestamp": 1532567700984, - "pageSpecific": { - "pageId": "a8252bd8ac60de9f901001773db53cf5e4dddf9bd9c056d0b00cb749f81b649a", - "allowAutoplay": "allow" - } - }, - { - "timestamp": 1532567800984, - "pageSpecific": { - "pageId": "a8252befec60de9f901001773db53cf5e4dddf9bd9c056d0b00cb749f81b649a", - "allowAutoplay": "default" - } - }, - { - "timestamp": 1532587800984, - "pageSpecific": { - "pageId": "a8252bd8ac60de9f901001773db53cf5e4dddf9bd9c056d0b00cb749f81b6ekoi", - "allowAutoplay": "block" - } - } - ] - } - } -}