Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

task(settings,content,auth): Add account uid to gling pings #17584

Merged
merged 1 commit into from
Sep 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,22 @@
$schema: moz://mozilla.org/schemas/glean/metrics/2-0-0
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure if subplat-backend should also be updated, but I went ahead and added for consistency.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


account:
user_id:
type: string
description: |
The firefox/mozilla account id
lifetime: application
notification_emails:
- [email protected]
bugs:
- https://mozilla-hub.atlassian.net/browse/FXA-7531
data_reviews:
- https://bugzilla.mozilla.org/show_bug.cgi?id=tbd
expires: never
data_sensitivity:
- interaction
no_lint:
- COMMON_PREFIX
user_id_sha256:
dschom marked this conversation as resolved.
Show resolved Hide resolved
type: string
description: |
Expand Down Expand Up @@ -119,12 +135,12 @@ session:
expires: never
data_sensitivity:
- interaction

subscription:
checkout_type:
type: string
description: |
Whether the checkout flow is for new users or existing users.
Whether the checkout flow is for new users or existing users.
One of “with-account” or “without-account"
lifetime: application
notification_emails:
Expand Down Expand Up @@ -190,7 +206,7 @@ subscription:
- interaction
interval:
type: string
description: Interval of a subscription used at checkout
description: Interval of a subscription used at checkout
lifetime: application
notification_emails:
- [email protected]
Expand Down
2 changes: 2 additions & 0 deletions packages/fxa-auth-server/lib/metrics/glean/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ const createEventFn =
user_agent: request.headers['user-agent'],
ip_address:
eventOptions.skipClientIp === true ? '' : request.app.clientAddress,
account_user_id: '',
account_user_id_sha256: '',
relying_party_oauth_client_id: await findOauthClientId(
request,
Expand All @@ -169,6 +170,7 @@ const createEventFn =
// uid needs extra handling because we need to hash the value
const uid = findUid(request, metricsData);
if (uid !== '') {
commonMetrics.account_user_id = uid;
commonMetrics.account_user_id_sha256 = sha256HashUid(uid);
}

Expand Down
Loading