diff --git a/packages/fxa-content-server/app/scripts/lib/glean/account.js b/packages/fxa-content-server/app/scripts/lib/glean/account.js index 32a164294a..65cbb42bc8 100644 --- a/packages/fxa-content-server/app/scripts/lib/glean/account.js +++ b/packages/fxa-content-server/app/scripts/lib/glean/account.js @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// AUTOGENERATED BY glean_parser v14.3.0. DO NOT EDIT. DO NOT COMMIT. +// AUTOGENERATED BY glean_parser v14.5.2. DO NOT EDIT. DO NOT COMMIT. import StringMetricType from '@mozilla/glean/private/metrics/string'; diff --git a/packages/fxa-content-server/app/scripts/lib/glean/accountPref.js b/packages/fxa-content-server/app/scripts/lib/glean/accountPref.js index f1691eba59..2a025de766 100644 --- a/packages/fxa-content-server/app/scripts/lib/glean/accountPref.js +++ b/packages/fxa-content-server/app/scripts/lib/glean/accountPref.js @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// AUTOGENERATED BY glean_parser v14.3.0. DO NOT EDIT. DO NOT COMMIT. +// AUTOGENERATED BY glean_parser v14.5.2. DO NOT EDIT. DO NOT COMMIT. import EventMetricType from '@mozilla/glean/private/metrics/event'; @@ -56,6 +56,118 @@ export const appleUnlinkSubmitConfirm = new EventMetricType( ['reason'] ); +/** + * User clicks on Firefox Browser for Desktop in the bento menu + * + * Generated from `account_pref.bento_firefox_desktop`. + */ +export const bentoFirefoxDesktop = new EventMetricType( + { + category: 'account_pref', + name: 'bento_firefox_desktop', + sendInPings: ['events'], + lifetime: 'ping', + disabled: false, + }, + [] +); + +/** + * User clicks on Firefox Browser for Mobile in the bento menu + * + * Generated from `account_pref.bento_firefox_mobile`. + */ +export const bentoFirefoxMobile = new EventMetricType( + { + category: 'account_pref', + name: 'bento_firefox_mobile', + sendInPings: ['events'], + lifetime: 'ping', + disabled: false, + }, + [] +); + +/** + * User clicks on Mozilla Monitor in the bento menu + * + * Generated from `account_pref.bento_monitor`. + */ +export const bentoMonitor = new EventMetricType( + { + category: 'account_pref', + name: 'bento_monitor', + sendInPings: ['events'], + lifetime: 'ping', + disabled: false, + }, + [] +); + +/** + * User clicks on Pocket in the bento menu + * + * Generated from `account_pref.bento_pocket`. + */ +export const bentoPocket = new EventMetricType( + { + category: 'account_pref', + name: 'bento_pocket', + sendInPings: ['events'], + lifetime: 'ping', + disabled: false, + }, + [] +); + +/** + * User clicks on Firefox Relay in the bento menu + * + * Generated from `account_pref.bento_relay`. + */ +export const bentoRelay = new EventMetricType( + { + category: 'account_pref', + name: 'bento_relay', + sendInPings: ['events'], + lifetime: 'ping', + disabled: false, + }, + [] +); + +/** + * User clicks on the bento menu at the top of the account settings page + * + * Generated from `account_pref.bento_view`. + */ +export const bentoView = new EventMetricType( + { + category: 'account_pref', + name: 'bento_view', + sendInPings: ['events'], + lifetime: 'ping', + disabled: false, + }, + [] +); + +/** + * User clicks on Mozilla VPN in the bento menu + * + * Generated from `account_pref.bento_vpn`. + */ +export const bentoVpn = new EventMetricType( + { + category: 'account_pref', + name: 'bento_vpn', + sendInPings: ['events'], + lifetime: 'ping', + disabled: false, + }, + [] +); + /** * Click on "Change" on account settings page to change password for account * @@ -155,6 +267,56 @@ export const googleUnlinkSubmitConfirm = new EventMetricType( ['reason'] ); +/** + * User clicked the question mark icon "Help" link in the account settings page + * header + * + * Generated from `account_pref.help`. + */ +export const help = new EventMetricType( + { + category: 'account_pref', + name: 'help', + sendInPings: ['events'], + lifetime: 'ping', + disabled: false, + }, + [] +); + +/** + * User clicks on the Get free scan link on the new Monitor promotion in the + * account settings side panel + * + * Generated from `account_pref.promo_monitor_submit`. + */ +export const promoMonitorSubmit = new EventMetricType( + { + category: 'account_pref', + name: 'promo_monitor_submit', + sendInPings: ['events'], + lifetime: 'ping', + disabled: false, + }, + ['reason'] +); + +/** + * User sees the Monitor promo on their settings page. + * + * Generated from `account_pref.promo_monitor_view`. + */ +export const promoMonitorView = new EventMetricType( + { + category: 'account_pref', + name: 'promo_monitor_view', + sendInPings: ['events'], + lifetime: 'ping', + disabled: false, + }, + ['reason'] +); + /** * Click on "Create" or "Change" button on account settings page to add a recovery * key to the account @@ -188,6 +350,39 @@ export const secondaryEmailSubmit = new EventMetricType( [] ); +/** + * User started the 2FA setup process by viewing step 1 of the funnel, complete + * with QR code for scanning. + * + * Generated from `account_pref.two_step_auth_qr_view`. + */ +export const twoStepAuthQrView = new EventMetricType( + { + category: 'account_pref', + name: 'two_step_auth_qr_view', + sendInPings: ['events'], + lifetime: 'ping', + disabled: false, + }, + [] +); + +/** + * User clicked the "Can't scan code?" link + * + * Generated from `account_pref.two_step_auth_scan_code_link`. + */ +export const twoStepAuthScanCodeLink = new EventMetricType( + { + category: 'account_pref', + name: 'two_step_auth_scan_code_link', + sendInPings: ['events'], + lifetime: 'ping', + disabled: false, + }, + [] +); + /** * Click on "Add" button on account settings page for adding 2FA to account * diff --git a/packages/fxa-content-server/app/scripts/lib/glean/cachedLogin.js b/packages/fxa-content-server/app/scripts/lib/glean/cachedLogin.js index d0ad0e5c91..877dc26e14 100644 --- a/packages/fxa-content-server/app/scripts/lib/glean/cachedLogin.js +++ b/packages/fxa-content-server/app/scripts/lib/glean/cachedLogin.js @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// AUTOGENERATED BY glean_parser v14.3.0. DO NOT EDIT. DO NOT COMMIT. +// AUTOGENERATED BY glean_parser v14.5.2. DO NOT EDIT. DO NOT COMMIT. import EventMetricType from '@mozilla/glean/private/metrics/event'; @@ -70,5 +70,5 @@ export const view = new EventMetricType( lifetime: 'ping', disabled: false, }, - [] + ['third_party_links'] ); diff --git a/packages/fxa-content-server/app/scripts/lib/glean/cad.js b/packages/fxa-content-server/app/scripts/lib/glean/cad.js index 335935c9eb..df1aaca15e 100644 --- a/packages/fxa-content-server/app/scripts/lib/glean/cad.js +++ b/packages/fxa-content-server/app/scripts/lib/glean/cad.js @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// AUTOGENERATED BY glean_parser v14.3.0. DO NOT EDIT. DO NOT COMMIT. +// AUTOGENERATED BY glean_parser v14.5.2. DO NOT EDIT. DO NOT COMMIT. import EventMetricType from '@mozilla/glean/private/metrics/event'; diff --git a/packages/fxa-content-server/app/scripts/lib/glean/cadApproveDevice.js b/packages/fxa-content-server/app/scripts/lib/glean/cadApproveDevice.js index 215bd326d9..015fbd36eb 100644 --- a/packages/fxa-content-server/app/scripts/lib/glean/cadApproveDevice.js +++ b/packages/fxa-content-server/app/scripts/lib/glean/cadApproveDevice.js @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// AUTOGENERATED BY glean_parser v14.3.0. DO NOT EDIT. DO NOT COMMIT. +// AUTOGENERATED BY glean_parser v14.5.2. DO NOT EDIT. DO NOT COMMIT. import EventMetricType from '@mozilla/glean/private/metrics/event'; diff --git a/packages/fxa-content-server/app/scripts/lib/glean/cadFirefox.js b/packages/fxa-content-server/app/scripts/lib/glean/cadFirefox.js index 0520e9f72f..a4b7b1b231 100644 --- a/packages/fxa-content-server/app/scripts/lib/glean/cadFirefox.js +++ b/packages/fxa-content-server/app/scripts/lib/glean/cadFirefox.js @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// AUTOGENERATED BY glean_parser v14.3.0. DO NOT EDIT. DO NOT COMMIT. +// AUTOGENERATED BY glean_parser v14.5.2. DO NOT EDIT. DO NOT COMMIT. import EventMetricType from '@mozilla/glean/private/metrics/event'; diff --git a/packages/fxa-content-server/app/scripts/lib/glean/cadMobilePair.js b/packages/fxa-content-server/app/scripts/lib/glean/cadMobilePair.js index f0319ce3b1..2921c1e4b2 100644 --- a/packages/fxa-content-server/app/scripts/lib/glean/cadMobilePair.js +++ b/packages/fxa-content-server/app/scripts/lib/glean/cadMobilePair.js @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// AUTOGENERATED BY glean_parser v14.3.0. DO NOT EDIT. DO NOT COMMIT. +// AUTOGENERATED BY glean_parser v14.5.2. DO NOT EDIT. DO NOT COMMIT. import EventMetricType from '@mozilla/glean/private/metrics/event'; diff --git a/packages/fxa-content-server/app/scripts/lib/glean/cadMobilePairUseApp.js b/packages/fxa-content-server/app/scripts/lib/glean/cadMobilePairUseApp.js index 99ef569fc2..3baf1e8fcd 100644 --- a/packages/fxa-content-server/app/scripts/lib/glean/cadMobilePairUseApp.js +++ b/packages/fxa-content-server/app/scripts/lib/glean/cadMobilePairUseApp.js @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// AUTOGENERATED BY glean_parser v14.3.0. DO NOT EDIT. DO NOT COMMIT. +// AUTOGENERATED BY glean_parser v14.5.2. DO NOT EDIT. DO NOT COMMIT. import EventMetricType from '@mozilla/glean/private/metrics/event'; diff --git a/packages/fxa-content-server/app/scripts/lib/glean/cadRedirectDesktop.js b/packages/fxa-content-server/app/scripts/lib/glean/cadRedirectDesktop.js index 0da38aec28..0030950e4d 100644 --- a/packages/fxa-content-server/app/scripts/lib/glean/cadRedirectDesktop.js +++ b/packages/fxa-content-server/app/scripts/lib/glean/cadRedirectDesktop.js @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// AUTOGENERATED BY glean_parser v14.3.0. DO NOT EDIT. DO NOT COMMIT. +// AUTOGENERATED BY glean_parser v14.5.2. DO NOT EDIT. DO NOT COMMIT. import EventMetricType from '@mozilla/glean/private/metrics/event'; diff --git a/packages/fxa-content-server/app/scripts/lib/glean/deleteAccount.js b/packages/fxa-content-server/app/scripts/lib/glean/deleteAccount.js index 2b79224356..d4f176006b 100644 --- a/packages/fxa-content-server/app/scripts/lib/glean/deleteAccount.js +++ b/packages/fxa-content-server/app/scripts/lib/glean/deleteAccount.js @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// AUTOGENERATED BY glean_parser v14.3.0. DO NOT EDIT. DO NOT COMMIT. +// AUTOGENERATED BY glean_parser v14.5.2. DO NOT EDIT. DO NOT COMMIT. import EventMetricType from '@mozilla/glean/private/metrics/event'; diff --git a/packages/fxa-content-server/app/scripts/lib/glean/email.js b/packages/fxa-content-server/app/scripts/lib/glean/email.js index 4601c85d1a..effab804f0 100644 --- a/packages/fxa-content-server/app/scripts/lib/glean/email.js +++ b/packages/fxa-content-server/app/scripts/lib/glean/email.js @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// AUTOGENERATED BY glean_parser v14.3.0. DO NOT EDIT. DO NOT COMMIT. +// AUTOGENERATED BY glean_parser v14.5.2. DO NOT EDIT. DO NOT COMMIT. import EventMetricType from '@mozilla/glean/private/metrics/event'; diff --git a/packages/fxa-content-server/app/scripts/lib/glean/entrypoint.js b/packages/fxa-content-server/app/scripts/lib/glean/entrypoint.js new file mode 100644 index 0000000000..3cdb92d0d5 --- /dev/null +++ b/packages/fxa-content-server/app/scripts/lib/glean/entrypoint.js @@ -0,0 +1,35 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +// AUTOGENERATED BY glean_parser v14.5.2. DO NOT EDIT. DO NOT COMMIT. + +import StringMetricType from '@mozilla/glean/private/metrics/string'; + +/** + * The entrypoint experiment the user was assigned to. This value is specified + * by query parameter `entrypoint_experiment` in the URL. + * + * Generated from `entrypoint.experiment`. + */ +export const experiment = new StringMetricType({ + category: 'entrypoint', + name: 'experiment', + sendInPings: ['accounts-events', 'events'], + lifetime: 'application', + disabled: false, +}); + +/** + * The entrypoint variation the user was assigned to. This value is specified + * by query parameter `entrypoint_variation` in the URL. + * + * Generated from `entrypoint.variation`. + */ +export const variation = new StringMetricType({ + category: 'entrypoint', + name: 'variation', + sendInPings: ['accounts-events', 'events'], + lifetime: 'application', + disabled: false, +}); diff --git a/packages/fxa-content-server/app/scripts/lib/glean/event.js b/packages/fxa-content-server/app/scripts/lib/glean/event.js index e2b6fe5b31..d64614dc8c 100644 --- a/packages/fxa-content-server/app/scripts/lib/glean/event.js +++ b/packages/fxa-content-server/app/scripts/lib/glean/event.js @@ -2,8 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// AUTOGENERATED BY glean_parser v14.3.0. DO NOT EDIT. DO NOT COMMIT. +// AUTOGENERATED BY glean_parser v14.5.2. DO NOT EDIT. DO NOT COMMIT. +import BooleanMetricType from '@mozilla/glean/private/metrics/boolean'; import StringMetricType from '@mozilla/glean/private/metrics/string'; /** @@ -31,3 +32,17 @@ export const reason = new StringMetricType({ lifetime: 'ping', disabled: false, }); + +/** + * boolean, additional context-dependent (on event.name) info related to third + * party auth links + * + * Generated from `event.third_party_links`. + */ +export const thirdPartyLinks = new BooleanMetricType({ + category: 'event', + name: 'third_party_links', + sendInPings: ['accounts-events'], + lifetime: 'ping', + disabled: false, +}); diff --git a/packages/fxa-content-server/app/scripts/lib/glean/index.ts b/packages/fxa-content-server/app/scripts/lib/glean/index.ts index a5dcdfb053..ac947449d5 100644 --- a/packages/fxa-content-server/app/scripts/lib/glean/index.ts +++ b/packages/fxa-content-server/app/scripts/lib/glean/index.ts @@ -23,6 +23,7 @@ import { deviceType, entrypoint, flowId } from './session'; import * as thirdPartyAuth from './thirdPartyAuth'; import * as thirdPartyAuthSetPassword from './thirdPartyAuthSetPassword'; import * as utm from './utm'; +import * as entrypointQuery from './entrypoint'; export type GleanMetricsConfig = { enabled: boolean; @@ -116,6 +117,9 @@ const populateMetrics = async (properties: EventProperties = {}) => { utm.medium.set(flowEventMetadata.utmMedium || ''); utm.source.set(flowEventMetadata.utmSource || ''); utm.term.set(flowEventMetadata.utmTerm || ''); + + entrypointQuery.experiment.set(flowEventMetadata.entrypointExperiment || ''); + entrypointQuery.variation.set(flowEventMetadata.entrypointVariation || ''); }; const recordEventMetric = (eventName: string, properties: EventProperties) => { diff --git a/packages/fxa-content-server/app/scripts/lib/glean/login.js b/packages/fxa-content-server/app/scripts/lib/glean/login.js index b9a030c7c1..1889d7c4bf 100644 --- a/packages/fxa-content-server/app/scripts/lib/glean/login.js +++ b/packages/fxa-content-server/app/scripts/lib/glean/login.js @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// AUTOGENERATED BY glean_parser v14.3.0. DO NOT EDIT. DO NOT COMMIT. +// AUTOGENERATED BY glean_parser v14.5.2. DO NOT EDIT. DO NOT COMMIT. import EventMetricType from '@mozilla/glean/private/metrics/event'; @@ -287,5 +287,5 @@ export const view = new EventMetricType( lifetime: 'ping', disabled: false, }, - [] + ['third_party_links'] ); diff --git a/packages/fxa-content-server/app/scripts/lib/glean/passwordReset.js b/packages/fxa-content-server/app/scripts/lib/glean/passwordReset.js index dfb32c01dd..3fe4898f5a 100644 --- a/packages/fxa-content-server/app/scripts/lib/glean/passwordReset.js +++ b/packages/fxa-content-server/app/scripts/lib/glean/passwordReset.js @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// AUTOGENERATED BY glean_parser v14.3.0. DO NOT EDIT. DO NOT COMMIT. +// AUTOGENERATED BY glean_parser v14.5.2. DO NOT EDIT. DO NOT COMMIT. import EventMetricType from '@mozilla/glean/private/metrics/event'; diff --git a/packages/fxa-content-server/app/scripts/lib/glean/pings.js b/packages/fxa-content-server/app/scripts/lib/glean/pings.js index b40c10a754..ceb57c8c72 100644 --- a/packages/fxa-content-server/app/scripts/lib/glean/pings.js +++ b/packages/fxa-content-server/app/scripts/lib/glean/pings.js @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// AUTOGENERATED BY glean_parser v14.3.0. DO NOT EDIT. DO NOT COMMIT. +// AUTOGENERATED BY glean_parser v14.5.2. DO NOT EDIT. DO NOT COMMIT. import PingType from '@mozilla/glean/private/ping'; diff --git a/packages/fxa-content-server/app/scripts/lib/glean/reg.js b/packages/fxa-content-server/app/scripts/lib/glean/reg.js index e8f381b7ff..b1040be567 100644 --- a/packages/fxa-content-server/app/scripts/lib/glean/reg.js +++ b/packages/fxa-content-server/app/scripts/lib/glean/reg.js @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// AUTOGENERATED BY glean_parser v14.3.0. DO NOT EDIT. DO NOT COMMIT. +// AUTOGENERATED BY glean_parser v14.5.2. DO NOT EDIT. DO NOT COMMIT. import EventMetricType from '@mozilla/glean/private/metrics/event'; diff --git a/packages/fxa-content-server/app/scripts/lib/glean/relyingParty.js b/packages/fxa-content-server/app/scripts/lib/glean/relyingParty.js index bb50f7dd29..82cc87412e 100644 --- a/packages/fxa-content-server/app/scripts/lib/glean/relyingParty.js +++ b/packages/fxa-content-server/app/scripts/lib/glean/relyingParty.js @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// AUTOGENERATED BY glean_parser v14.3.0. DO NOT EDIT. DO NOT COMMIT. +// AUTOGENERATED BY glean_parser v14.5.2. DO NOT EDIT. DO NOT COMMIT. import StringMetricType from '@mozilla/glean/private/metrics/string'; diff --git a/packages/fxa-content-server/app/scripts/lib/glean/session.js b/packages/fxa-content-server/app/scripts/lib/glean/session.js index 2d64822602..76328715eb 100644 --- a/packages/fxa-content-server/app/scripts/lib/glean/session.js +++ b/packages/fxa-content-server/app/scripts/lib/glean/session.js @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// AUTOGENERATED BY glean_parser v14.3.0. DO NOT EDIT. DO NOT COMMIT. +// AUTOGENERATED BY glean_parser v14.5.2. DO NOT EDIT. DO NOT COMMIT. import StringMetricType from '@mozilla/glean/private/metrics/string'; diff --git a/packages/fxa-content-server/app/scripts/lib/glean/standard.js b/packages/fxa-content-server/app/scripts/lib/glean/standard.js index ca67042aa6..2db76a6a6b 100644 --- a/packages/fxa-content-server/app/scripts/lib/glean/standard.js +++ b/packages/fxa-content-server/app/scripts/lib/glean/standard.js @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// AUTOGENERATED BY glean_parser v14.3.0. DO NOT EDIT. DO NOT COMMIT. +// AUTOGENERATED BY glean_parser v14.5.2. DO NOT EDIT. DO NOT COMMIT. import LabeledMetricType from '@mozilla/glean/private/metrics/labeled'; import BooleanMetricType from '@mozilla/glean/private/metrics/boolean'; diff --git a/packages/fxa-content-server/app/scripts/lib/glean/sync.js b/packages/fxa-content-server/app/scripts/lib/glean/sync.js index 8a50af4772..6d3bec2264 100644 --- a/packages/fxa-content-server/app/scripts/lib/glean/sync.js +++ b/packages/fxa-content-server/app/scripts/lib/glean/sync.js @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// AUTOGENERATED BY glean_parser v14.3.0. DO NOT EDIT. DO NOT COMMIT. +// AUTOGENERATED BY glean_parser v14.5.2. DO NOT EDIT. DO NOT COMMIT. import LabeledMetricType from '@mozilla/glean/private/metrics/labeled'; import BooleanMetricType from '@mozilla/glean/private/metrics/boolean'; diff --git a/packages/fxa-content-server/app/scripts/lib/glean/thirdPartyAuth.js b/packages/fxa-content-server/app/scripts/lib/glean/thirdPartyAuth.js index ff0678696b..d5163aab61 100644 --- a/packages/fxa-content-server/app/scripts/lib/glean/thirdPartyAuth.js +++ b/packages/fxa-content-server/app/scripts/lib/glean/thirdPartyAuth.js @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// AUTOGENERATED BY glean_parser v14.3.0. DO NOT EDIT. DO NOT COMMIT. +// AUTOGENERATED BY glean_parser v14.5.2. DO NOT EDIT. DO NOT COMMIT. import EventMetricType from '@mozilla/glean/private/metrics/event'; diff --git a/packages/fxa-content-server/app/scripts/lib/glean/thirdPartyAuthSetPassword.js b/packages/fxa-content-server/app/scripts/lib/glean/thirdPartyAuthSetPassword.js index cfd33ab8a9..8ed6cce98f 100644 --- a/packages/fxa-content-server/app/scripts/lib/glean/thirdPartyAuthSetPassword.js +++ b/packages/fxa-content-server/app/scripts/lib/glean/thirdPartyAuthSetPassword.js @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// AUTOGENERATED BY glean_parser v14.3.0. DO NOT EDIT. DO NOT COMMIT. +// AUTOGENERATED BY glean_parser v14.5.2. DO NOT EDIT. DO NOT COMMIT. import EventMetricType from '@mozilla/glean/private/metrics/event'; diff --git a/packages/fxa-content-server/app/scripts/lib/glean/utm.js b/packages/fxa-content-server/app/scripts/lib/glean/utm.js index aa6e18f6f8..7373fc8579 100644 --- a/packages/fxa-content-server/app/scripts/lib/glean/utm.js +++ b/packages/fxa-content-server/app/scripts/lib/glean/utm.js @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// AUTOGENERATED BY glean_parser v14.3.0. DO NOT EDIT. DO NOT COMMIT. +// AUTOGENERATED BY glean_parser v14.5.2. DO NOT EDIT. DO NOT COMMIT. import StringMetricType from '@mozilla/glean/private/metrics/string'; diff --git a/packages/fxa-content-server/app/tests/spec/lib/glean.js b/packages/fxa-content-server/app/tests/spec/lib/glean.js index 7656ab1074..86fd35fa88 100644 --- a/packages/fxa-content-server/app/tests/spec/lib/glean.js +++ b/packages/fxa-content-server/app/tests/spec/lib/glean.js @@ -18,6 +18,7 @@ import { flowId, } from '../../../scripts/lib/glean/session'; import * as utm from '../../../scripts/lib/glean/utm'; +import * as entrypointQuery from '../../../scripts/lib/glean/entrypoint'; import sinon from 'sinon'; import { assert } from 'chai'; @@ -71,6 +72,8 @@ describe('lib/glean', () => { setUtmMediumStub, setUtmSourceStub, setUtmTermStub, + setEntryExperimentStub, + setEntryVariationStub, submitPingStub; beforeEach(async () => { @@ -87,6 +90,8 @@ describe('lib/glean', () => { setUtmMediumStub = sandbox.stub(utm.medium, 'set'); setUtmSourceStub = sandbox.stub(utm.source, 'set'); setUtmTermStub = sandbox.stub(utm.term, 'set'); + setEntryExperimentStub = sandbox.stub(entrypointQuery.experiment, 'set'); + setEntryVariationStub = sandbox.stub(entrypointQuery.variation, 'set'); submitPingStub = sandbox.stub(pings.accountsEvents, 'submit'); await testResetGlean('glean-test'); }); @@ -128,6 +133,9 @@ describe('lib/glean', () => { sinon.assert.notCalled(setUtmMediumStub); sinon.assert.notCalled(setUtmSourceStub); sinon.assert.notCalled(setUtmTermStub); + + sinon.assert.notCalled(setEntryVariationStub); + sinon.assert.notCalled(setEntryExperimentStub); }); }); @@ -196,6 +204,9 @@ describe('lib/glean', () => { sinon.assert.calledWith(setUtmMediumStub, ''); sinon.assert.calledWith(setUtmSourceStub, ''); sinon.assert.calledWith(setUtmTermStub, ''); + + sinon.assert.calledWith(setEntryExperimentStub, ''); + sinon.assert.calledWith(setEntryVariationStub, ''); }); it('sets the metrics values', async () => { @@ -207,6 +218,8 @@ describe('lib/glean', () => { utmMedium: 'buzz', utmSource: 'newtab', utmTerm: 'wibble', + entrypointExperiment: 'on', + entrypointVariation: 'earth', }; mockClientId = '133t'; mockService = 'fortress'; @@ -241,6 +254,15 @@ describe('lib/glean', () => { mockFlowEventMetadata.utmSource ); sinon.assert.calledWith(setUtmTermStub, mockFlowEventMetadata.utmTerm); + + sinon.assert.calledWith( + setEntryExperimentStub, + mockFlowEventMetadata.entrypointExperiment + ); + sinon.assert.calledWith( + setEntryVariationStub, + mockFlowEventMetadata.entrypointVariation + ); }); it('submits the pings in order', async () => { diff --git a/packages/fxa-content-server/server/lib/glean/server_events.js b/packages/fxa-content-server/server/lib/glean/server_events.js index 7e72d9cb22..f87b756dc0 100644 --- a/packages/fxa-content-server/server/lib/glean/server_events.js +++ b/packages/fxa-content-server/server/lib/glean/server_events.js @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// AUTOGENERATED BY glean_parser v14.3.0. DO NOT EDIT. DO NOT COMMIT. +// AUTOGENERATED BY glean_parser v14.5.2. DO NOT EDIT. DO NOT COMMIT. // This requires `uuid` and `mozlog` libraries to be in the environment const uuidv4 = require('uuid').v4; @@ -105,7 +105,7 @@ class AccountsEventsServerEvent { }, // `Unknown` fields below are required in the Glean schema, however they are not useful in server context client_info: { - telemetry_sdk_build: 'glean_parser v14.3.0', + telemetry_sdk_build: 'glean_parser v14.5.2', first_run_date: 'Unknown', os: 'Unknown', os_version: 'Unknown', @@ -201,7 +201,7 @@ class EventsServerEventLogger { }, // `Unknown` fields below are required in the Glean schema, however they are not useful in server context client_info: { - telemetry_sdk_build: 'glean_parser v14.3.0', + telemetry_sdk_build: 'glean_parser v14.5.2', first_run_date: 'Unknown', os: 'Unknown', os_version: 'Unknown', @@ -334,7 +334,7 @@ class EventsServerEventLogger { category: 'access_token', name: 'created', extra: { - reason: reason, + reason: String(reason), }, }; this.#record({ @@ -773,7 +773,7 @@ class EventsServerEventLogger { category: 'login', name: 'submit_backend_error', extra: { - reason: reason, + reason: String(reason), }, }; this.#record({ @@ -1646,7 +1646,7 @@ class EventsServerEventLogger { category: 'reg', name: 'submit_error', extra: { - reason: reason, + reason: String(reason), }, }; this.#record({ @@ -1713,7 +1713,7 @@ class EventsServerEventLogger { category: 'relying_party', name: 'form_view', extra: { - type: type, + type: String(type), }, }; this.#record({ @@ -1780,7 +1780,7 @@ class EventsServerEventLogger { category: 'third_party_auth', name: 'apple_login_complete', extra: { - linking: linking, + linking: String(linking), }, }; this.#record({ @@ -1909,7 +1909,7 @@ class EventsServerEventLogger { category: 'third_party_auth', name: 'google_login_complete', extra: { - linking: linking, + linking: String(linking), }, }; this.#record({ diff --git a/packages/fxa-settings/src/lib/glean/index.test.ts b/packages/fxa-settings/src/lib/glean/index.test.ts index 88efab82d4..d3f837dee5 100644 --- a/packages/fxa-settings/src/lib/glean/index.test.ts +++ b/packages/fxa-settings/src/lib/glean/index.test.ts @@ -26,6 +26,7 @@ import { flowId, } from 'fxa-shared/metrics/glean/web/session'; import * as utm from 'fxa-shared/metrics/glean/web/utm'; +import * as entrypointQuery from 'fxa-shared/metrics/glean/web/entrypoint'; import { Config } from '../config'; import { WebIntegration, useAccount } from '../../models'; @@ -73,6 +74,8 @@ describe('lib/glean', () => { setUtmMediumStub: SinonStub, setUtmSourceStub: SinonStub, setUtmTermStub: SinonStub, + setEntrypointExperimentStub: SinonStub, + setEntrypointVariationStub: SinonStub, pageLoadStub: SinonStub; beforeEach(async () => { @@ -90,6 +93,8 @@ describe('lib/glean', () => { utmMedium: 'TV', utmSource: 'mystery', utmTerm: 'thunk', + entrypointExperiment: 'on', + entrypointVariation: 'earth', }; setDeviceTypeStub = sandbox.stub(deviceType, 'set'); @@ -105,6 +110,11 @@ describe('lib/glean', () => { setUtmMediumStub = sandbox.stub(utm.medium, 'set'); setUtmSourceStub = sandbox.stub(utm.source, 'set'); setUtmTermStub = sandbox.stub(utm.term, 'set'); + setEntrypointExperimentStub = sandbox.stub( + entrypointQuery.experiment, + 'set' + ); + setEntrypointVariationStub = sandbox.stub(entrypointQuery.variation, 'set'); submitPingStub = sandbox.stub(pings.accountsEvents, 'submit'); pageLoadStub = sandbox.stub(GleanMetricsAPI.default, 'pageLoad'); @@ -145,6 +155,8 @@ describe('lib/glean', () => { sinon.assert.notCalled(setUtmMediumStub); sinon.assert.notCalled(setUtmSourceStub); sinon.assert.notCalled(setUtmTermStub); + sinon.assert.notCalled(setEntrypointExperimentStub); + sinon.assert.notCalled(setEntrypointVariationStub); }); }); @@ -218,6 +230,8 @@ describe('lib/glean', () => { sinon.assert.calledWith(setUtmMediumStub, ''); sinon.assert.calledWith(setUtmSourceStub, ''); sinon.assert.calledWith(setUtmTermStub, ''); + sinon.assert.calledWith(setEntrypointExperimentStub, ''); + sinon.assert.calledWith(setEntrypointVariationStub, ''); }); it('sets the metrics values', async () => { @@ -251,6 +265,14 @@ describe('lib/glean', () => { sinon.assert.calledWith(setUtmMediumStub, mockIntegration.data.utmMedium); sinon.assert.calledWith(setUtmSourceStub, mockIntegration.data.utmSource); sinon.assert.calledWith(setUtmTermStub, mockIntegration.data.utmTerm); + sinon.assert.calledWith( + setEntrypointVariationStub, + mockIntegration.data.entrypointVariation + ); + sinon.assert.calledWith( + setEntrypointExperimentStub, + mockIntegration.data.entrypointExperiment + ); }); it('submits the pings in order', async () => { diff --git a/packages/fxa-settings/src/lib/glean/index.ts b/packages/fxa-settings/src/lib/glean/index.ts index 481904d328..ed7d881981 100644 --- a/packages/fxa-settings/src/lib/glean/index.ts +++ b/packages/fxa-settings/src/lib/glean/index.ts @@ -42,6 +42,7 @@ import { import * as sync from 'fxa-shared/metrics/glean/web/sync'; import * as standard from 'fxa-shared/metrics/glean/web/standard'; import * as utm from 'fxa-shared/metrics/glean/web/utm'; +import * as entrypointQuery from 'fxa-shared/metrics/glean/web/entrypoint'; import { Integration } from '../../models'; import { MetricsFlow } from '../metrics-flow'; @@ -174,6 +175,13 @@ const populateMetrics = async (gleanPingMetrics: GleanPingMetrics) => { utm.medium.set(metricsContext.integration.data.utmMedium || ''); utm.source.set(metricsContext.integration.data.utmSource || ''); utm.term.set(metricsContext.integration.data.utmTerm || ''); + + entrypointQuery.variation.set( + metricsContext.integration.data.entrypointVariation || '' + ); + entrypointQuery.experiment.set( + metricsContext.integration.data.entrypointExperiment || '' + ); }; const recordEventMetric = ( diff --git a/packages/fxa-shared/metrics/glean/fxa-ui-metrics.yaml b/packages/fxa-shared/metrics/glean/fxa-ui-metrics.yaml index c5d6cbe323..e491f4a93d 100644 --- a/packages/fxa-shared/metrics/glean/fxa-ui-metrics.yaml +++ b/packages/fxa-shared/metrics/glean/fxa-ui-metrics.yaml @@ -355,6 +355,48 @@ utm: data_sensitivity: - interaction +entrypoint: + experiment: + description: | + The entrypoint experiment the user was assigned to. This value is specified + by query parameter `entrypoint_experiment` in the URL. + type: string + lifetime: application + send_in_pings: + - accounts-events + - events + notification_emails: + - vzare@mozilla.com + - fxa-staff@mozilla.com + bugs: + - https://mozilla-hub.atlassian.net/browse/FXA-9847 + data_reviews: + - https://bugzilla.mozilla.org/show_bug.cgi?id=1830504 + - https://bugzilla.mozilla.org/show_bug.cgi?id=1844121 + expires: never + data_sensitivity: + - interaction + variation: + description: | + The entrypoint variation the user was assigned to. This value is specified + by query parameter `entrypoint_variation` in the URL. + type: string + lifetime: application + send_in_pings: + - accounts-events + - events + notification_emails: + - vzare@mozilla.com + - fxa-staff@mozilla.com + bugs: + - https://mozilla-hub.atlassian.net/browse/FXA-9847 + data_reviews: + - https://bugzilla.mozilla.org/show_bug.cgi?id=1830504 + - https://bugzilla.mozilla.org/show_bug.cgi?id=1844121 + expires: never + data_sensitivity: + - interaction + cached_login: submit: type: event diff --git a/packages/fxa-shared/metrics/glean/web/account.ts b/packages/fxa-shared/metrics/glean/web/account.ts index fcc4346e5b..65cbb42bc8 100644 --- a/packages/fxa-shared/metrics/glean/web/account.ts +++ b/packages/fxa-shared/metrics/glean/web/account.ts @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// AUTOGENERATED BY glean_parser v14.5.1. DO NOT EDIT. DO NOT COMMIT. +// AUTOGENERATED BY glean_parser v14.5.2. DO NOT EDIT. DO NOT COMMIT. import StringMetricType from '@mozilla/glean/private/metrics/string'; diff --git a/packages/fxa-shared/metrics/glean/web/accountPref.ts b/packages/fxa-shared/metrics/glean/web/accountPref.ts index d3c28eaf3d..08e4b0491b 100644 --- a/packages/fxa-shared/metrics/glean/web/accountPref.ts +++ b/packages/fxa-shared/metrics/glean/web/accountPref.ts @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// AUTOGENERATED BY glean_parser v14.5.1. DO NOT EDIT. DO NOT COMMIT. +// AUTOGENERATED BY glean_parser v14.5.2. DO NOT EDIT. DO NOT COMMIT. import EventMetricType from '@mozilla/glean/private/metrics/event'; diff --git a/packages/fxa-shared/metrics/glean/web/cachedLogin.ts b/packages/fxa-shared/metrics/glean/web/cachedLogin.ts index 39ab713eff..6a064e0275 100644 --- a/packages/fxa-shared/metrics/glean/web/cachedLogin.ts +++ b/packages/fxa-shared/metrics/glean/web/cachedLogin.ts @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// AUTOGENERATED BY glean_parser v14.5.1. DO NOT EDIT. DO NOT COMMIT. +// AUTOGENERATED BY glean_parser v14.5.2. DO NOT EDIT. DO NOT COMMIT. import EventMetricType from '@mozilla/glean/private/metrics/event'; diff --git a/packages/fxa-shared/metrics/glean/web/cad.ts b/packages/fxa-shared/metrics/glean/web/cad.ts index a71ec0fd8f..df1aaca15e 100644 --- a/packages/fxa-shared/metrics/glean/web/cad.ts +++ b/packages/fxa-shared/metrics/glean/web/cad.ts @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// AUTOGENERATED BY glean_parser v14.5.1. DO NOT EDIT. DO NOT COMMIT. +// AUTOGENERATED BY glean_parser v14.5.2. DO NOT EDIT. DO NOT COMMIT. import EventMetricType from '@mozilla/glean/private/metrics/event'; diff --git a/packages/fxa-shared/metrics/glean/web/cadApproveDevice.ts b/packages/fxa-shared/metrics/glean/web/cadApproveDevice.ts index b111bc43bb..015fbd36eb 100644 --- a/packages/fxa-shared/metrics/glean/web/cadApproveDevice.ts +++ b/packages/fxa-shared/metrics/glean/web/cadApproveDevice.ts @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// AUTOGENERATED BY glean_parser v14.5.1. DO NOT EDIT. DO NOT COMMIT. +// AUTOGENERATED BY glean_parser v14.5.2. DO NOT EDIT. DO NOT COMMIT. import EventMetricType from '@mozilla/glean/private/metrics/event'; diff --git a/packages/fxa-shared/metrics/glean/web/cadFirefox.ts b/packages/fxa-shared/metrics/glean/web/cadFirefox.ts index f9ca16eb4e..66f927b163 100644 --- a/packages/fxa-shared/metrics/glean/web/cadFirefox.ts +++ b/packages/fxa-shared/metrics/glean/web/cadFirefox.ts @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// AUTOGENERATED BY glean_parser v14.5.1. DO NOT EDIT. DO NOT COMMIT. +// AUTOGENERATED BY glean_parser v14.5.2. DO NOT EDIT. DO NOT COMMIT. import EventMetricType from '@mozilla/glean/private/metrics/event'; diff --git a/packages/fxa-shared/metrics/glean/web/cadMobilePair.ts b/packages/fxa-shared/metrics/glean/web/cadMobilePair.ts index 6db26cef74..2921c1e4b2 100644 --- a/packages/fxa-shared/metrics/glean/web/cadMobilePair.ts +++ b/packages/fxa-shared/metrics/glean/web/cadMobilePair.ts @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// AUTOGENERATED BY glean_parser v14.5.1. DO NOT EDIT. DO NOT COMMIT. +// AUTOGENERATED BY glean_parser v14.5.2. DO NOT EDIT. DO NOT COMMIT. import EventMetricType from '@mozilla/glean/private/metrics/event'; diff --git a/packages/fxa-shared/metrics/glean/web/cadMobilePairUseApp.ts b/packages/fxa-shared/metrics/glean/web/cadMobilePairUseApp.ts index 65df99be69..3baf1e8fcd 100644 --- a/packages/fxa-shared/metrics/glean/web/cadMobilePairUseApp.ts +++ b/packages/fxa-shared/metrics/glean/web/cadMobilePairUseApp.ts @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// AUTOGENERATED BY glean_parser v14.5.1. DO NOT EDIT. DO NOT COMMIT. +// AUTOGENERATED BY glean_parser v14.5.2. DO NOT EDIT. DO NOT COMMIT. import EventMetricType from '@mozilla/glean/private/metrics/event'; diff --git a/packages/fxa-shared/metrics/glean/web/cadRedirectDesktop.ts b/packages/fxa-shared/metrics/glean/web/cadRedirectDesktop.ts index f95e77bad9..0030950e4d 100644 --- a/packages/fxa-shared/metrics/glean/web/cadRedirectDesktop.ts +++ b/packages/fxa-shared/metrics/glean/web/cadRedirectDesktop.ts @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// AUTOGENERATED BY glean_parser v14.5.1. DO NOT EDIT. DO NOT COMMIT. +// AUTOGENERATED BY glean_parser v14.5.2. DO NOT EDIT. DO NOT COMMIT. import EventMetricType from '@mozilla/glean/private/metrics/event'; diff --git a/packages/fxa-shared/metrics/glean/web/deleteAccount.ts b/packages/fxa-shared/metrics/glean/web/deleteAccount.ts index e41107ed9b..d4f176006b 100644 --- a/packages/fxa-shared/metrics/glean/web/deleteAccount.ts +++ b/packages/fxa-shared/metrics/glean/web/deleteAccount.ts @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// AUTOGENERATED BY glean_parser v14.5.1. DO NOT EDIT. DO NOT COMMIT. +// AUTOGENERATED BY glean_parser v14.5.2. DO NOT EDIT. DO NOT COMMIT. import EventMetricType from '@mozilla/glean/private/metrics/event'; diff --git a/packages/fxa-shared/metrics/glean/web/email.ts b/packages/fxa-shared/metrics/glean/web/email.ts index 7e82d9a733..effab804f0 100644 --- a/packages/fxa-shared/metrics/glean/web/email.ts +++ b/packages/fxa-shared/metrics/glean/web/email.ts @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// AUTOGENERATED BY glean_parser v14.5.1. DO NOT EDIT. DO NOT COMMIT. +// AUTOGENERATED BY glean_parser v14.5.2. DO NOT EDIT. DO NOT COMMIT. import EventMetricType from '@mozilla/glean/private/metrics/event'; diff --git a/packages/fxa-shared/metrics/glean/web/entrypoint.ts b/packages/fxa-shared/metrics/glean/web/entrypoint.ts new file mode 100644 index 0000000000..3cdb92d0d5 --- /dev/null +++ b/packages/fxa-shared/metrics/glean/web/entrypoint.ts @@ -0,0 +1,35 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +// AUTOGENERATED BY glean_parser v14.5.2. DO NOT EDIT. DO NOT COMMIT. + +import StringMetricType from '@mozilla/glean/private/metrics/string'; + +/** + * The entrypoint experiment the user was assigned to. This value is specified + * by query parameter `entrypoint_experiment` in the URL. + * + * Generated from `entrypoint.experiment`. + */ +export const experiment = new StringMetricType({ + category: 'entrypoint', + name: 'experiment', + sendInPings: ['accounts-events', 'events'], + lifetime: 'application', + disabled: false, +}); + +/** + * The entrypoint variation the user was assigned to. This value is specified + * by query parameter `entrypoint_variation` in the URL. + * + * Generated from `entrypoint.variation`. + */ +export const variation = new StringMetricType({ + category: 'entrypoint', + name: 'variation', + sendInPings: ['accounts-events', 'events'], + lifetime: 'application', + disabled: false, +}); diff --git a/packages/fxa-shared/metrics/glean/web/event.ts b/packages/fxa-shared/metrics/glean/web/event.ts index bdf18142ea..e0bbcb809d 100644 --- a/packages/fxa-shared/metrics/glean/web/event.ts +++ b/packages/fxa-shared/metrics/glean/web/event.ts @@ -2,10 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// AUTOGENERATED BY glean_parser v14.5.1. DO NOT EDIT. DO NOT COMMIT. +// AUTOGENERATED BY glean_parser v14.5.2. DO NOT EDIT. DO NOT COMMIT. -import BooleanMetricType from '@mozilla/glean/private/metrics/boolean'; import StringMetricType from '@mozilla/glean/private/metrics/string'; +import BooleanMetricType from '@mozilla/glean/private/metrics/boolean'; /** * The name of the event diff --git a/packages/fxa-shared/metrics/glean/web/login.ts b/packages/fxa-shared/metrics/glean/web/login.ts index d47a9f400a..a34a8afe00 100644 --- a/packages/fxa-shared/metrics/glean/web/login.ts +++ b/packages/fxa-shared/metrics/glean/web/login.ts @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// AUTOGENERATED BY glean_parser v14.5.1. DO NOT EDIT. DO NOT COMMIT. +// AUTOGENERATED BY glean_parser v14.5.2. DO NOT EDIT. DO NOT COMMIT. import EventMetricType from '@mozilla/glean/private/metrics/event'; diff --git a/packages/fxa-shared/metrics/glean/web/passwordReset.ts b/packages/fxa-shared/metrics/glean/web/passwordReset.ts index 2beabbf6a2..3fe4898f5a 100644 --- a/packages/fxa-shared/metrics/glean/web/passwordReset.ts +++ b/packages/fxa-shared/metrics/glean/web/passwordReset.ts @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// AUTOGENERATED BY glean_parser v14.5.1. DO NOT EDIT. DO NOT COMMIT. +// AUTOGENERATED BY glean_parser v14.5.2. DO NOT EDIT. DO NOT COMMIT. import EventMetricType from '@mozilla/glean/private/metrics/event'; diff --git a/packages/fxa-shared/metrics/glean/web/pings.ts b/packages/fxa-shared/metrics/glean/web/pings.ts index 16ae298fee..ceb57c8c72 100644 --- a/packages/fxa-shared/metrics/glean/web/pings.ts +++ b/packages/fxa-shared/metrics/glean/web/pings.ts @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// AUTOGENERATED BY glean_parser v14.5.1. DO NOT EDIT. DO NOT COMMIT. +// AUTOGENERATED BY glean_parser v14.5.2. DO NOT EDIT. DO NOT COMMIT. import PingType from '@mozilla/glean/private/ping'; diff --git a/packages/fxa-shared/metrics/glean/web/reg.ts b/packages/fxa-shared/metrics/glean/web/reg.ts index 30bc0b4e23..bb2c8e33bf 100644 --- a/packages/fxa-shared/metrics/glean/web/reg.ts +++ b/packages/fxa-shared/metrics/glean/web/reg.ts @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// AUTOGENERATED BY glean_parser v14.5.1. DO NOT EDIT. DO NOT COMMIT. +// AUTOGENERATED BY glean_parser v14.5.2. DO NOT EDIT. DO NOT COMMIT. import EventMetricType from '@mozilla/glean/private/metrics/event'; diff --git a/packages/fxa-shared/metrics/glean/web/relyingParty.ts b/packages/fxa-shared/metrics/glean/web/relyingParty.ts index 73d0a7781d..82cc87412e 100644 --- a/packages/fxa-shared/metrics/glean/web/relyingParty.ts +++ b/packages/fxa-shared/metrics/glean/web/relyingParty.ts @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// AUTOGENERATED BY glean_parser v14.5.1. DO NOT EDIT. DO NOT COMMIT. +// AUTOGENERATED BY glean_parser v14.5.2. DO NOT EDIT. DO NOT COMMIT. import StringMetricType from '@mozilla/glean/private/metrics/string'; diff --git a/packages/fxa-shared/metrics/glean/web/session.ts b/packages/fxa-shared/metrics/glean/web/session.ts index fee0f498cf..76328715eb 100644 --- a/packages/fxa-shared/metrics/glean/web/session.ts +++ b/packages/fxa-shared/metrics/glean/web/session.ts @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// AUTOGENERATED BY glean_parser v14.5.1. DO NOT EDIT. DO NOT COMMIT. +// AUTOGENERATED BY glean_parser v14.5.2. DO NOT EDIT. DO NOT COMMIT. import StringMetricType from '@mozilla/glean/private/metrics/string'; diff --git a/packages/fxa-shared/metrics/glean/web/standard.ts b/packages/fxa-shared/metrics/glean/web/standard.ts index 23124fa37f..2db76a6a6b 100644 --- a/packages/fxa-shared/metrics/glean/web/standard.ts +++ b/packages/fxa-shared/metrics/glean/web/standard.ts @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// AUTOGENERATED BY glean_parser v14.5.1. DO NOT EDIT. DO NOT COMMIT. +// AUTOGENERATED BY glean_parser v14.5.2. DO NOT EDIT. DO NOT COMMIT. import LabeledMetricType from '@mozilla/glean/private/metrics/labeled'; import BooleanMetricType from '@mozilla/glean/private/metrics/boolean'; diff --git a/packages/fxa-shared/metrics/glean/web/sync.ts b/packages/fxa-shared/metrics/glean/web/sync.ts index 0739de0abe..6d3bec2264 100644 --- a/packages/fxa-shared/metrics/glean/web/sync.ts +++ b/packages/fxa-shared/metrics/glean/web/sync.ts @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// AUTOGENERATED BY glean_parser v14.5.1. DO NOT EDIT. DO NOT COMMIT. +// AUTOGENERATED BY glean_parser v14.5.2. DO NOT EDIT. DO NOT COMMIT. import LabeledMetricType from '@mozilla/glean/private/metrics/labeled'; import BooleanMetricType from '@mozilla/glean/private/metrics/boolean'; diff --git a/packages/fxa-shared/metrics/glean/web/thirdPartyAuth.ts b/packages/fxa-shared/metrics/glean/web/thirdPartyAuth.ts index a144bf7f28..d5163aab61 100644 --- a/packages/fxa-shared/metrics/glean/web/thirdPartyAuth.ts +++ b/packages/fxa-shared/metrics/glean/web/thirdPartyAuth.ts @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// AUTOGENERATED BY glean_parser v14.5.1. DO NOT EDIT. DO NOT COMMIT. +// AUTOGENERATED BY glean_parser v14.5.2. DO NOT EDIT. DO NOT COMMIT. import EventMetricType from '@mozilla/glean/private/metrics/event'; diff --git a/packages/fxa-shared/metrics/glean/web/thirdPartyAuthSetPassword.ts b/packages/fxa-shared/metrics/glean/web/thirdPartyAuthSetPassword.ts index f255ceafd7..8ed6cce98f 100644 --- a/packages/fxa-shared/metrics/glean/web/thirdPartyAuthSetPassword.ts +++ b/packages/fxa-shared/metrics/glean/web/thirdPartyAuthSetPassword.ts @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// AUTOGENERATED BY glean_parser v14.5.1. DO NOT EDIT. DO NOT COMMIT. +// AUTOGENERATED BY glean_parser v14.5.2. DO NOT EDIT. DO NOT COMMIT. import EventMetricType from '@mozilla/glean/private/metrics/event'; diff --git a/packages/fxa-shared/metrics/glean/web/utm.ts b/packages/fxa-shared/metrics/glean/web/utm.ts index 26aea21334..7373fc8579 100644 --- a/packages/fxa-shared/metrics/glean/web/utm.ts +++ b/packages/fxa-shared/metrics/glean/web/utm.ts @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// AUTOGENERATED BY glean_parser v14.5.1. DO NOT EDIT. DO NOT COMMIT. +// AUTOGENERATED BY glean_parser v14.5.2. DO NOT EDIT. DO NOT COMMIT. import StringMetricType from '@mozilla/glean/private/metrics/string';