diff --git a/schemas/pioneer-study/esper-study-telemetry.1.parquetmr.txt b/schemas/pioneer-study/esper-study-telemetry.1.parquetmr.txt deleted file mode 100644 index 3f9621633..000000000 --- a/schemas/pioneer-study/esper-study-telemetry.1.parquetmr.txt +++ /dev/null @@ -1,65 +0,0 @@ -message esper-study-telemetry { - required group metadata { - required int64 Timestamp; - required binary pioneerId (UTF8); - required binary studyName (UTF8); - optional binary reason (UTF8); - optional binary Date (UTF8); - optional binary DNT (UTF8); - optional binary appUpdateChannel (UTF8); - required binary documentId (UTF8); - optional binary docType (UTF8); - optional binary os (UTF8); - optional binary sourceName (UTF8); - optional binary normalizedChannel (UTF8); - optional binary appVendor (UTF8); - optional binary clientId (UTF8); - optional binary Host (UTF8); - required binary geoCountry (UTF8); - required binary geoCity (UTF8); - optional binary appVersion (UTF8); - required binary appBuildId (UTF8); - required binary appName (UTF8); - } - required binary defaultSearchEngine (UTF8); - required binary locale (UTF8); - required binary os (UTF8); - required binary appUpdateChannel (UTF8); - required binary profileCreationDate (UTF8); - required binary appVersion (UTF8); - required binary systemMemoryMb (UTF8); - required binary systemCpuCores (UTF8); - required binary systemCpuSpeedMhz (UTF8); - required binary osVersion (UTF8); - required binary systemGfxMonitors1ScreenWidth (UTF8); - required binary systemGfxMonitors1ScreenWidthZeroIndexed (UTF8); - required binary uptime (UTF8); - required binary totalTime (UTF8); - required binary profileSubsessionCounter (UTF8); - required binary subsessionStartDate (UTF8); - required binary timezoneOffest (UTF8); - required binary searchCounts (UTF8); - required binary spbeWindowOpenEventCount (UTF8); - required binary spbeTotalUriCount (UTF8); - required binary spbeNavigationUrlbar (UTF8); - required binary spbeNavigationContextmenu (UTF8); - required binary spbeTabOpenEventCount (UTF8); - required binary spbeNavigationSearchbar (UTF8); - required binary spbeNavigationAboutNewtab (UTF8); - required binary spbeUniqueDomainsCount (UTF8); - required binary spbeMaxConcurrentWindowCount (UTF8); - required binary spbeMaxConcurrentTabCount (UTF8); - required binary spbeUnfilteredUriCount (UTF8); - required binary placesBookmarksCount (UTF8); - required binary placesPagesCount (UTF8); - required group pioneerAddonMetadata { - required binary packetVersion (UTF8); - required binary studyName (UTF8); - required binary branch (UTF8); - required binary addonId (UTF8); - required binary addonVersion (UTF8); - required binary pioneerUtilsVersion (UTF8); - required binary type (UTF8); - required boolean testing; - } -} diff --git a/schemas/pioneer-study/esper-study-telemetry.1.schema.json b/schemas/pioneer-study/esper-study-telemetry.1.schema.json deleted file mode 100644 index 87de8ff16..000000000 --- a/schemas/pioneer-study/esper-study-telemetry.1.schema.json +++ /dev/null @@ -1,288 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-04/schema#", - "properties": { - "appUpdateChannel": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "appVersion": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "defaultSearchEngine": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "locale": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "os": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "osVersion": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "pioneerAddonMetadata": { - "properties": { - "addonId": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "addonVersion": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "branch": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "packetVersion": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "pioneerUtilsVersion": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "studyName": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "testing": { - "description": "", - "type": "boolean" - }, - "type": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - } - }, - "required": [ - "packetVersion", - "studyName", - "branch", - "addonId", - "addonVersion", - "pioneerUtilsVersion", - "type", - "testing" - ], - "type": "object" - }, - "placesBookmarksCount": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "placesPagesCount": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "profileCreationDate": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "profileSubsessionCounter": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "searchCounts": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "spbeMaxConcurrentTabCount": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "spbeMaxConcurrentWindowCount": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "spbeNavigationAboutNewtab": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "spbeNavigationContextmenu": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "spbeNavigationSearchbar": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "spbeNavigationUrlbar": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "spbeTabOpenEventCount": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "spbeTotalUriCount": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "spbeUnfilteredUriCount": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "spbeUniqueDomainsCount": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "spbeWindowOpenEventCount": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "subsessionStartDate": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "systemCpuCores": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "systemCpuSpeedMhz": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "systemGfxMonitors1ScreenWidth": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "systemGfxMonitors1ScreenWidthZeroIndexed": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "systemMemoryMb": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "timezoneOffest": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "totalTime": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "uptime": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - } - }, - "required": [ - "defaultSearchEngine", - "locale", - "os", - "appUpdateChannel", - "profileCreationDate", - "appVersion", - "systemMemoryMb", - "systemCpuCores", - "systemCpuSpeedMhz", - "osVersion", - "systemGfxMonitors1ScreenWidth", - "systemGfxMonitors1ScreenWidthZeroIndexed", - "uptime", - "totalTime", - "profileSubsessionCounter", - "subsessionStartDate", - "timezoneOffest", - "searchCounts", - "spbeWindowOpenEventCount", - "spbeTotalUriCount", - "spbeNavigationUrlbar", - "spbeNavigationContextmenu", - "spbeTabOpenEventCount", - "spbeNavigationSearchbar", - "spbeNavigationAboutNewtab", - "spbeUniqueDomainsCount", - "spbeMaxConcurrentWindowCount", - "spbeMaxConcurrentTabCount", - "spbeUnfilteredUriCount", - "placesBookmarksCount", - "placesPagesCount", - "pioneerAddonMetadata" - ], - "title": "esper-study-telemetry", - "type": "object" -} diff --git a/schemas/pioneer-study/event.1.parquetmr.txt b/schemas/pioneer-study/event.1.parquetmr.txt deleted file mode 100644 index 36de97cd1..000000000 --- a/schemas/pioneer-study/event.1.parquetmr.txt +++ /dev/null @@ -1,12 +0,0 @@ -message event { - required group metadata { - required int64 Timestamp; - required binary documentId (UTF8); - required binary pioneerId (UTF8); - required binary studyName (UTF8); - optional binary geoCity (UTF8); - optional binary geoCountry (UTF8); - optional binary normalizedChannel (UTF8); - } - required binary eventId (UTF8); -} diff --git a/schemas/pioneer-study/event.1.schema.json b/schemas/pioneer-study/event.1.schema.json deleted file mode 100644 index 8485a814f..000000000 --- a/schemas/pioneer-study/event.1.schema.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-04/schema#", - "properties": { - "eventId": { - "description": "The ID of the event.", - "maxLength": 256, - "minLength": 1, - "type": "string" - } - }, - "required": [ - "eventId" - ], - "title": "event", - "type": "object" -} diff --git a/schemas/pioneer-study/online-news-log.1.parquetmr.txt b/schemas/pioneer-study/online-news-log.1.parquetmr.txt deleted file mode 100644 index aa2ca0186..000000000 --- a/schemas/pioneer-study/online-news-log.1.parquetmr.txt +++ /dev/null @@ -1,20 +0,0 @@ -message online-news-log { - required group metadata { - required int64 Timestamp; - required binary documentId (UTF8); - required binary pioneerId (UTF8); - required binary studyName (UTF8); - optional binary geoCity (UTF8); - optional binary geoCountry (UTF8); - optional binary normalizedChannel (UTF8); - } - required group entries (LIST) { - repeated group list { - required group element { - required int64 timestamp; - required binary details (UTF8); - required binary url (UTF8); - } - } - } -} diff --git a/schemas/pioneer-study/online-news-log.1.schema.json b/schemas/pioneer-study/online-news-log.1.schema.json deleted file mode 100644 index dfbb04763..000000000 --- a/schemas/pioneer-study/online-news-log.1.schema.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-04/schema#", - "properties": { - "entries": { - "description": "A list of log entries.", - "items": { - "properties": { - "details": { - "description": "Details of the entry.", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "timestamp": { - "description": "Timestamp for the entry.", - "minimum": 0, - "type": "integer" - }, - "url": { - "description": "The URL the user was focused on.", - "maxLength": 2048, - "minLength": 1, - "type": "string" - } - }, - "required": [ - "details", - "timestamp", - "url" - ], - "type": "object" - }, - "type": "array" - } - }, - "required": [ - "entries" - ], - "title": "online-news-log", - "type": "object" -} diff --git a/schemas/pioneer-study/online-news-log.2.parquetmr.txt b/schemas/pioneer-study/online-news-log.2.parquetmr.txt deleted file mode 100644 index cf52a0221..000000000 --- a/schemas/pioneer-study/online-news-log.2.parquetmr.txt +++ /dev/null @@ -1,21 +0,0 @@ -message online-news-log { - required group metadata { - required int64 Timestamp; - required binary documentId (UTF8); - required binary pioneerId (UTF8); - required binary studyName (UTF8); - optional binary geoCity (UTF8); - optional binary geoCountry (UTF8); - optional binary normalizedChannel (UTF8); - } - required group entries (LIST) { - repeated group list { - required group element { - required int64 timestamp; - optional binary branch (UTF8); - required binary details (UTF8); - required binary url (UTF8); - } - } - } -} diff --git a/schemas/pioneer-study/online-news-log.2.schema.json b/schemas/pioneer-study/online-news-log.2.schema.json deleted file mode 100644 index 3b94f2950..000000000 --- a/schemas/pioneer-study/online-news-log.2.schema.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-04/schema#", - "properties": { - "entries": { - "description": "A list of log entries.", - "items": { - "properties": { - "branch": { - "description": "The branch of the study the user is enrolled in.", - "maxLength": 32, - "minLength": 1, - "type": "string" - }, - "details": { - "description": "Details of the entry.", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "timestamp": { - "description": "Timestamp for the entry.", - "minimum": 0, - "type": "integer" - }, - "url": { - "description": "The URL the user was focused on.", - "maxLength": 2048, - "minLength": 1, - "type": "string" - } - }, - "required": [ - "details", - "timestamp", - "url" - ], - "type": "object" - }, - "type": "array" - } - }, - "required": [ - "entries" - ], - "title": "online-news-log", - "type": "object" -} diff --git a/schemas/pioneer-study/pathfinder-event.1.parquetmr.txt b/schemas/pioneer-study/pathfinder-event.1.parquetmr.txt deleted file mode 100644 index 643aec4e2..000000000 --- a/schemas/pioneer-study/pathfinder-event.1.parquetmr.txt +++ /dev/null @@ -1,14 +0,0 @@ -message pathfinder-event { - required group metadata { - required int64 Timestamp; - required binary documentId (UTF8); - required binary pioneerId (UTF8); - required binary studyName (UTF8); - optional binary geoCity (UTF8); - optional binary geoCountry (UTF8); - optional binary normalizedChannel (UTF8); - } - required binary eventId (UTF8); - required int64 timestamp; - required binary context (UTF8); -} diff --git a/schemas/pioneer-study/pathfinder-event.1.schema.json b/schemas/pioneer-study/pathfinder-event.1.schema.json deleted file mode 100644 index 8da307e70..000000000 --- a/schemas/pioneer-study/pathfinder-event.1.schema.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-04/schema#", - "properties": { - "context": { - "description": "Contextual data for the event.", - "maxLength": 2048, - "minLength": 0, - "type": "string" - }, - "eventId": { - "description": "The ID of the event.", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "timestamp": { - "description": "Timestamp for the entry.", - "minimum": 0, - "type": "integer" - } - }, - "required": [ - "eventId", - "timestamp", - "context" - ], - "title": "pathfinder-event", - "type": "object" -} diff --git a/schemas/pioneer-study/pathfinder-log.1.parquetmr.txt b/schemas/pioneer-study/pathfinder-log.1.parquetmr.txt deleted file mode 100644 index c91bf6923..000000000 --- a/schemas/pioneer-study/pathfinder-log.1.parquetmr.txt +++ /dev/null @@ -1,20 +0,0 @@ -message pathfinder-log { - required group metadata { - required int64 Timestamp; - required binary documentId (UTF8); - required binary pioneerId (UTF8); - required binary studyName (UTF8); - optional binary geoCity (UTF8); - optional binary geoCountry (UTF8); - optional binary normalizedChannel (UTF8); - } - required group entries (LIST) { - repeated group list { - required group element { - required int64 timestamp; - required binary details (UTF8); - required binary url (UTF8); - } - } - } -} diff --git a/schemas/pioneer-study/pathfinder-log.1.schema.json b/schemas/pioneer-study/pathfinder-log.1.schema.json deleted file mode 100644 index b370f110b..000000000 --- a/schemas/pioneer-study/pathfinder-log.1.schema.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-04/schema#", - "properties": { - "entries": { - "description": "A list of log entries.", - "items": { - "properties": { - "details": { - "description": "Details of the entry.", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "timestamp": { - "description": "Timestamp for the entry.", - "minimum": 0, - "type": "integer" - }, - "url": { - "description": "The URL the user was focused on.", - "maxLength": 2048, - "minLength": 1, - "type": "string" - } - }, - "required": [ - "details", - "timestamp", - "url" - ], - "type": "object" - }, - "type": "array" - } - }, - "required": [ - "entries" - ], - "title": "pathfinder-log", - "type": "object" -} diff --git a/schemas/pioneer-study/shield-study-addon.3.parquetmr.txt b/schemas/pioneer-study/shield-study-addon.3.parquetmr.txt deleted file mode 100644 index 6feac3c36..000000000 --- a/schemas/pioneer-study/shield-study-addon.3.parquetmr.txt +++ /dev/null @@ -1,32 +0,0 @@ -message shield-study-addon { - required int64 version; - required binary study_name (UTF8); - required binary branch (UTF8); - required binary addon_version (UTF8); - required binary shield_version (UTF8); - optional boolean testing; - required group data { - required group attributes (MAP) { - repeated group key_value { - required binary key (UTF8); - required binary value (UTF8); - } - } - } - required binary type (UTF8); - required binary metadata_pioneerId (UTF8); - required int64 metadata_Timestamp; - optional binary metadata_appBuildId (UTF8); - optional binary metadata_appName (UTF8); - optional binary metadata_appUpdateChannel (UTF8); - optional binary metadata_appVendor (UTF8); - optional binary metadata_appVersion (UTF8); - required int64 metadata_creationTimestamp; - optional binary metadata_documentId (UTF8); - optional binary metadata_geoCity (UTF8); - optional binary metadata_geoIP (UTF8); - optional binary metadata_geoCountry (UTF8); - optional binary metadata_geoSubdivision1 (UTF8); - optional binary metadata_geoSubdivision2 (UTF8); - optional binary metadata_normalizedChannel (UTF8); -} diff --git a/schemas/pioneer-study/shield-study-addon.3.schema.json b/schemas/pioneer-study/shield-study-addon.3.schema.json deleted file mode 100644 index 135f4f0d6..000000000 --- a/schemas/pioneer-study/shield-study-addon.3.schema.json +++ /dev/null @@ -1,81 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-04/schema#", - "description": "`shield-study-addon` addon-specific probe data, with `attributes` sent as Map(s,s).", - "properties": { - "addon_version": { - "description": "Semantic version of the addon.", - "maxLength": 100, - "minLength": 1, - "pattern": "^\\S+$", - "type": "string" - }, - "branch": { - "description": "Which branch (variation) of the study the user has.", - "maxLength": 100, - "minLength": 1, - "pattern": "^\\S+$", - "type": "string" - }, - "data": { - "description": "`shield-study-addon` addon-specific probe data, with `attributes` sent as Map(s,s).", - "properties": { - "attributes": { - "additionalProperties": { - "type": "string" - }, - "description": "Map(string, string) of attributes.", - "properties": {}, - "type": "object" - } - }, - "required": [ - "attributes" - ], - "title": "Shield-Study-Addon 'data' field.", - "type": "object" - }, - "shield_version": { - "description": "Which version of the shield-studies-addon-utils.", - "maxLength": 100, - "minLength": 1, - "pattern": "^\\S+$", - "type": "string" - }, - "study_name": { - "description": "Name of a particular study. Usually the addon_id.", - "maxLength": 100, - "minLength": 1, - "pattern": "^\\S+$", - "type": "string" - }, - "testing": { - "description": "If `true`, this packet is a TESTING packet and can be safely ignored.", - "type": "boolean" - }, - "type": { - "description": "doc_type, restated", - "enum": [ - "shield-study-addon" - ], - "type": "string" - }, - "version": { - "enum": [ - 3 - ], - "title": "Version schema. Will be 3", - "type": "integer" - } - }, - "required": [ - "version", - "study_name", - "branch", - "addon_version", - "shield_version", - "data", - "type" - ], - "title": "shield-study-addon", - "type": "object" -} diff --git a/schemas/pioneer-study/shield-study-error.3.parquetmr.txt b/schemas/pioneer-study/shield-study-error.3.parquetmr.txt deleted file mode 100644 index 20b5ed1bf..000000000 --- a/schemas/pioneer-study/shield-study-error.3.parquetmr.txt +++ /dev/null @@ -1,42 +0,0 @@ -message shield-study-error { - required int64 version; - required binary study_name (UTF8); - required binary branch (UTF8); - required binary addon_version (UTF8); - required binary shield_version (UTF8); - optional boolean testing; - required group data { - required binary error_id (UTF8); - required binary error_source (UTF8); - optional binary message (UTF8); - optional binary severity (UTF8); - optional group attributes (MAP) { - repeated group key_value { - required binary key (UTF8); - required binary value (UTF8); - } - } - optional group error (MAP) { - repeated group key_value { - required binary key (UTF8); - required binary value (UTF8); - } - } - } - required binary type (UTF8); - required binary metadata_pioneerId (UTF8); - required int64 metadata_Timestamp; - optional binary metadata_appBuildId (UTF8); - optional binary metadata_appName (UTF8); - optional binary metadata_appUpdateChannel (UTF8); - optional binary metadata_appVendor (UTF8); - optional binary metadata_appVersion (UTF8); - required int64 metadata_creationTimestamp; - optional binary metadata_documentId (UTF8); - optional binary metadata_geoCity (UTF8); - optional binary metadata_geoIP (UTF8); - optional binary metadata_geoCountry (UTF8); - optional binary metadata_geoSubdivision1 (UTF8); - optional binary metadata_geoSubdivision2 (UTF8); - optional binary metadata_normalizedChannel (UTF8); -} diff --git a/schemas/pioneer-study/shield-study-error.3.schema.json b/schemas/pioneer-study/shield-study-error.3.schema.json deleted file mode 100644 index 3c45bdcdf..000000000 --- a/schemas/pioneer-study/shield-study-error.3.schema.json +++ /dev/null @@ -1,124 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-04/schema#", - "description": "`shield-study-error` data used to notify, group and count some kinds of errors from shield studies.", - "properties": { - "addon_version": { - "description": "Semantic version of the addon.", - "maxLength": 100, - "minLength": 1, - "pattern": "^\\S+$", - "type": "string" - }, - "branch": { - "description": "Which branch (variation) of the study the user has.", - "maxLength": 100, - "minLength": 1, - "pattern": "^\\S+$", - "type": "string" - }, - "data": { - "description": "`shield-study-error` data used to notify, group and count some kinds of errors from shield studies.", - "properties": { - "attributes": { - "additionalProperties": { - "type": "string" - }, - "description": "Map(string, string) of attributes.", - "properties": {}, - "type": "object" - }, - "error": { - "additionalProperties": { - "type": "string" - }, - "description": "(Future use), things like tracebacks.", - "properties": {}, - "type": "object" - }, - "error_id": { - "description": "between 1,100 chars, no spaces, unicode ok.", - "maxLength": 100, - "minLength": 1, - "pattern": "^\\S+$", - "type": "string" - }, - "error_source": { - "description": "Where did the error originate.", - "enum": [ - "addon", - "shield", - "firefox", - "unknown" - ], - "type": "string" - }, - "message": { - "description": "String of an error message.", - "minLength": 1, - "title": "Message schema.", - "type": "string" - }, - "severity": { - "description": "An explanation about the purpose of this instance.", - "enum": [ - "debug", - "info", - "warn", - "fatal", - "impossible" - ], - "type": "string" - } - }, - "required": [ - "error_id", - "error_source" - ], - "title": "Shield-Study-Error 'data' field", - "type": "object" - }, - "shield_version": { - "description": "Which version of the shield-studies-addon-utils.", - "maxLength": 100, - "minLength": 1, - "pattern": "^\\S+$", - "type": "string" - }, - "study_name": { - "description": "Name of a particular study. Usually the addon_id.", - "maxLength": 100, - "minLength": 1, - "pattern": "^\\S+$", - "type": "string" - }, - "testing": { - "description": "If `true`, this packet is a TESTING packet and can be safely ignored.", - "type": "boolean" - }, - "type": { - "description": "doc_type, restated", - "enum": [ - "shield-study-error" - ], - "type": "string" - }, - "version": { - "enum": [ - 3 - ], - "title": "Version schema. Will be 3", - "type": "integer" - } - }, - "required": [ - "version", - "study_name", - "branch", - "addon_version", - "shield_version", - "data", - "type" - ], - "title": "shield-study-error", - "type": "object" -} diff --git a/schemas/pioneer-study/shield-study.3.parquetmr.txt b/schemas/pioneer-study/shield-study.3.parquetmr.txt deleted file mode 100644 index 47d59a253..000000000 --- a/schemas/pioneer-study/shield-study.3.parquetmr.txt +++ /dev/null @@ -1,34 +0,0 @@ -message shield-study { - required int64 version; - required binary study_name (UTF8); - required binary branch (UTF8); - required binary addon_version (UTF8); - required binary shield_version (UTF8); - optional boolean testing; - required group data { - required binary study_state (UTF8); - optional binary study_state_fullname (UTF8); - optional group attributes (MAP) { - repeated group key_value { - required binary key (UTF8); - required binary value (UTF8); - } - } - } - required binary type (UTF8); - required binary metadata_pioneerId (UTF8); - required int64 metadata_Timestamp; - optional binary metadata_appBuildId (UTF8); - optional binary metadata_appName (UTF8); - optional binary metadata_appUpdateChannel (UTF8); - optional binary metadata_appVendor (UTF8); - optional binary metadata_appVersion (UTF8); - required int64 metadata_creationTimestamp; - optional binary metadata_documentId (UTF8); - optional binary metadata_geoCity (UTF8); - optional binary metadata_geoIP (UTF8); - optional binary metadata_geoCountry (UTF8); - optional binary metadata_geoSubdivision1 (UTF8); - optional binary metadata_geoSubdivision2 (UTF8); - optional binary metadata_normalizedChannel (UTF8); -} diff --git a/schemas/pioneer-study/shield-study.3.schema.json b/schemas/pioneer-study/shield-study.3.schema.json deleted file mode 100644 index 4a64c1f6e..000000000 --- a/schemas/pioneer-study/shield-study.3.schema.json +++ /dev/null @@ -1,100 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-04/schema#", - "description": "`shield-study` state and outcome data.", - "properties": { - "addon_version": { - "description": "Semantic version of the addon.", - "maxLength": 100, - "minLength": 1, - "pattern": "^\\S+$", - "type": "string" - }, - "branch": { - "description": "Which branch (variation) of the study the user has.", - "maxLength": 100, - "minLength": 1, - "pattern": "^\\S+$", - "type": "string" - }, - "data": { - "description": "`shield-study` state and outcome data.", - "properties": { - "attributes": { - "additionalProperties": { - "type": "string" - }, - "description": "Map(string, string) of attributes.", - "properties": {}, - "type": "object" - }, - "study_state": { - "description": "message about the most recent state of the study.", - "enum": [ - "enter", - "exit", - "installed", - "ineligible", - "expired", - "user-disable", - "ended-positive", - "ended-neutral", - "ended-negative", - "active" - ], - "type": "string" - }, - "study_state_fullname": { - "description": "Second part of name of state, if any. Study-specific for study-defined endings.", - "type": "string" - } - }, - "required": [ - "study_state" - ], - "type": "object" - }, - "shield_version": { - "description": "Which version of the shield-studies-addon-utils.", - "maxLength": 100, - "minLength": 1, - "pattern": "^\\S+$", - "type": "string" - }, - "study_name": { - "description": "Name of a particular study. Usually the addon_id.", - "maxLength": 100, - "minLength": 1, - "pattern": "^\\S+$", - "type": "string" - }, - "testing": { - "description": "If `true`, this packet is a TESTING packet and can be safely ignored.", - "type": "boolean" - }, - "type": { - "description": "doc_type, restated", - "enum": [ - "shield-study" - ], - "type": "string" - }, - "version": { - "enum": [ - 3 - ], - "title": "Version schema. Will be 3", - "type": "integer" - } - }, - "required": [ - "version", - "study_name", - "branch", - "addon_version", - "shield_version", - "data", - "type" - ], - "title": "shield-study", - "type": "object" -} diff --git a/schemas/telemetry/pioneer-study/pioneer-study.4.schema.json b/schemas/telemetry/pioneer-study/pioneer-study.4.schema.json index 484b9aa26..bf63a1317 100644 --- a/schemas/telemetry/pioneer-study/pioneer-study.4.schema.json +++ b/schemas/telemetry/pioneer-study/pioneer-study.4.schema.json @@ -79,6 +79,13 @@ "pattern": "^\\S+$", "type": "string" }, + "schemaNamespace": { + "description": "The namespace of the schema used for validation and routing to a dataset.", + "maxLength": 100, + "minLength": 1, + "pattern": "^\\S+$", + "type": "string" + }, "schemaVersion": { "description": "Integer version number of the schema", "minimum": 1, @@ -96,6 +103,7 @@ "encryptedData", "encryptionKeyId", "pioneerId", + "schemaNamespace", "studyName", "schemaName", "schemaVersion" diff --git a/templates/pioneer-study/esper-study-telemetry.1.parquetmr.txt b/templates/pioneer-study/esper-study-telemetry.1.parquetmr.txt deleted file mode 100644 index 1ee44a117..000000000 --- a/templates/pioneer-study/esper-study-telemetry.1.parquetmr.txt +++ /dev/null @@ -1,65 +0,0 @@ -message esper-study-telemetry { - required group metadata { - required int64 Timestamp; - required binary pioneerId (UTF8); - required binary studyName (UTF8); - optional binary reason (UTF8); - optional binary Date (UTF8); - optional binary DNT (UTF8); - optional binary appUpdateChannel (UTF8); - required binary documentId (UTF8); - optional binary docType (UTF8); - optional binary os (UTF8); - optional binary sourceName (UTF8); - optional binary normalizedChannel (UTF8); - optional binary appVendor (UTF8); - optional binary clientId (UTF8); - optional binary Host (UTF8); - required binary geoCountry (UTF8); - required binary geoCity (UTF8); - optional binary appVersion (UTF8); - required binary appBuildId (UTF8); - required binary appName (UTF8); - } - required binary defaultSearchEngine (UTF8); - required binary locale (UTF8); - required binary os (UTF8); - required binary appUpdateChannel (UTF8); - required binary profileCreationDate (UTF8); - required binary appVersion (UTF8); - required binary systemMemoryMb (UTF8); - required binary systemCpuCores (UTF8); - required binary systemCpuSpeedMhz (UTF8); - required binary osVersion (UTF8); - required binary systemGfxMonitors1ScreenWidth (UTF8); - required binary systemGfxMonitors1ScreenWidthZeroIndexed (UTF8); - required binary uptime (UTF8); - required binary totalTime (UTF8); - required binary profileSubsessionCounter (UTF8); - required binary subsessionStartDate (UTF8); - required binary timezoneOffest (UTF8); - required binary searchCounts (UTF8); - required binary spbeWindowOpenEventCount (UTF8); - required binary spbeTotalUriCount (UTF8); - required binary spbeNavigationUrlbar (UTF8); - required binary spbeNavigationContextmenu (UTF8); - required binary spbeTabOpenEventCount (UTF8); - required binary spbeNavigationSearchbar (UTF8); - required binary spbeNavigationAboutNewtab (UTF8); - required binary spbeUniqueDomainsCount (UTF8); - required binary spbeMaxConcurrentWindowCount (UTF8); - required binary spbeMaxConcurrentTabCount (UTF8); - required binary spbeUnfilteredUriCount (UTF8); - required binary placesBookmarksCount (UTF8); - required binary placesPagesCount (UTF8); - required group pioneerAddonMetadata { - required binary packetVersion (UTF8); - required binary studyName (UTF8); - required binary branch (UTF8); - required binary addonId (UTF8); - required binary addonVersion (UTF8); - required binary pioneerUtilsVersion (UTF8); - required binary type (UTF8); - required boolean testing; - } -} diff --git a/templates/pioneer-study/esper-study-telemetry.1.schema.json b/templates/pioneer-study/esper-study-telemetry.1.schema.json deleted file mode 100644 index 935eb7400..000000000 --- a/templates/pioneer-study/esper-study-telemetry.1.schema.json +++ /dev/null @@ -1,288 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-04/schema#", - "properties": { - "defaultSearchEngine": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "locale": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "os": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "appUpdateChannel": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "profileCreationDate": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "appVersion": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "systemMemoryMb": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "systemCpuCores": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "systemCpuSpeedMhz": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "osVersion": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "systemGfxMonitors1ScreenWidth": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "systemGfxMonitors1ScreenWidthZeroIndexed": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "uptime": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "totalTime": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "profileSubsessionCounter": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "subsessionStartDate": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "timezoneOffest": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "searchCounts": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "spbeWindowOpenEventCount": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "spbeTotalUriCount": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "spbeNavigationUrlbar": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "spbeNavigationContextmenu": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "spbeTabOpenEventCount": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "spbeNavigationSearchbar": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "spbeNavigationAboutNewtab": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "spbeUniqueDomainsCount": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "spbeMaxConcurrentWindowCount": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "spbeMaxConcurrentTabCount": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "spbeUnfilteredUriCount": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "placesBookmarksCount": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "placesPagesCount": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "pioneerAddonMetadata": { - "properties": { - "packetVersion": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "studyName": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "branch": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "addonId": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "addonVersion": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "pioneerUtilsVersion": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "type": { - "description": "", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "testing": { - "description": "", - "type": "boolean" - } - }, - "required": [ - "packetVersion", - "studyName", - "branch", - "addonId", - "addonVersion", - "pioneerUtilsVersion", - "type", - "testing" - ], - "type": "object" - } - }, - "required": [ - "defaultSearchEngine", - "locale", - "os", - "appUpdateChannel", - "profileCreationDate", - "appVersion", - "systemMemoryMb", - "systemCpuCores", - "systemCpuSpeedMhz", - "osVersion", - "systemGfxMonitors1ScreenWidth", - "systemGfxMonitors1ScreenWidthZeroIndexed", - "uptime", - "totalTime", - "profileSubsessionCounter", - "subsessionStartDate", - "timezoneOffest", - "searchCounts", - "spbeWindowOpenEventCount", - "spbeTotalUriCount", - "spbeNavigationUrlbar", - "spbeNavigationContextmenu", - "spbeTabOpenEventCount", - "spbeNavigationSearchbar", - "spbeNavigationAboutNewtab", - "spbeUniqueDomainsCount", - "spbeMaxConcurrentWindowCount", - "spbeMaxConcurrentTabCount", - "spbeUnfilteredUriCount", - "placesBookmarksCount", - "placesPagesCount", - "pioneerAddonMetadata" - ], - "title": "esper-study-telemetry", - "type": "object" -} diff --git a/templates/pioneer-study/event.1.parquetmr.txt b/templates/pioneer-study/event.1.parquetmr.txt deleted file mode 100644 index 8f65c919f..000000000 --- a/templates/pioneer-study/event.1.parquetmr.txt +++ /dev/null @@ -1,12 +0,0 @@ -message event { - required group metadata { - required int64 Timestamp; - required binary documentId (UTF8); - required binary pioneerId (UTF8); - required binary studyName (UTF8); - optional binary geoCity (UTF8); - optional binary geoCountry (UTF8); - optional binary normalizedChannel (UTF8); - } - required binary eventId (UTF8); -} diff --git a/templates/pioneer-study/event.1.schema.json b/templates/pioneer-study/event.1.schema.json deleted file mode 100644 index 8485a814f..000000000 --- a/templates/pioneer-study/event.1.schema.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-04/schema#", - "properties": { - "eventId": { - "description": "The ID of the event.", - "maxLength": 256, - "minLength": 1, - "type": "string" - } - }, - "required": [ - "eventId" - ], - "title": "event", - "type": "object" -} diff --git a/templates/pioneer-study/online-news-log.1.parquetmr.txt b/templates/pioneer-study/online-news-log.1.parquetmr.txt deleted file mode 100644 index 126bc121b..000000000 --- a/templates/pioneer-study/online-news-log.1.parquetmr.txt +++ /dev/null @@ -1,20 +0,0 @@ -message online-news-log { - required group metadata { - required int64 Timestamp; - required binary documentId (UTF8); - required binary pioneerId (UTF8); - required binary studyName (UTF8); - optional binary geoCity (UTF8); - optional binary geoCountry (UTF8); - optional binary normalizedChannel (UTF8); - } - required group entries (LIST) { - repeated group list { - required group element { - required int64 timestamp; - required binary details (UTF8); - required binary url (UTF8); - } - } - } -} diff --git a/templates/pioneer-study/online-news-log.1.schema.json b/templates/pioneer-study/online-news-log.1.schema.json deleted file mode 100644 index 2115e98af..000000000 --- a/templates/pioneer-study/online-news-log.1.schema.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-04/schema#", - "properties": { - "entries": { - "description": "A list of log entries.", - "items": { - "properties": { - "details": { - "description": "Details of the entry.", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "timestamp": { - "description": "Timestamp for the entry.", - "minimum": 0, - "type": "integer" - }, - "url": { - "description": "The URL the user was focused on.", - "maxLength": 2048, - "minLength": 1, - "type": "string" - } - }, - "required": [ - "details", - "timestamp", - "url" - ], - "type": "object" - }, - "type": "array" - } - }, - "required": [ - "entries" - ], - "title": "online-news-log", - "type": "object" -} - diff --git a/templates/pioneer-study/online-news-log.2.parquetmr.txt b/templates/pioneer-study/online-news-log.2.parquetmr.txt deleted file mode 100644 index 97b217fa6..000000000 --- a/templates/pioneer-study/online-news-log.2.parquetmr.txt +++ /dev/null @@ -1,21 +0,0 @@ -message online-news-log { - required group metadata { - required int64 Timestamp; - required binary documentId (UTF8); - required binary pioneerId (UTF8); - required binary studyName (UTF8); - optional binary geoCity (UTF8); - optional binary geoCountry (UTF8); - optional binary normalizedChannel (UTF8); - } - required group entries (LIST) { - repeated group list { - required group element { - required int64 timestamp; - optional binary branch (UTF8); - required binary details (UTF8); - required binary url (UTF8); - } - } - } -} diff --git a/templates/pioneer-study/online-news-log.2.schema.json b/templates/pioneer-study/online-news-log.2.schema.json deleted file mode 100644 index 3b94f2950..000000000 --- a/templates/pioneer-study/online-news-log.2.schema.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-04/schema#", - "properties": { - "entries": { - "description": "A list of log entries.", - "items": { - "properties": { - "branch": { - "description": "The branch of the study the user is enrolled in.", - "maxLength": 32, - "minLength": 1, - "type": "string" - }, - "details": { - "description": "Details of the entry.", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "timestamp": { - "description": "Timestamp for the entry.", - "minimum": 0, - "type": "integer" - }, - "url": { - "description": "The URL the user was focused on.", - "maxLength": 2048, - "minLength": 1, - "type": "string" - } - }, - "required": [ - "details", - "timestamp", - "url" - ], - "type": "object" - }, - "type": "array" - } - }, - "required": [ - "entries" - ], - "title": "online-news-log", - "type": "object" -} diff --git a/templates/pioneer-study/pathfinder-event.1.parquetmr.txt b/templates/pioneer-study/pathfinder-event.1.parquetmr.txt deleted file mode 100644 index 6528db96e..000000000 --- a/templates/pioneer-study/pathfinder-event.1.parquetmr.txt +++ /dev/null @@ -1,14 +0,0 @@ -message pathfinder-event { - required group metadata { - required int64 Timestamp; - required binary documentId (UTF8); - required binary pioneerId (UTF8); - required binary studyName (UTF8); - optional binary geoCity (UTF8); - optional binary geoCountry (UTF8); - optional binary normalizedChannel (UTF8); - } - required binary eventId (UTF8); - required int64 timestamp; - required binary context (UTF8); -} diff --git a/templates/pioneer-study/pathfinder-event.1.schema.json b/templates/pioneer-study/pathfinder-event.1.schema.json deleted file mode 100644 index badf42563..000000000 --- a/templates/pioneer-study/pathfinder-event.1.schema.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-04/schema#", - "properties": { - "eventId": { - "description": "The ID of the event.", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "timestamp": { - "description": "Timestamp for the entry.", - "minimum": 0, - "type": "integer" - }, - "context": { - "description": "Contextual data for the event.", - "maxLength": 2048, - "minLength": 0, - "type": "string" - } - }, - "required": [ - "eventId", - "timestamp", - "context" - ], - "title": "pathfinder-event", - "type": "object" -} diff --git a/templates/pioneer-study/pathfinder-log.1.parquetmr.txt b/templates/pioneer-study/pathfinder-log.1.parquetmr.txt deleted file mode 100644 index ef7ccf2dd..000000000 --- a/templates/pioneer-study/pathfinder-log.1.parquetmr.txt +++ /dev/null @@ -1,20 +0,0 @@ -message pathfinder-log { - required group metadata { - required int64 Timestamp; - required binary documentId (UTF8); - required binary pioneerId (UTF8); - required binary studyName (UTF8); - optional binary geoCity (UTF8); - optional binary geoCountry (UTF8); - optional binary normalizedChannel (UTF8); - } - required group entries (LIST) { - repeated group list { - required group element { - required int64 timestamp; - required binary details (UTF8); - required binary url (UTF8); - } - } - } -} diff --git a/templates/pioneer-study/pathfinder-log.1.schema.json b/templates/pioneer-study/pathfinder-log.1.schema.json deleted file mode 100644 index b370f110b..000000000 --- a/templates/pioneer-study/pathfinder-log.1.schema.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-04/schema#", - "properties": { - "entries": { - "description": "A list of log entries.", - "items": { - "properties": { - "details": { - "description": "Details of the entry.", - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "timestamp": { - "description": "Timestamp for the entry.", - "minimum": 0, - "type": "integer" - }, - "url": { - "description": "The URL the user was focused on.", - "maxLength": 2048, - "minLength": 1, - "type": "string" - } - }, - "required": [ - "details", - "timestamp", - "url" - ], - "type": "object" - }, - "type": "array" - } - }, - "required": [ - "entries" - ], - "title": "pathfinder-log", - "type": "object" -} diff --git a/templates/pioneer-study/shield-study-addon.3.parquetmr.txt b/templates/pioneer-study/shield-study-addon.3.parquetmr.txt deleted file mode 100644 index 2ca463e5f..000000000 --- a/templates/pioneer-study/shield-study-addon.3.parquetmr.txt +++ /dev/null @@ -1,4 +0,0 @@ -message shield-study-addon { - @TELEMETRY_SHIELDSTUDYADDONPAYLOAD_3_TXT@ - @PIONEER-STUDY_METADATA_1_TXT@ -} diff --git a/templates/pioneer-study/shield-study-addon.3.schema.json b/templates/pioneer-study/shield-study-addon.3.schema.json deleted file mode 100644 index d8888688f..000000000 --- a/templates/pioneer-study/shield-study-addon.3.schema.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-04/schema#", - @TELEMETRY_SHIELDSTUDYADDONPAYLOAD_3_JSON@ -} diff --git a/templates/pioneer-study/shield-study-error.3.parquetmr.txt b/templates/pioneer-study/shield-study-error.3.parquetmr.txt deleted file mode 100644 index 57e2f5463..000000000 --- a/templates/pioneer-study/shield-study-error.3.parquetmr.txt +++ /dev/null @@ -1,4 +0,0 @@ -message shield-study-error { - @TELEMETRY_SHIELDSTUDYERRORPAYLOAD_3_TXT@ - @PIONEER-STUDY_METADATA_1_TXT@ -} diff --git a/templates/pioneer-study/shield-study-error.3.schema.json b/templates/pioneer-study/shield-study-error.3.schema.json deleted file mode 100644 index e5fe54cd5..000000000 --- a/templates/pioneer-study/shield-study-error.3.schema.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-04/schema#", - @TELEMETRY_SHIELDSTUDYERRORPAYLOAD_3_JSON@ -} diff --git a/templates/pioneer-study/shield-study.3.parquetmr.txt b/templates/pioneer-study/shield-study.3.parquetmr.txt deleted file mode 100644 index 2c6d8e56b..000000000 --- a/templates/pioneer-study/shield-study.3.parquetmr.txt +++ /dev/null @@ -1,4 +0,0 @@ -message shield-study { - @TELEMETRY_SHIELDSTUDYPAYLOAD_3_TXT@ - @PIONEER-STUDY_METADATA_1_TXT@ -} diff --git a/templates/pioneer-study/shield-study.3.schema.json b/templates/pioneer-study/shield-study.3.schema.json deleted file mode 100644 index ca7a08677..000000000 --- a/templates/pioneer-study/shield-study.3.schema.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-04/schema#", - @TELEMETRY_SHIELDSTUDYPAYLOAD_3_JSON@ -} diff --git a/templates/telemetry/pioneer-study/pioneer-study.4.schema.json b/templates/telemetry/pioneer-study/pioneer-study.4.schema.json index 0d37bd0ce..cafcf3c36 100644 --- a/templates/telemetry/pioneer-study/pioneer-study.4.schema.json +++ b/templates/telemetry/pioneer-study/pioneer-study.4.schema.json @@ -27,6 +27,14 @@ "pattern": "^\\S+$", "type": "string" }, + "schemaNamespace": { + "description": "The namespace of the schema used for validation and routing to a dataset.", + "maxLength": 100, + "minLength": 1, + "pattern": "^\\S+$", + "type": "string" + + }, "schemaName": { "description": "Name of a schema used for validation of the encryptedData", "maxLength": 100, @@ -44,6 +52,7 @@ "encryptedData", "encryptionKeyId", "pioneerId", + "schemaNamespace", "studyName", "schemaName", "schemaVersion" diff --git a/validation/pioneer-study/esper-study-telemetry.1.sample.pass.json b/validation/pioneer-study/esper-study-telemetry.1.sample.pass.json deleted file mode 100644 index 4eac80cfb..000000000 --- a/validation/pioneer-study/esper-study-telemetry.1.sample.pass.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "defaultSearchEngine": "ddg", - "locale": "en-US", - "os": "Darwin", - "appUpdateChannel": "aurora", - "profileCreationDate": "14812", - "appVersion": "58.0", - "systemMemoryMb": "16384", - "systemCpuCores": "4", - "systemCpuSpeedMhz": "2500", - "osVersion": "16.7.0", - "systemGfxMonitors1ScreenWidth": "1680", - "systemGfxMonitors1ScreenWidthZeroIndexed": "null", - "uptime": "879", - "totalTime": "52764", - "profileSubsessionCounter": "179", - "subsessionStartDate": "2017-11-23T13:00:00.0+02:00", - "timezoneOffest": "120", - "searchCounts": "2", - "spbeMaxConcurrentWindowCount": "2", - "spbeMaxConcurrentTabCount": "32", - "spbeTabOpenEventCount": "2", - "spbeWindowOpenEventCount": "null", - "spbeUniqueDomainsCount": "1", - "spbeTotalUriCount": "4", - "spbeUnfilteredUriCount": "4", - "spbeNavigationSearchbar": "1", - "spbeNavigationAboutNewtab": "1", - "spbeNavigationContextmenu": "null", - "spbeNavigationUrlbar": "null", - "placesPagesCount": "10832", - "placesBookmarksCount": "156", - "pioneerAddonMetadata": { - "packetVersion": "esper1", - "studyName": "esper-pioneer-shield-study", - "branch": "pioneer", - "addonId": "esper-pioneer-shield-study@shield.mozilla.com", - "addonVersion": "1.0.0", - "pioneerUtilsVersion": "1.0.9", - "type": "pioneer-study-addon", - "testing": false - } -} diff --git a/validation/pioneer-study/event.1.schema.pass.json b/validation/pioneer-study/event.1.schema.pass.json deleted file mode 100644 index 2b0833d49..000000000 --- a/validation/pioneer-study/event.1.schema.pass.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "eventId" : "enrolled" -} diff --git a/validation/pioneer-study/online-news-log.1.sample.pass.json b/validation/pioneer-study/online-news-log.1.sample.pass.json deleted file mode 100644 index c174b3442..000000000 --- a/validation/pioneer-study/online-news-log.1.sample.pass.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "entries" : [ - { "timestamp" : 0, "details" : "detail 0", "url" : "https://mozilla.org/0"}, - { "timestamp" : 1, "details" : "detail 1", "url" : "https://mozilla.org/1"}, - { "timestamp" : 2, "details" : "detail 2", "url" : "https://mozilla.org/2"} - ] -} - diff --git a/validation/pioneer-study/shield-study-addon.3.full.pass.json b/validation/pioneer-study/shield-study-addon.3.full.pass.json deleted file mode 100644 index 756092aca..000000000 --- a/validation/pioneer-study/shield-study-addon.3.full.pass.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 3, - "study_name": "something@moz", - "branch": "totally-gnarly-1", - "addon_version": "0.1.1", - "shield_version": "1.2.3", - "testing": true, - "type": "shield-study-addon", - "data": { - "attributes": { - "7": "E", - "oe": "V5mr", - "TuCi": "20", - "q6": "pAZKPDA", - "CXf3": "OjvYwwF", - "c": "eLYaLg", - "Om": "dYQ" - } - } -} diff --git a/validation/pioneer-study/shield-study-addon.3.minimal.pass.json b/validation/pioneer-study/shield-study-addon.3.minimal.pass.json deleted file mode 100644 index 80db23b00..000000000 --- a/validation/pioneer-study/shield-study-addon.3.minimal.pass.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "version": 3, - "study_name": "fake-study-1", - "branch": "control", - "addon_version": "0.1.1", - "shield_version": "1.2.3", - "testing": true, - "type": "shield-study-addon", - "data": { - "attributes": {} - } -} diff --git a/validation/pioneer-study/shield-study-error.3.full.pass.json b/validation/pioneer-study/shield-study-error.3.full.pass.json deleted file mode 100644 index fe5f5068b..000000000 --- a/validation/pioneer-study/shield-study-error.3.full.pass.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": 3, - "study_name": "fake-study-1", - "branch": "control", - "addon_version": "0.1.1", - "shield_version": "1.2.3", - "testing": true, - "type": "shield-study-error", - "data": { - "error_id": "io5DNjkSZ5lK5kWAYpbXc3CR6e", - "error_source": "unknown", - "severity": "debug", - "message": "Lu6BkSUTd", - "attributes": { - "a": "a" - }, - "error": { - "stack": "thing" - } - } -} diff --git a/validation/pioneer-study/shield-study-error.3.minimal.pass.json b/validation/pioneer-study/shield-study-error.3.minimal.pass.json deleted file mode 100644 index 17cbd9e62..000000000 --- a/validation/pioneer-study/shield-study-error.3.minimal.pass.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "version": 3, - "study_name": "fake-study-1", - "branch": "medium-råre", - "addon_version": "0.1.1", - "shield_version": "1.2.3", - "testing": true, - "type": "shield-study-error", - "data": { - "error_id": "lVpHZyaJC6wEZWFOqDotQhoAq", - "error_source": "shield" - } -} diff --git a/validation/pioneer-study/shield-study.3.full.pass.json b/validation/pioneer-study/shield-study.3.full.pass.json deleted file mode 100644 index fba935ef2..000000000 --- a/validation/pioneer-study/shield-study.3.full.pass.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "version": 3, - "study_name": "something@moz", - "branch": "medium-råre", - "addon_version": "0.1.1", - "shield_version": "1.2.3", - "testing": true, - "type": "shield-study", - "data": { - "study_state": "ended-positive", - "study_state_fullname": "Df557JaczQBPksw", - "attributes": { - "NwGadQkr": "jU1am0", - "j9O": "q", - "7iR": "i", - "cT0D": "9H" - } - } -} diff --git a/validation/pioneer-study/shield-study.3.minimal.pass.json b/validation/pioneer-study/shield-study.3.minimal.pass.json deleted file mode 100644 index 376258ec5..000000000 --- a/validation/pioneer-study/shield-study.3.minimal.pass.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "version": 3, - "study_name": "something@moz", - "branch": "control", - "addon_version": "0.1.1", - "shield_version": "1.2.3", - "testing": true, - "type": "shield-study", - "data": { - "study_state": "ineligible" - } -} diff --git a/validation/telemetry/pioneer-study.4.sample-v1.fail.json b/validation/telemetry/pioneer-study.4.sample-v1.fail.json new file mode 100644 index 000000000..885c1aa65 --- /dev/null +++ b/validation/telemetry/pioneer-study.4.sample-v1.fail.json @@ -0,0 +1,25 @@ +{ + "application": { + "architecture": "x86-64", + "buildId": "20170711165157", + "channel": "default", + "name": "Firefox", + "platformVersion": "56.0", + "vendor": "Mozilla", + "version": "56.0", + "displayVersion": "56.0", + "xpcomAbi": "x86_64-gcc3" + }, + "creationDate": "2017-07-21T06:43:51.713Z", + "id": "3d0c11c1-be9f-4d1a-9839-ec6478ade960", + "type": "pioneer-study", + "version": 4, + "payload": { + "encryptedData" : "eyJhbGciOiJSU0EtT0FFUCIsImVuYyI6IkEyNTZHQ00iLCJ6aXAiOiJERUYifQ.dD47j10na7mW-XysXXvKL8gHFy6fWJ3kqrerDutPXg3nO-yfIis5CYYOZgaTgONt9h7crcvdv8l84WyIgWiB-9pjnwcU0CsCNu-1zj7JCm3w-o-Nn8d458ftTenvHGsbE05vCSAjmy9sRDdF2fBLMHAUqQcYJIWTWTbEVGUT_UwDUwSPRVO_DflajIf3teTS_Smht8RJrJIHbI4ZNXV5jmFAWhvwVYy7d_mHbAgexGDzPAuTvo84tHJ2RixC-xD4mZcgXDV6yMZmgk23-qFi7JzuS-A4zIQM1oaOKrZ5-yoZM2HD50A14UHCxHeWegsAYqKe0ErpuijoZpPwI6-_mQ.nsrYJQN6PwBMpejO.GtGjv3hj3P_5VNiagu8TNjp7AKW5MWHBIokDIJYoi-8Ag_Ga.D1-nkV0xKMT34OBd3rembw", + "encryptionKeyId" : "pioneer-20170520", + "pioneerId" : "1076d9e9-152a-465d-85bf-d3ac056beb8d", + "studyName" : "pioneer-study-example", + "schemaName" : "event", + "schemaVersion" : 1 + } +} diff --git a/validation/telemetry/pioneer-study.4.sample.pass.json b/validation/telemetry/pioneer-study.4.sample.pass.json index 885c1aa65..0f6aa6a61 100644 --- a/validation/telemetry/pioneer-study.4.sample.pass.json +++ b/validation/telemetry/pioneer-study.4.sample.pass.json @@ -1,25 +1,26 @@ { - "application": { - "architecture": "x86-64", - "buildId": "20170711165157", - "channel": "default", - "name": "Firefox", - "platformVersion": "56.0", - "vendor": "Mozilla", - "version": "56.0", - "displayVersion": "56.0", - "xpcomAbi": "x86_64-gcc3" - }, - "creationDate": "2017-07-21T06:43:51.713Z", - "id": "3d0c11c1-be9f-4d1a-9839-ec6478ade960", - "type": "pioneer-study", - "version": 4, - "payload": { - "encryptedData" : "eyJhbGciOiJSU0EtT0FFUCIsImVuYyI6IkEyNTZHQ00iLCJ6aXAiOiJERUYifQ.dD47j10na7mW-XysXXvKL8gHFy6fWJ3kqrerDutPXg3nO-yfIis5CYYOZgaTgONt9h7crcvdv8l84WyIgWiB-9pjnwcU0CsCNu-1zj7JCm3w-o-Nn8d458ftTenvHGsbE05vCSAjmy9sRDdF2fBLMHAUqQcYJIWTWTbEVGUT_UwDUwSPRVO_DflajIf3teTS_Smht8RJrJIHbI4ZNXV5jmFAWhvwVYy7d_mHbAgexGDzPAuTvo84tHJ2RixC-xD4mZcgXDV6yMZmgk23-qFi7JzuS-A4zIQM1oaOKrZ5-yoZM2HD50A14UHCxHeWegsAYqKe0ErpuijoZpPwI6-_mQ.nsrYJQN6PwBMpejO.GtGjv3hj3P_5VNiagu8TNjp7AKW5MWHBIokDIJYoi-8Ag_Ga.D1-nkV0xKMT34OBd3rembw", - "encryptionKeyId" : "pioneer-20170520", - "pioneerId" : "1076d9e9-152a-465d-85bf-d3ac056beb8d", - "studyName" : "pioneer-study-example", - "schemaName" : "event", - "schemaVersion" : 1 - } -} + "type": "pioneer-study", + "id": "9af045aa-80ca-e743-92de-b31431abc547", + "creationDate": "2020-04-24T20:04:10.285Z", + "version": 4, + "application": { + "architecture": "x86-64", + "buildId": "20200415104457", + "name": "Firefox", + "version": "77.0a1", + "displayVersion": "77.0a1", + "vendor": "Mozilla", + "platformVersion": "77.0a1", + "xpcomAbi": "x86_64-gcc3", + "channel": "default" + }, + "payload": { + "encryptedData": "eyJhbGciOiJFQ0RILUVTIiwiZW5jIjoiQTI1NkdDTSIsImVwayI6eyJjcnYiOiJQLTI1NiIsImV4dCI6dHJ1ZSwia3R5IjoiRUMiLCJ4IjoiSFN5dXBzM1RWdEJ3V3JTTnFKMi1ycnd1LVVKdFVnbmtMTW9hOGJBNUVlayIsInkiOiItQmdTbzE3ZUZFRGlncC03emtEX0xEQVNVZ0xjdFNEZGk5NG9rYm1EYTkwIn19..Ri7NaZFlcHmg6IS4.ZnYhkv26B2g7Z7eXrIHGH69F_MxG99eLyiXdRzdZ8L2Y.OJ6eKSYuG3pcU5gEJo2thA", + "encryptionKeyId" : "pioneer-v2-study", + "schemaNamespace": "pioneer-v2-study", + "schemaName": "event", + "schemaVersion": 1, + "pioneerId": "9af045aa-80ca-e743-92de-b31431abc547", + "studyName": "pioneer-v2-example@example.com" + } + } \ No newline at end of file