From a01a37bb41f46c0a3c19263ced6b220942e2e75b Mon Sep 17 00:00:00 2001 From: Jean SIMARD Date: Fri, 31 May 2024 01:18:49 +0200 Subject: [PATCH] front: remove sentry follow-up on #7241 --- docker/gateway-entrypoint.sh | 2 - front/.env.example | 2 - front/.env.local.defaults | 2 - front/docker/Dockerfile.nginx | 2 - front/package.json | 3 - front/src/config/config.ts | 5 -- front/src/index.tsx | 14 ---- front/src/stories/storybook.css | 4 -- front/src/styles/scss/_body.scss | 5 -- front/src/vite-env.d.ts | 2 - front/yarn.lock | 120 ++++++++----------------------- 11 files changed, 28 insertions(+), 133 deletions(-) diff --git a/docker/gateway-entrypoint.sh b/docker/gateway-entrypoint.sh index 396f1326fa1..c4d0f184388 100644 --- a/docker/gateway-entrypoint.sh +++ b/docker/gateway-entrypoint.sh @@ -1,8 +1,6 @@ #!/bin/sh >/tmp/front_config jq -rn '{ - OSRD_SENTRY_DSN: env.OSRD_SENTRY_DSN, - OSRD_SENTRY_ENVIRONMENT: env.OSRD_SENTRY_ENVIRONMENT, OSRD_GIT_DESCRIBE: env.OSRD_GIT_DESCRIBE, } | @json | " globalThis.import_meta_env = \(.);"' diff --git a/front/.env.example b/front/.env.example index 2d74683071e..4e0958a5c9b 100644 --- a/front/.env.example +++ b/front/.env.example @@ -1,3 +1 @@ -OSRD_SENTRY_DSN=https://key@sentry.example.com/42 -OSRD_SENTRY_ENVIRONMENT=staging OSRD_GIT_DESCRIBE=xxxxxx diff --git a/front/.env.local.defaults b/front/.env.local.defaults index b3eed88091d..0add4d77e02 100644 --- a/front/.env.local.defaults +++ b/front/.env.local.defaults @@ -1,5 +1,3 @@ -OSRD_SENTRY_DSN= -OSRD_SENTRY_ENVIRONMENT= OSRD_GIT_DESCRIBE= OSRD_VITE_PORT=3000 OSRD_VITE_OVERLAY=true diff --git a/front/docker/Dockerfile.nginx b/front/docker/Dockerfile.nginx index bb44ca19f06..d979c5958f1 100644 --- a/front/docker/Dockerfile.nginx +++ b/front/docker/Dockerfile.nginx @@ -34,8 +34,6 @@ COPY --from=build /app/build /srv COPY --from=build /app/.env.example / ENV OSRD_BACKEND_URL="" -ENV OSRD_SENTRY_DSN="" -ENV OSRD_SENTRY_ENVIRONMENT="" ARG OSRD_GIT_DESCRIBE ENV OSRD_GIT_DESCRIBE=${OSRD_GIT_DESCRIBE} diff --git a/front/package.json b/front/package.json index 25c31cfc68a..e3a34a133b8 100644 --- a/front/package.json +++ b/front/package.json @@ -19,9 +19,6 @@ "@rjsf/utils": "^5.17.0", "@rjsf/validator-ajv8": "^5.17.0", "@rtk-query/codegen-openapi": "^1.2.0", - "@sentry/browser": "^7.99.0", - "@sentry/react": "^7.99.0", - "@sentry/tracing": "^7.99.0", "@sncf/bootstrap-sncf.metier.reseau": "^4.3.1-r6-beta4", "@storybook/addon-postcss": "^2.0.0", "@storybook/preset-scss": "^1.0.3", diff --git a/front/src/config/config.ts b/front/src/config/config.ts index 8d62067e71f..6583310576c 100644 --- a/front/src/config/config.ts +++ b/front/src/config/config.ts @@ -7,9 +7,4 @@ export const MAIN_API = { }, }; -export const SENTRY_CONFIG = { - react_sentry_dsn: import.meta.env.OSRD_SENTRY_DSN, - environment: import.meta.env.OSRD_SENTRY_ENVIRONMENT, -}; - export default MAIN_API; diff --git a/front/src/index.tsx b/front/src/index.tsx index 370a5ae701b..f8d8449cbbe 100644 --- a/front/src/index.tsx +++ b/front/src/index.tsx @@ -1,7 +1,5 @@ import React from 'react'; -import * as Sentry from '@sentry/react'; -import { BrowserTracing } from '@sentry/tracing'; import ReactDOM from 'react-dom/client'; import { Provider } from 'react-redux'; import { PersistGate } from 'redux-persist/integration/react'; @@ -11,24 +9,12 @@ import 'maplibre-gl/dist/maplibre-gl.css'; import 'styles/styles.scss'; import { Loader } from 'common/Loaders'; -import { SENTRY_CONFIG } from 'config/config'; import App from 'main/app'; import { persistor, store } from 'store'; // Components import { version } from '../package.json'; -if (SENTRY_CONFIG.react_sentry_dsn) { - Sentry.init({ - dsn: SENTRY_CONFIG.react_sentry_dsn, - integrations: [new BrowserTracing()], - environment: SENTRY_CONFIG.environment, - // We recommend adjusting this value in production, or using tracesSampler - // for finer control - tracesSampleRate: 1.0, - }); -} - export default function Container() { console.info('OSRD VERSION', version); diff --git a/front/src/stories/storybook.css b/front/src/stories/storybook.css index 73d5e9fbcd7..790705e99c4 100644 --- a/front/src/stories/storybook.css +++ b/front/src/stories/storybook.css @@ -345,10 +345,6 @@ body { left: 0 !important; } } -.sentry-error-embed-wrapper { - margin-top: 7.5% !important; - z-index: 1051 !important; -} .custom-control { padding-left: 1.625rem !important; diff --git a/front/src/styles/scss/_body.scss b/front/src/styles/scss/_body.scss index a3da5ad95f2..f586d56845e 100644 --- a/front/src/styles/scss/_body.scss +++ b/front/src/styles/scss/_body.scss @@ -163,11 +163,6 @@ body { } } -.sentry-error-embed-wrapper { - margin-top: 7.5% !important; - z-index: 1051 !important; -} - .custom-control { padding-left: 1.625rem !important; .custom-control-label { diff --git a/front/src/vite-env.d.ts b/front/src/vite-env.d.ts index 5470568b536..706996d4fed 100644 --- a/front/src/vite-env.d.ts +++ b/front/src/vite-env.d.ts @@ -1,7 +1,5 @@ /// interface ImportMetaEnv { - OSRD_SENTRY_DSN: string; - OSRD_SENTRY_ENVIRONMENT: string; OSRD_GIT_DESCRIBE: string; } diff --git a/front/yarn.lock b/front/yarn.lock index 83b8fc1b061..384315a09aa 100644 --- a/front/yarn.lock +++ b/front/yarn.lock @@ -2744,95 +2744,6 @@ swagger2openapi "^7.0.4" typescript "^5.0.0" -"@sentry-internal/feedback@7.110.1": - version "7.110.1" - resolved "https://registry.yarnpkg.com/@sentry-internal/feedback/-/feedback-7.110.1.tgz#34fc4a58366917a5d7b6526937d2ad3ed169b3cd" - integrity sha512-0aR3wuEW+SZKOVNamuy0pTQyPmqDjWPPLrB2GAXGT3ZjrVxjEzzVPqk6DVBYxSV2MuJaD507SZnvfoSPNgoBmw== - dependencies: - "@sentry/core" "7.110.1" - "@sentry/types" "7.110.1" - "@sentry/utils" "7.110.1" - -"@sentry-internal/replay-canvas@7.110.1": - version "7.110.1" - resolved "https://registry.yarnpkg.com/@sentry-internal/replay-canvas/-/replay-canvas-7.110.1.tgz#1b0457e71fcf7ebb2891859717cebf4b62547e15" - integrity sha512-zdcCmWFXM4DHOau/BCZVb6jf9zozdbAiJ1MzQ6azuZEuysOl00YfktoWZBbZjjjpWT6025s+wrmFz54t0O+enw== - dependencies: - "@sentry/core" "7.110.1" - "@sentry/replay" "7.110.1" - "@sentry/types" "7.110.1" - "@sentry/utils" "7.110.1" - -"@sentry-internal/tracing@7.110.1": - version "7.110.1" - resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.110.1.tgz#3bf55dca9e963144b0a4ad9a0b96aa2a759e2470" - integrity sha512-4kTd6EM0OP1SVWl2yLn3KIwlCpld1lyhNDeR8G1aKLm1PN+kVsR6YB/jy9KPPp4Q3lN3W9EkTSES3qhP4jVffQ== - dependencies: - "@sentry/core" "7.110.1" - "@sentry/types" "7.110.1" - "@sentry/utils" "7.110.1" - -"@sentry/browser@7.110.1", "@sentry/browser@^7.99.0": - version "7.110.1" - resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.110.1.tgz#0742b72ea2fc8578f091ca9049e802e46a3bed41" - integrity sha512-H3TZlbdsgxuoVxhotMtBDemvAofx3UPNcS+UjQ40Bd+hKX01IIbEN3i+9RQ0jmcbU6xjf+yhjwp+Ejpm4FmYMw== - dependencies: - "@sentry-internal/feedback" "7.110.1" - "@sentry-internal/replay-canvas" "7.110.1" - "@sentry-internal/tracing" "7.110.1" - "@sentry/core" "7.110.1" - "@sentry/replay" "7.110.1" - "@sentry/types" "7.110.1" - "@sentry/utils" "7.110.1" - -"@sentry/core@7.110.1": - version "7.110.1" - resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.110.1.tgz#0d9fd932478c4cb1f6330143ddf69dacee27bf4d" - integrity sha512-yC1yeUFQlmHj9u/KxKmwOMVanBmgfX+4MZnZU31QPqN95adyZTwpaYFZl4fH5kDVnz7wXJI0qRP8SxuMePtqhw== - dependencies: - "@sentry/types" "7.110.1" - "@sentry/utils" "7.110.1" - -"@sentry/react@^7.99.0": - version "7.110.1" - resolved "https://registry.yarnpkg.com/@sentry/react/-/react-7.110.1.tgz#77773bb1a673311b1daa1536df7799186c272d80" - integrity sha512-kXdMrDexPyBf0KP/IfgCk5NS1Yfz6tFK/+UKWTxEM5PVRZkHzV7CBdd50IFGL3xMGbJmtE5Bly6WzezqUgWZ5w== - dependencies: - "@sentry/browser" "7.110.1" - "@sentry/core" "7.110.1" - "@sentry/types" "7.110.1" - "@sentry/utils" "7.110.1" - hoist-non-react-statics "^3.3.2" - -"@sentry/replay@7.110.1": - version "7.110.1" - resolved "https://registry.yarnpkg.com/@sentry/replay/-/replay-7.110.1.tgz#e32cb3dfa9be49f3bd902dbf4e3c22c1d023704c" - integrity sha512-R49fGOuKYsJ97EujPTzMjs3ZSuSkLTFFQmVBbsu/o6beRp4kK9l8H7r2BfLEcWJOXdWO5EU4KpRWgIxHaDK2aw== - dependencies: - "@sentry-internal/tracing" "7.110.1" - "@sentry/core" "7.110.1" - "@sentry/types" "7.110.1" - "@sentry/utils" "7.110.1" - -"@sentry/tracing@^7.99.0": - version "7.110.1" - resolved "https://registry.yarnpkg.com/@sentry/tracing/-/tracing-7.110.1.tgz#1dbc40cd32f3ac8cf23858a80bba4119c0835c4b" - integrity sha512-y9tFHCV/8PeuV9TBOyMJ9w1vVOhkzoHy9d78eO5N3Q1lC+wImJSEBxb6aPcZ+RkuFBKSMm7fZTF3OFA32dHHLA== - dependencies: - "@sentry-internal/tracing" "7.110.1" - -"@sentry/types@7.110.1": - version "7.110.1" - resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.110.1.tgz#0b84c0d5e075dbd80afa2ce6a486fd14680a0024" - integrity sha512-sZxOpM5gfyxvJeWVvNpHnxERTnlqcozjqNcIv29SZ6wonlkekmxDyJ3uCuPv85VO54WLyA4uzskPKnNFHacI8A== - -"@sentry/utils@7.110.1": - version "7.110.1" - resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.110.1.tgz#39d78734b807a959cacd42477711f85aaa02ca6e" - integrity sha512-eibLo2m1a7sHkOHxYYmRujr3D7ek2l9sv26F1SLoQBVDF7Afw5AKyzPmtA1D+4M9P/ux1okj7cGj3SaBrVpxXA== - dependencies: - "@sentry/types" "7.110.1" - "@sinclair/typebox@^0.27.8": version "0.27.8" resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.27.8.tgz#6667fac16c436b5434a387a34dedb013198f6e6e" @@ -13882,7 +13793,16 @@ strict-uri-encode@^1.0.0: resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713" integrity sha512-R3f198pcvnB+5IpnBlRkphuE9n46WyVl8I39W/ZUTZLz4nqSP/oLYUrcnJrw462Ds8he4YKMov2efsTIw1BDGQ== -"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0": + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + +"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -13968,7 +13888,14 @@ stringify-entities@^4.0.0: character-entities-html4 "^2.0.0" character-entities-legacy "^3.0.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1": + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + +strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -15419,7 +15346,16 @@ wordwrap@^1.0.0: resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + +wrap-ansi@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==