Skip to content
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
2 changes: 0 additions & 2 deletions .env.template
Original file line number Diff line number Diff line change
Expand Up @@ -221,12 +221,10 @@ REACT_APP_AUTH0_CLIENT_ID=
REACT_APP_AUTH0_REDIRECT_URI=http://localhost:3000/auth/callback
REACT_APP_AUTH0_SCOPE="openid profile email"
REACT_APP_AUTH0_AUDIENCE=https://bff.trisa.directory
REACT_APP_SENTRY_DSN=

# These should be unset unless specifically needed for a build (e.g. for staging).
# REACT_APP_GIT_REVISION=
# REACT_APP_USE_DASH_LOCALE=
# REACT_APP_SENTRY_ENVIRONMENT=

# Staging Build Args
REACT_APP_STAGING_VASPDIRECTORY_ANALYTICS_ID=
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/containers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,6 @@ jobs:
REACT_APP_AUTH0_CLIENT_ID=${{ secrets.REACT_APP_AUTH0_CLIENT_ID }}
REACT_APP_AUTH0_REDIRECT_URI=https://trisa.directory/auth/callback
REACT_APP_AUTH0_AUDIENCE=https://bff.trisa.directory
REACT_APP_SENTRY_DSN=${{ secrets.REACT_APP_SENTRY_DSN }}

- name: Slack Notify User UI Build Success
if: success()
Expand Down Expand Up @@ -340,7 +339,6 @@ jobs:
REACT_APP_GDS_API_ENDPOINT=https://api.admin.trisa.directory/v2
REACT_APP_GDS_IS_TESTNET=false
REACT_APP_GOOGLE_CLIENT_ID=${{ secrets.REACT_APP_VASPDIRECTORY_CLIENT_ID }}
REACT_APP_SENTRY_DSN=${{ secrets.REACT_APP_ADMIN_SENTRY_DSN }}

- name: Slack Notify Admin UI Build Success
if: success()
Expand Down Expand Up @@ -423,7 +421,6 @@ jobs:
REACT_APP_GDS_API_ENDPOINT=https://api.admin.testnet.directory/v2
REACT_APP_GDS_IS_TESTNET=true
REACT_APP_GOOGLE_CLIENT_ID=${{ secrets.REACT_APP_TRISATEST_CLIENT_ID }}
REACT_APP_SENTRY_DSN=${{ secrets.REACT_APP_ADMIN_SENTRY_DSN }}

- name: Slack Notify TestNet Admin UI Build Success
if: success()
Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/staging.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,6 @@ jobs:
REACT_APP_AUTH0_CLIENT_ID=${{ secrets.REACT_APP_STAGING_AUTH0_CLIENT_ID }}
REACT_APP_AUTH0_REDIRECT_URI=https://vaspdirectory.dev/auth/callback
REACT_APP_AUTH0_AUDIENCE=https://bff.vaspdirectory.dev
REACT_APP_SENTRY_DSN=${{ secrets.REACT_APP_SENTRY_DSN }}
REACT_APP_SENTRY_ENVIRONMENT=staging
REACT_APP_USE_DASH_LOCALE=true

- name: Slack Notify Staging UI Build Success
Expand Down Expand Up @@ -175,8 +173,6 @@ jobs:
REACT_APP_GDS_API_ENDPOINT=https://api.admin.vaspdirectory.dev/v2
REACT_APP_GDS_IS_TESTNET=false
REACT_APP_GOOGLE_CLIENT_ID=${{ secrets.REACT_APP_STAGING_VASPDIRECTORY_CLIENT_ID }}
REACT_APP_SENTRY_DSN=${{ secrets.REACT_APP_ADMIN_SENTRY_DSN }}
REACT_APP_SENTRY_ENVIRONMENT=staging

- name: Slack Notify Staging Admin UI Build Success
if: success()
Expand Down Expand Up @@ -265,8 +261,6 @@ jobs:
REACT_APP_GDS_API_ENDPOINT=https://api.admin.trisatest.dev/v2
REACT_APP_GDS_IS_TESTNET=true
REACT_APP_GOOGLE_CLIENT_ID=${{ secrets.REACT_APP_STAGING_TRISATEST_CLIENT_ID }}
REACT_APP_SENTRY_DSN=${{ secrets.REACT_APP_ADMIN_SENTRY_DSN }}
REACT_APP_SENTRY_ENVIRONMENT=staging

- name: Slack Notify Staging TestNet UI Build Success
if: success()
Expand Down
1 change: 0 additions & 1 deletion containers/.env.template
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,5 @@ GOLANG_PROTOBUF_REGISTRATION_CONFLICT=warn

# React Build Variables
REACT_APP_ANALYTICS_ID=""
REACT_APP_SENTRY_DSN=""
REACT_APP_AUTH0_DOMAIN=""
REACT_APP_AUTH0_CLIENT_ID=""
9 changes: 0 additions & 9 deletions containers/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@ docker buildx build \
--build-arg REACT_APP_ANALYTICS_ID=${REACT_APP_VASPDIRECTORY_ANALYTICS_ID} \
--build-arg REACT_APP_VERSION_NUMBER=${REACT_APP_VERSION_NUMBER} \
--build-arg REACT_APP_GIT_REVISION=${REACT_APP_GIT_REVISION} \
--build-arg REACT_APP_SENTRY_DSN=${REACT_APP_SENTRY_DSN} \
--build-arg REACT_APP_AUTH0_DOMAIN=${REACT_APP_AUTH0_DOMAIN} \
--build-arg REACT_APP_AUTH0_CLIENT_ID=${REACT_APP_AUTH0_CLIENT_ID} \
--build-arg REACT_APP_AUTH0_REDIRECT_URI=https://trisa.directory/auth/callback \
Expand All @@ -133,8 +132,6 @@ docker buildx build \
--build-arg REACT_APP_ANALYTICS_ID=${REACT_APP_STAGING_VASPDIRECTORY_ANALYTICS_ID} \
--build-arg REACT_APP_VERSION_NUMBER=${REACT_APP_VERSION_NUMBER} \
--build-arg REACT_APP_GIT_REVISION=${REACT_APP_GIT_REVISION} \
--build-arg REACT_APP_SENTRY_DSN=${REACT_APP_SENTRY_DSN} \
--build-arg REACT_APP_SENTRY_ENVIRONMENT="staging" \
--build-arg REACT_APP_AUTH0_DOMAIN=${REACT_APP_AUTH0_DOMAIN} \
--build-arg REACT_APP_AUTH0_CLIENT_ID=${REACT_APP_STAGING_AUTH0_CLIENT_ID} \
--build-arg REACT_APP_AUTH0_REDIRECT_URI=https://vaspdirectory.dev/auth/callback \
Expand All @@ -150,7 +147,6 @@ docker buildx build \
--build-arg REACT_APP_GDS_API_ENDPOINT=https://api.admin.trisa.directory/v2 \
--build-arg REACT_APP_GDS_IS_TESTNET=false \
--build-arg REACT_APP_GOOGLE_CLIENT_ID=${REACT_APP_VASPDIRECTORY_CLIENT_ID} \
--build-arg REACT_APP_SENTRY_DSN=${REACT_APP_ADMIN_SENTRY_DSN} \
--build-arg REACT_APP_VERSION_NUMBER=${REACT_APP_VERSION_NUMBER} \
--build-arg REACT_APP_GIT_REVISION=${REACT_APP_GIT_REVISION} \
$REPO
Expand All @@ -161,7 +157,6 @@ docker buildx build \
--build-arg REACT_APP_GDS_API_ENDPOINT=https://api.admin.testnet.directory/v2 \
--build-arg REACT_APP_GDS_IS_TESTNET=true \
--build-arg REACT_APP_GOOGLE_CLIENT_ID=${REACT_APP_TRISATEST_CLIENT_ID} \
--build-arg REACT_APP_SENTRY_DSN=${REACT_APP_ADMIN_SENTRY_DSN} \
--build-arg REACT_APP_VERSION_NUMBER=${REACT_APP_VERSION_NUMBER} \
--build-arg REACT_APP_GIT_REVISION=${REACT_APP_GIT_REVISION} \
$REPO
Expand All @@ -173,8 +168,6 @@ docker buildx build \
--build-arg REACT_APP_GDS_API_ENDPOINT=https://api.admin.vaspdirectory.dev/v2 \
--build-arg REACT_APP_GDS_IS_TESTNET=false \
--build-arg REACT_APP_GOOGLE_CLIENT_ID=${REACT_APP_STAGING_VASPDIRECTORY_CLIENT_ID} \
--build-arg REACT_APP_SENTRY_DSN=${REACT_APP_ADMIN_SENTRY_DSN} \
--build-arg REACT_APP_SENTRY_ENVIRONMENT="staging" \
--build-arg REACT_APP_VERSION_NUMBER=${REACT_APP_VERSION_NUMBER} \
--build-arg REACT_APP_GIT_REVISION=${REACT_APP_GIT_REVISION} \
$REPO
Expand All @@ -185,8 +178,6 @@ docker buildx build \
--build-arg REACT_APP_GDS_API_ENDPOINT=https://api.admin.trisatest.dev/v2 \
--build-arg REACT_APP_GDS_IS_TESTNET=true \
--build-arg REACT_APP_GOOGLE_CLIENT_ID=${REACT_APP_STAGING_TRISATEST_CLIENT_ID} \
--build-arg REACT_APP_SENTRY_DSN=${REACT_APP_ADMIN_SENTRY_DSN} \
--build-arg REACT_APP_SENTRY_ENVIRONMENT="staging" \
--build-arg REACT_APP_VERSION_NUMBER=${REACT_APP_VERSION_NUMBER} \
--build-arg REACT_APP_GIT_REVISION=${REACT_APP_GIT_REVISION} \
$REPO
Expand Down
6 changes: 0 additions & 6 deletions containers/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -200,8 +200,6 @@ services:
REACT_APP_ANALYTICS_ID: ${REACT_APP_STAGING_VASPDIRECTORY_ANALYTICS_ID}
REACT_APP_VERSION_NUMBER: ${REACT_APP_VERSION_NUMBER}
REACT_APP_GIT_REVISION: ${REACT_APP_GIT_REVISION}
REACT_APP_SENTRY_DSN: ${REACT_APP_SENTRY_DSN}
REACT_APP_SENTRY_ENVIRONMENT: development
REACT_APP_AUTH0_DOMAIN: auth.vaspdirectory.dev
REACT_APP_AUTH0_CLIENT_ID: ${REACT_APP_AUTH0_CLIENT_ID}
REACT_APP_AUTH0_REDIRECT_URI: http://localhost:3000/auth/callback
Expand Down Expand Up @@ -231,8 +229,6 @@ services:
REACT_APP_GDS_API_ENDPOINT: http://localhost:4434/v2
REACT_APP_GDS_IS_TESTNET: "true"
REACT_APP_GOOGLE_CLIENT_ID: ${REACT_APP_GOOGLE_CLIENT_ID}
REACT_APP_SENTRY_DSN: ${REACT_APP_ADMIN_SENTRY_DSN}
REACT_APP_SENTRY_ENVIRONMENT: "development"
REACT_APP_VERSION_NUMBER: ${REACT_APP_VERSION_NUMBER}
REACT_APP_GIT_REVISION: ${REACT_APP_GIT_REVISION}
image: trisa/gds-testnet-admin-ui
Expand Down Expand Up @@ -396,8 +392,6 @@ services:
REACT_APP_GDS_API_ENDPOINT: http://localhost:8434/v2
REACT_APP_GDS_IS_TESTNET: "false"
REACT_APP_GOOGLE_CLIENT_ID: ${REACT_APP_GOOGLE_CLIENT_ID}
REACT_APP_SENTRY_DSN: ${REACT_APP_ADMIN_SENTRY_DSN}
REACT_APP_SENTRY_ENVIRONMENT: "development"
REACT_APP_VERSION_NUMBER: ${REACT_APP_VERSION_NUMBER}
REACT_APP_GIT_REVISION: ${REACT_APP_GIT_REVISION}
image: trisa/gds-admin-ui
Expand Down
2 changes: 0 additions & 2 deletions containers/gds-admin-ui/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ ARG REACT_APP_GIT_REVISION
ARG REACT_APP_GDS_API_ENDPOINT="https://api.admin.trisa.directory"
ARG REACT_APP_GDS_IS_TESTNET=false
ARG REACT_APP_GOOGLE_CLIENT_ID
ARG REACT_APP_SENTRY_DSN
ARG REACT_APP_SENTRY_ENVIRONMENT

# Build app with react-scripts
COPY web/gds-admin-ui/ ./
Expand Down
2 changes: 0 additions & 2 deletions containers/gds-user-ui/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ ARG REACT_APP_AUTH0_CLIENT_ID
ARG REACT_APP_AUTH0_SCOPE="openid profile email"
ARG REACT_APP_AUTH0_REDIRECT_URI="https://trisa.directory/auth/callback"
ARG REACT_APP_AUTH0_AUDIENCE="https://bff.trisa.directory"
ARG REACT_APP_SENTRY_DSN
ARG REACT_APP_SENTRY_ENVIRONMENT
ARG REACT_APP_USE_DASH_LOCALE

# Build app with react-scripts
Expand Down
2 changes: 0 additions & 2 deletions web/gds-admin-ui/env.example
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
REACT_APP_GDS_API_ENDPOINT=
REACT_APP_GOOGLE_CLIENT_ID=
REACT_APP_GDS_IS_TESTNET=
REACT_APP_SENTRY_DSN=
REACT_APP_SENTRY_ENVIRONMENT=
REACT_APP_VERSION_NUMBER=
REACT_APP_GIT_REVISION=
46 changes: 1 addition & 45 deletions web/gds-admin-ui/src/sentry.js
Original file line number Diff line number Diff line change
@@ -1,49 +1,5 @@
import * as Sentry from '@sentry/react';
import { BrowserTracing } from '@sentry/tracing';

import config from './config';

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Sentry packages still bundled despite removal of initialization

Medium Severity

Sentry initialization is disabled but @sentry/react and @sentry/tracing remain as dependencies in both gds-admin-ui/package.json and gds-user-ui/package.json. Multiple source files still actively import and use Sentry APIs: captureException in three admin UI components, Sentry.withProfiler(App) wrapping the entire user UI app tree in App.tsx, and Sentry.ErrorBoundary in several user UI components. These are now dead code, and the ~200KB Sentry SDK is still included in the production bundles despite serving no purpose.

Additional Locations (1)
Fix in Cursor Fix in Web

Reviewed by Cursor Bugbot for commit 6e6510e. Configure here.

const defaultTracingOrigins = ['localhost', /^\//];

const initSentry = () => {
// ensure environment variables app version and git revision are set
if (!config.appVersion) {
// eslint-disable-next-line no-console
console.log('App version is not set in environment variables');
}
if (!config.gitVersion) {
// eslint-disable-next-line no-console
console.log('Git revision is not set in environment variables');
}
console.log(`AppVersion: ${config.appVersion || ''} - GitRevision: ${config.gitVersion || ''}`); // eslint-disable-line no-console

if (process.env.REACT_APP_SENTRY_DSN) {
let tracingOrigins = defaultTracingOrigins;
if (process.env.REACT_APP_GDS_API_ENDPOINT) {
const origin = new URL(process.env.REACT_APP_GDS_API_ENDPOINT);
tracingOrigins = [origin.host];
}

const environment = process.env.REACT_APP_SENTRY_ENVIRONMENT
? process.env.REACT_APP_SENTRY_ENVIRONMENT
: process.env.NODE_ENV;

Sentry.init({
dsn: process.env.REACT_APP_SENTRY_DSN,
integrations: [new BrowserTracing({ tracingOrigins })],
environment,
tracesSampleRate: 1.0,
release: config?.appVersion || '',
// mute session expired errors
ignoreErrors: ['Session expired'],
});

// eslint-disable-next-line no-console
console.log('Sentry tracing initialized');
} else {
// eslint-disable-next-line no-console
console.log('no Sentry configuration available');
}
console.log('sentry is disabled in the GDS');
};

export default initSentry;
1 change: 0 additions & 1 deletion web/gds-ui/env.example
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,3 @@ REACT_APP_AUTH0_CLIENT_ID=
REACT_APP_AUTH0_REDIRECT_URI=
REACT_APP_AUTH0_SCOPE=
REACT_APP_AUTH0_AUDIENCE=
REACT_APP_SENTRY_DSN=
40 changes: 1 addition & 39 deletions web/gds-user-ui/src/application/config/sentry.ts
Original file line number Diff line number Diff line change
@@ -1,43 +1,5 @@
import * as Sentry from '@sentry/react';
import { BrowserTracing } from '@sentry/tracing';
import { getAppVersionNumber } from '.';

const defaultTracingOrigins = ['localhost', /^\//];
const isProdEnv = process.env.NODE_ENV !== 'development';
const initSentry = () => {
if (process.env.REACT_APP_SENTRY_DSN && isProdEnv) {
let tracingOrigins = defaultTracingOrigins;
if (process.env.REACT_APP_TRISA_BASE_URL) {
const origin = new URL(process.env.REACT_APP_TRISA_BASE_URL);
tracingOrigins = [origin.host];
}

const environment = process.env.REACT_APP_SENTRY_ENVIRONMENT
? process.env.REACT_APP_SENTRY_ENVIRONMENT
: process.env.NODE_ENV;

Sentry.init({
dsn: process.env.REACT_APP_SENTRY_DSN,
environment,
integrations: [
new BrowserTracing({
tracingOrigins
})
],

// Set tracesSampleRate to 1.0 to capture 100%
// of transactions for performance monitoring.
// We recommend adjusting this value in production
tracesSampleRate: 1.0,
release: getAppVersionNumber()
});

// eslint-disable-next-line no-console
console.log('Sentry tracing initialized');
} else {
// eslint-disable-next-line no-console
console.log('no Sentry configuration available');
}
console.log('sentry is disabled in the GDS');
};

export default initSentry;
Loading