chore(event-broker): 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

Author: dschom

packages/fxa-event-broker/jest.config.js

@@ -1,22 +1,17 @@
 const { pathsToModuleNameMapper } = require('ts-jest');
-const { compilerOptions } = require('./tsconfig.build.json');
+const { compilerOptions } = require('../../tsconfig.base.json');
 module.exports = {
-  moduleNameMapper: pathsToModuleNameMapper(compilerOptions.paths),
-  modulePaths: ['<rootDir>/../dist/'],
+  moduleNameMapper: pathsToModuleNameMapper(compilerOptions.paths, {
+    prefix: '<rootDir>/../../../',
+  }),
+  modulePaths: ['<rootDir>/../../../'],
   moduleFileExtensions: ['js', 'json', 'ts'],
   rootDir: 'src',
   testRegex: '.spec.ts$',
   transform: {
-    '^.+\\.(t|j)s$': [
-      'ts-jest',
-      {
-        isolatedModules: true,
-      },
-    ],
+    '^.+\\.(t|j)s$': 'ts-jest',
   },
-  transformIgnorePatterns: [
-    "/node_modules/(?!axios/)",
-  ],
+  transformIgnorePatterns: ['/node_modules/(?!axios/)'],
   coverageDirectory: './coverage',
   testEnvironment: 'node',
 };

packages/fxa-event-broker/package.json

@@ -84,25 +84,6 @@
     "tsconfig-paths": "^4.2.0",
     "typescript": "5.5.3"
   },
-  "jest": {
-    "moduleFileExtensions": [
-      "js",
-      "json",
-      "ts"
-    ],
-    "rootDir": "src",
-    "testRegex": ".spec.ts$",
-    "transform": {
-      "^.+\\.(t|j)s$": [
-        "ts-jest",
-        {
-          "isolatedModules": true
-        }
-      ]
-    },
-    "coverageDirectory": "../coverage",
-    "testEnvironment": "node"
-  },
   "nx": {
     "tags": [
       "scope:broker",

packages/fxa-event-broker/src/config.ts

@@ -5,7 +5,7 @@
 import convict from 'convict';
 import fs from 'fs';
 import path from 'path';
-import { tracingConfig } from 'fxa-shared/tracing/config';
+import { tracingConfig } from '@fxa/shared/otel';
 
 const FIVE_MINUTES = 60 * 5;
 

packages/fxa-event-broker/src/main.ts

@@ -14,7 +14,7 @@ import { ConfigService } from '@nestjs/config';
 import { HttpAdapterHost, NestFactory } from '@nestjs/core';
 import mozLog from 'mozlog';
 
-import { initTracing } from 'fxa-shared/tracing/node-tracing';
+import { initTracing } from '@fxa/shared/otel';
 
 import { AppModule } from './app.module';
 import Config, { AppConfig } from './config';

packages/fxa-event-broker/src/monitoring.ts

@@ -4,10 +4,33 @@
 
 import Config, { AppConfig } from './config';
 import mozLog from 'mozlog';
-import { initTracing } from 'fxa-shared/tracing/node-tracing';
-import { initSentry } from 'fxa-shared/sentry/node';
+import { initTracing } from '@fxa/shared/otel';
+import { initSentry } from '@fxa/shared/sentry-node';
 
 const log = mozLog(Config.getProperties().log)(Config.getProperties().log.app);
 const appConfig = Config.getProperties() as AppConfig;
 initTracing(appConfig.tracing, log);
-initSentry(appConfig, log);
+initSentry(appConfig, {
+  error(type: string, data: unknown) {
+    log.error(type, toObject(data));
+  },
+  debug(type: string, data: unknown) {
+    log.debug(type, toObject(data));
+  },
+  info(type: string, data: unknown) {
+    log.info(type, toObject(data));
+  },
+  warn(type: string, data: unknown) {
+    log.warn(type, toObject(data));
+  },
+});
+
+function toObject(data: unknown): object {
+  if (data === null) {
+    return {};
+  }
+  if (typeof data === 'object') {
+    return data;
+  }
+  return { data };
+}

packages/fxa-event-broker/tsconfig.build.json

@@ -1,11 +1,4 @@
 {
   "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "paths": {
-      "@fxa/shared/pem-jwk": ["libs/shared/pem-jwk/src/index"],
-      "@fxa/vendored/jwtool": ["libs/vendored/jwtool/src/index"],
-      "@fxa/vendored/typesafe-node-firestore": ["libs/vendored/typesafe-node-firestore/src/index"]
-    }
-  },
   "exclude": ["node_modules", "test", "dist", "**/*spec.ts"]
 }

packages/fxa-event-broker/tsconfig.json

@@ -9,6 +9,7 @@
     "experimentalDecorators": true,
     "noEmitHelpers": true,
     "importHelpers": true,
+    "isolatedModules": true,
     "types": ["jest"]
   },
   "include": ["src"]