diff --git a/.env.template b/.env.template index 86d8fb044..37a721caf 100644 --- a/.env.template +++ b/.env.template @@ -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= diff --git a/.github/workflows/containers.yaml b/.github/workflows/containers.yaml index 57e87739e..7d46fe90e 100644 --- a/.github/workflows/containers.yaml +++ b/.github/workflows/containers.yaml @@ -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() @@ -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() @@ -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() diff --git a/.github/workflows/staging.yaml b/.github/workflows/staging.yaml index 631aa6c52..ea6a9edd1 100644 --- a/.github/workflows/staging.yaml +++ b/.github/workflows/staging.yaml @@ -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 @@ -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() @@ -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() diff --git a/containers/.env.template b/containers/.env.template index d38713407..8c0a66385 100644 --- a/containers/.env.template +++ b/containers/.env.template @@ -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="" \ No newline at end of file diff --git a/containers/build.sh b/containers/build.sh index 3957a564d..26495c437 100755 --- a/containers/build.sh +++ b/containers/build.sh @@ -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 \ @@ -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 \ @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/containers/docker-compose.yaml b/containers/docker-compose.yaml index abfbf2312..bf0fdfd09 100644 --- a/containers/docker-compose.yaml +++ b/containers/docker-compose.yaml @@ -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 @@ -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 @@ -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 diff --git a/containers/gds-admin-ui/Dockerfile b/containers/gds-admin-ui/Dockerfile index 9fb7a861a..ff1bffc35 100644 --- a/containers/gds-admin-ui/Dockerfile +++ b/containers/gds-admin-ui/Dockerfile @@ -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/ ./ diff --git a/containers/gds-user-ui/Dockerfile b/containers/gds-user-ui/Dockerfile index a71b610b5..08d2001c8 100644 --- a/containers/gds-user-ui/Dockerfile +++ b/containers/gds-user-ui/Dockerfile @@ -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 diff --git a/web/gds-admin-ui/env.example b/web/gds-admin-ui/env.example index a21a32253..a8e2aff71 100644 --- a/web/gds-admin-ui/env.example +++ b/web/gds-admin-ui/env.example @@ -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= \ No newline at end of file diff --git a/web/gds-admin-ui/src/sentry.js b/web/gds-admin-ui/src/sentry.js index 1a77159b4..98952423d 100644 --- a/web/gds-admin-ui/src/sentry.js +++ b/web/gds-admin-ui/src/sentry.js @@ -1,49 +1,5 @@ -import * as Sentry from '@sentry/react'; -import { BrowserTracing } from '@sentry/tracing'; - -import config from './config'; - -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; diff --git a/web/gds-ui/env.example b/web/gds-ui/env.example index 44548928a..19f1afe78 100644 --- a/web/gds-ui/env.example +++ b/web/gds-ui/env.example @@ -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= diff --git a/web/gds-user-ui/src/application/config/sentry.ts b/web/gds-user-ui/src/application/config/sentry.ts index 840c25caf..98952423d 100644 --- a/web/gds-user-ui/src/application/config/sentry.ts +++ b/web/gds-user-ui/src/application/config/sentry.ts @@ -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;