Skip to content

Commit c4ceb1e

Browse files
committed
chore(payments): Update refs to use libs instead of fxa-shared
Because: - Cleaning up code duplication This Commit: - References @fxa/shared/sentry - References @fxa/shared/otel - References @fxa/shared/monitoring
1 parent b2c872c commit c4ceb1e

4 files changed

Lines changed: 9 additions & 11 deletions

File tree

packages/fxa-payments-server/server/config/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
const fs = require('fs');
66
const path = require('path');
77
const convict = require('convict');
8-
const { tracingConfig } = require('fxa-shared/tracing/config');
8+
const { tracingConfig } = require('@fxa/shared/otel');
99

1010
convict.addFormats(require('convict-format-with-moment'));
1111
convict.addFormats(require('convict-format-with-validator'));

packages/fxa-payments-server/server/jest.config.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,15 @@ module.exports = {
1616
},
1717
},
1818
transform: {
19-
"fxa-shared/*": [ "ts-jest", { "isolatedModules": true } ],
20-
"libs/shared/l10n/src": [ "ts-jest", { "isolatedModules": true } ],
19+
'^.+\\.(ts|tsx)$': 'ts-jest',
2120
},
2221
// ts-jest - Paths mapping - With helper
2322
// https://kulshekhar.github.io/ts-jest/docs/getting-started/paths-mapping#jest-config-with-helper
2423
roots: ['<rootDir>'],
2524
modulePaths: [compilerOptions.baseUrl],
26-
moduleNameMapper: pathsToModuleNameMapper(compilerOptions.paths, {prefix: '<rootDir>/../../../'})
25+
moduleNameMapper: {
26+
...pathsToModuleNameMapper(compilerOptions.paths, {prefix: '<rootDir>/../../../'}),
27+
'^@opentelemetry/otlp-exporter-base/node-http$': '@opentelemetry/otlp-exporter-base/build/src/index-node-http.js',
28+
'^@opentelemetry/otlp-exporter-base/browser-http$': '@opentelemetry/otlp-exporter-base/build/src/index-browser-http.js',
29+
},
2730
};

packages/fxa-payments-server/server/lib/monitoring.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
44

55
const Sentry = require('@sentry/node');
6-
const { initMonitoring } = require('fxa-shared/monitoring');
6+
const { initMonitoring } = require('@fxa/shared/monitoring');
77
const { config } = require('../config');
88
const log = require('./logging/log')('configure-sentry');
99
const { version } = require('../../package.json');

packages/fxa-payments-server/src/lib/sentry.js

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@
55
import Logger from './logger';
66
import * as Sentry from '@sentry/browser';
77

8-
import {
9-
tagFxaName,
10-
tagCriticalEvent,
11-
buildSentryConfig,
12-
} from 'fxa-shared/sentry';
8+
import { tagFxaName, buildSentryConfig } from '@fxa/shared/sentry-utils';
139

1410
/**
1511
* function that gets called before data gets sent to error metrics
@@ -79,7 +75,6 @@ SentryMetrics.prototype = {
7975
Sentry.init({
8076
...opts,
8177
beforeSend(event) {
82-
event = tagCriticalEvent(event);
8378
event = tagFxaName(event, opts.clientName);
8479
return event;
8580
},

0 commit comments

Comments
 (0)