Skip to content

Commit 80f998a

Browse files
committed
chore(admin): 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 4f68aa1 commit 80f998a

3 files changed

Lines changed: 11 additions & 8 deletions

File tree

packages/fxa-admin-panel/server/config/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import convict from 'convict';
66
import fs from 'fs';
77
import path from 'path';
88
import { GuardConfig } from '@fxa/shared/guards';
9-
import { tracingConfig } from 'fxa-shared/tracing/config';
9+
import { tracingConfig } from '@fxa/shared/otel';
1010

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

packages/fxa-admin-panel/server/lib/monitoring.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import Config from '../config';
66
import mozLog from 'mozlog';
7-
import { initMonitoring } from 'fxa-shared/monitoring';
7+
import { initMonitoring } from '@fxa/shared/monitoring';
88
import { version } from '../../package.json';
99

1010
const config = Config.getProperties();

packages/fxa-admin-panel/src/index.tsx

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import AppErrorBoundary from 'fxa-react/components/AppErrorBoundary';
99
import AppLocalizationProvider from 'fxa-react/lib/AppLocalizationProvider';
1010
import { ApolloClient, createHttpLink, InMemoryCache } from '@apollo/client';
1111
import { setContext } from '@apollo/client/link/context';
12-
import sentryMetrics from 'fxa-shared/sentry/browser';
12+
import { initSentry } from '@fxa/shared/sentry-browser';
1313
import { config, readConfigFromMeta, getExtraHeaders } from './lib/config';
1414
import App from './App';
1515
import './styles/tailwind.out.css';
@@ -34,12 +34,15 @@ try {
3434
cache: new InMemoryCache(),
3535
});
3636

37-
sentryMetrics.configure({
38-
release: config.version,
39-
sentry: {
40-
...config.sentry,
37+
initSentry(
38+
{
39+
release: config.version,
40+
sentry: {
41+
...config.sentry,
42+
},
4143
},
42-
});
44+
console
45+
);
4346

4447
const root = createRoot(document.getElementById('root')!);
4548

0 commit comments

Comments
 (0)