mozilla
/
fxa
зеркало из https://github.com/mozilla/fxa.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

fix(metrics): DENG-4405 Convert event extras to string

This commit is contained in:
Arkadiusz Komarzewski 2024-07-29 16:57:45 +02:00 коммит произвёл Barry Chen
Родитель c11086aa7e
Коммит 4c433fff6f
Не найден ключ, соответствующий данной подписи
7 изменённых файлов: 31 добавлений и 24 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
package.json
Просмотреть файл

@ -50,7 +50,7 @@
"@google-cloud/pubsub": "^4.3.1",
"@google-cloud/translate": "^8.2.0",
"@grpc/grpc-js": "^1.11.1",
"@mozilla/glean": "^5.0.2",
"@mozilla/glean": "^5.0.3",
"@nestjs/apollo": "^12.1.0",
"@nestjs/common": "^10.3.4",
"@nestjs/config": "^3.2.0",

18
packages/fxa-auth-server/lib/metrics/glean/server_events.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.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
// @types/uuid and mozlog types definitions are required in devDependencies
@ -142,7 +142,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',
@ -265,7 +265,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',
@ -431,7 +431,7 @@ class EventsServerEventLogger {
category: 'access_token',
name: 'created',
extra: {
reason: reason,
reason: String(reason),
},
};
this.#record({
@ -983,7 +983,7 @@ class EventsServerEventLogger {
category: 'login',
name: 'submit_backend_error',
extra: {
reason: reason,
reason: String(reason),
},
};
this.#record({
@ -2081,7 +2081,7 @@ class EventsServerEventLogger {
category: 'reg',
name: 'submit_error',
extra: {
reason: reason,
reason: String(reason),
},
};
this.#record({
@ -2165,7 +2165,7 @@ class EventsServerEventLogger {
category: 'relying_party',
name: 'form_view',
extra: {
type: type,
type: String(type),
},
};
this.#record({
@ -2249,7 +2249,7 @@ class EventsServerEventLogger {
category: 'third_party_auth',
name: 'apple_login_complete',
extra: {
linking: linking,
linking: String(linking),
},
};
this.#record({
@ -2411,7 +2411,7 @@ class EventsServerEventLogger {
category: 'third_party_auth',
name: 'google_login_complete',
extra: {
linking: linking,
linking: String(linking),
},
};
this.#record({

5
packages/fxa-auth-server/package.json
Просмотреть файл

@ -24,8 +24,8 @@
"compile": "tsc --noEmit",
"create-mock-iap": "NODE_ENV=dev FIRESTORE_EMULATOR_HOST=localhost:9090 node -r esbuild-register ./scripts/create-mock-iap-subscriptions.ts",
"audit": "npm audit --json | audit-filter --nsp-config=.nsprc --audit=-",
"glean-generate": "yarn glean translate ../fxa-shared/metrics/glean/fxa-backend-pings.yaml ../fxa-shared/metrics/glean/fxa-backend-metrics.yaml -f typescript_server -o lib/metrics/glean",
"glean-lint": "yarn glean glinter ../fxa-shared/metrics/glean/fxa-backend-pings.yaml ../fxa-shared/metrics/glean/fxa-backend-metrics.yaml",
"glean-generate": "npx glean translate ../fxa-shared/metrics/glean/fxa-backend-pings.yaml ../fxa-shared/metrics/glean/fxa-backend-metrics.yaml -f typescript_server -o lib/metrics/glean",
"glean-lint": "npx glean glinter ../fxa-shared/metrics/glean/fxa-backend-pings.yaml ../fxa-shared/metrics/glean/fxa-backend-metrics.yaml",
"l10n-prime": "yarn l10n:prime packages/fxa-auth-server",
"l10n-merge": "yarn grunt merge-ftl",
"l10n-merge-test": "yarn grunt merge-ftl:test",
@ -70,7 +70,6 @@
"@googlemaps/google-maps-services-js": "^3.4.0",
"@hapi/hapi": "^20.2.1",
"@hapi/hoek": "^11.0.2",
"@mozilla/glean": "^5.0.2",
"@types/convict": "5.2.2",
"@types/ejs": "^3.0.6",
"@types/mjml": "^4.7.4",

2
packages/fxa-content-server/app/scripts/lib/glean/event.js
Просмотреть файл

@ -4,8 +4,8 @@
// 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

5
packages/fxa-content-server/package.json
Просмотреть файл

@ -12,12 +12,12 @@
"clean": "rimraf dist",
"compile": "tsc --noEmit",
"copy-local-config": "cp server/config/local.json-dist server/config/local.json",
"glean-generate": "yarn glean translate ../fxa-shared/metrics/glean/fxa-ui-pings.yaml ../fxa-shared/metrics/glean/fxa-ui-metrics.yaml -f javascript -o app/scripts/lib/glean && yarn glean translate ../fxa-shared/metrics/glean/fxa-backend-pings.yaml ../fxa-shared/metrics/glean/fxa-backend-metrics.yaml -f javascript_server -s module_spec=commonjs -o server/lib/glean && prettier --config ../../_dev/.prettierrc --write app/scripts/lib/glean/*.js server/lib/glean/*.js",
"glean-generate": "npx glean translate ../fxa-shared/metrics/glean/fxa-ui-pings.yaml ../fxa-shared/metrics/glean/fxa-ui-metrics.yaml -f javascript -o app/scripts/lib/glean && npx glean translate ../fxa-shared/metrics/glean/fxa-backend-pings.yaml ../fxa-shared/metrics/glean/fxa-backend-metrics.yaml -f javascript_server -s module_spec=commonjs -o server/lib/glean && prettier --config ../../_dev/.prettierrc --write app/scripts/lib/glean/*.js server/lib/glean/*.js",
"audit": "npm audit --json | audit-filter --nsp-config=.nsprc --audit=-",
"l10n-create-json": "NODE_OPTIONS=--openssl-legacy-provider grunt l10n-create-json",
"l10n-prime": "yarn l10n:prime packages/fxa-content-server",
"lint": "yarn lint-glean && eslint app server tests --cache",
"lint-glean": "yarn glean glinter ../fxa-shared/metrics/glean/fxa-ui-pings.yaml ../fxa-shared/metrics/glean/fxa-ui-metrics.yaml",
"lint-glean": "npx glean glinter ../fxa-shared/metrics/glean/fxa-ui-pings.yaml ../fxa-shared/metrics/glean/fxa-ui-metrics.yaml",
"start": "pm2 start pm2.config.js && yarn check:url localhost:3030/bundle/app.bundle.js",
"stop": "pm2 stop pm2.config.js",
"restart": "pm2 restart pm2.config.js ",
@ -43,7 +43,6 @@
"@babel/preset-env": "^7.22.9",
"@babel/preset-react": "^7.24.1",
"@babel/preset-typescript": "^7.24.1",
"@mozilla/glean": "^5.0.2",
"asmcrypto.js": "^0.22.0",
"babel-loader": "^9.1.3",
"backbone": "^1.6.0",

5
packages/fxa-shared/package.json
Просмотреть файл

@ -209,8 +209,8 @@
"compile": "yarn build-ts",
"copy-assets": "cp -r ./db/luaScripts ./dist/esm/packages/fxa-shared/db/luaScripts; cp -r ./db/luaScripts ./dist/cjs/packages/fxa-shared/db/luaScripts",
"copy-sql": "echo '{ \"type\": \"module\" }' > ./dist/esm/packages/fxa-shared/db/package.json && find test -name \\*.sql -exec cp \\{\\} dist/esm/packages/fxa-shared/\\{\\} \\; ; find test -name \\*.sql -exec cp \\{\\} dist/cjs/packages/fxa-shared/\\{\\} \\;",
"glean-generate": "yarn glean translate ./metrics/glean/fxa-ui-pings.yaml ./metrics/glean/fxa-ui-metrics.yaml -f typescript -o ./metrics/glean/web && prettier --config ../../_dev/.prettierrc --write ./metrics/glean/web/*.ts",
"glean-lint": "yarn glean glinter ./metrics/glean/fxa-ui-pings.yaml ./metrics/glean/fxa-ui-metrics.yaml",
"glean-generate": "npx glean translate ./metrics/glean/fxa-ui-pings.yaml ./metrics/glean/fxa-ui-metrics.yaml -f typescript -o ./metrics/glean/web && prettier --config ../../_dev/.prettierrc --write ./metrics/glean/web/*.ts",
"glean-lint": "npx glean glinter ./metrics/glean/fxa-ui-pings.yaml ./metrics/glean/fxa-ui-metrics.yaml",
"start": "pm2 start pm2.config.js",
"stop": "pm2 stop pm2.config.js",
"restart": "pm2 restart pm2.config.js",
@ -288,7 +288,6 @@
},
"dependencies": {
"@fluent/langneg": "^0.7.0",
"@mozilla/glean": "^5.0.2",
"accept-language-parser": "^1.5.0",
"ajv": "^8.17.1",
"app-store-server-api": "^0.7.0",

18
yarn.lock
Просмотреть файл

@ -12764,6 +12764,19 @@ __metadata:
languageName: node
linkType: hard
"@mozilla/glean@npm:^5.0.3":
version: 5.0.3
resolution: "@mozilla/glean@npm:5.0.3"
dependencies:
fflate: ^0.8.0
tslib: ^2.3.1
uuid: ^9.0.0
bin:
glean: dist/cli/cli.js
checksum: 58ec9e831855d57f319738378694ca04b99217c10fee2c370f62624e61ca9b65b799cd16d499cd3cf9a2d18fc1ea512360c10fba2da0af62971e409e43aaa88d
languageName: node
linkType: hard
"@mrmlnc/readdir-enhanced@npm:^2.2.1":
version: 2.2.1
resolution: "@mrmlnc/readdir-enhanced@npm:2.2.1"
@ -39143,7 +39156,6 @@ fsevents@~2.1.1:
"@googlemaps/google-maps-services-js": ^3.4.0
"@hapi/hapi": ^20.2.1
"@hapi/hoek": ^11.0.2
"@mozilla/glean": ^5.0.2
"@storybook/addon-controls": ^7.4.6
"@storybook/addon-docs": ^7.6.12
"@storybook/addon-toolbars": ^7.0.23
@ -39299,7 +39311,6 @@ fsevents@~2.1.1:
"@babel/preset-env": ^7.22.9
"@babel/preset-react": ^7.24.1
"@babel/preset-typescript": ^7.24.1
"@mozilla/glean": ^5.0.2
"@types/backbone": ^1.4.19
"@types/postcss-import": ^14
"@types/sinon-chai": 3.2.5
@ -39990,7 +40001,6 @@ fsevents@~2.1.1:
resolution: "fxa-shared@workspace:packages/fxa-shared"
dependencies:
"@fluent/langneg": ^0.7.0
"@mozilla/glean": ^5.0.2
"@types/accept-language-parser": ^1.5.3
"@types/chai": ^4.3.17
"@types/chance": ^1.1.2
@ -40084,7 +40094,7 @@ fsevents@~2.1.1:
"@graphql-codegen/typescript": ^4.0.1
"@graphql-codegen/typescript-document-nodes": ^4.0.1
"@grpc/grpc-js": ^1.11.1
"@mozilla/glean": ^5.0.2
"@mozilla/glean": ^5.0.3
"@nestjs/apollo": ^12.1.0
"@nestjs/cli": ^10.4.2
"@nestjs/common": ^10.3.4