From 788856bb9e2f9939d81bc7caba075eab6a5747c1 Mon Sep 17 00:00:00 2001 From: Thomas Guillet Date: Wed, 30 Jul 2025 16:29:37 +0200 Subject: [PATCH 1/2] Permet d'utiliser l'instance Sentry de son choix --- .env.example | 3 +++ backend/config/index.ts | 2 ++ backend/types/config.d.ts | 2 ++ vite.config.ts | 8 ++++---- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.env.example b/.env.example index bfc1b08923..bf8112cd8c 100644 --- a/.env.example +++ b/.env.example @@ -34,6 +34,9 @@ VITE_STATS_VERSION= MONGODB_URL= +SENTRY_ORG= +SENTRY_URL= + SENTRY_BACKEND_DSN= SENTRY_BACKEND_PROJECT= diff --git a/backend/config/index.ts b/backend/config/index.ts index 7551376143..c6db52b8ae 100644 --- a/backend/config/index.ts +++ b/backend/config/index.ts @@ -111,6 +111,8 @@ const config: Configuration = { mongodb_url: process.env.MONGODB_URL || "mongodb://127.0.0.1:27017/dev-aides-jeunes", sentry: { + org: process.env.SENTRY_ORG, + url: process.env.SENTRY_URL, dsn: process.env.SENTRY_BACKEND_DSN, authToken: process.env.SENTRY_AUTH_TOKEN, project: process.env.SENTRY_BACKEND_PROJECT, diff --git a/backend/types/config.d.ts b/backend/types/config.d.ts index dfc87a84f7..9595f0e9b2 100644 --- a/backend/types/config.d.ts +++ b/backend/types/config.d.ts @@ -68,6 +68,8 @@ export interface Configuration { tracesSampleRate: float profilesSampleRate: float debug: boolean + org?: string + url?: string } smsService: { show: boolean | undefined diff --git a/vite.config.ts b/vite.config.ts index 7458688ffe..709fb05b5e 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -30,15 +30,15 @@ const { smsService, } = config -function createSentryPlugin(authToken, project) { +function createSentryPlugin({authToken, url, org}, project) { if (!authToken || !project) { return null } return sentryVitePlugin({ - org: "betagouv", + org: org || "betagouv", project, authToken, - url: "https://sentry.incubateur.net/", + url: url || "https://sentry.incubateur.net/", sourcemaps: { assets: `./dist/assets/${buildId}/js/*.{js,map}`, }, @@ -132,7 +132,7 @@ export default defineConfig(async ({ mode }) => { }), visualizer(), createSentryPlugin( - sentry.authToken, + sentry, viteEnvironment.VITE_SENTRY_FRONTEND_PROJECT, ), sitemapGenerator(), From b1ba775ece987175641fece8daac520bc39892fc Mon Sep 17 00:00:00 2001 From: Thomas Guillet Date: Mon, 19 Jan 2026 18:55:31 +0100 Subject: [PATCH 2/2] Linte --- vite.config.ts | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/vite.config.ts b/vite.config.ts index 709fb05b5e..106768bbdb 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -30,7 +30,7 @@ const { smsService, } = config -function createSentryPlugin({authToken, url, org}, project) { +function createSentryPlugin({ authToken, url, org }, project) { if (!authToken || !project) { return null } @@ -131,10 +131,7 @@ export default defineConfig(async ({ mode }) => { targets: ["defaults"], }), visualizer(), - createSentryPlugin( - sentry, - viteEnvironment.VITE_SENTRY_FRONTEND_PROJECT, - ), + createSentryPlugin(sentry, viteEnvironment.VITE_SENTRY_FRONTEND_PROJECT), sitemapGenerator(), ], resolve: {