diff --git a/packages/twenty-docker/twenty/Dockerfile b/packages/twenty-docker/twenty/Dockerfile index 970d874c9..54f559ee7 100644 --- a/packages/twenty-docker/twenty/Dockerfile +++ b/packages/twenty-docker/twenty/Dockerfile @@ -64,8 +64,6 @@ WORKDIR /app/packages/twenty-server ARG REACT_APP_SERVER_BASE_URL ENV REACT_APP_SERVER_BASE_URL $REACT_APP_SERVER_BASE_URL -ARG SENTRY_RELEASE -ENV SENTRY_RELEASE $SENTRY_RELEASE ARG APP_VERSION ENV APP_VERSION $APP_VERSION diff --git a/packages/twenty-server/.env.example b/packages/twenty-server/.env.example index a62ebf985..ebc09d0ef 100644 --- a/packages/twenty-server/.env.example +++ b/packages/twenty-server/.env.example @@ -42,7 +42,6 @@ FRONTEND_URL=http://localhost:3001 # EXCEPTION_HANDLER_DRIVER=sentry # METER_DRIVER=opentelemetry,console # SENTRY_ENVIRONMENT=main -# SENTRY_RELEASE=latest # SENTRY_DSN=https://xxx@xxx.ingest.sentry.io/xxx # SENTRY_FRONT_DSN=https://xxx@xxx.ingest.sentry.io/xxx # LOG_LEVELS=error,warn diff --git a/packages/twenty-server/src/engine/core-modules/client-config/client-config.resolver.ts b/packages/twenty-server/src/engine/core-modules/client-config/client-config.resolver.ts index b230c550a..fe78a1d17 100644 --- a/packages/twenty-server/src/engine/core-modules/client-config/client-config.resolver.ts +++ b/packages/twenty-server/src/engine/core-modules/client-config/client-config.resolver.ts @@ -63,7 +63,7 @@ export class ClientConfigResolver { }, sentry: { environment: this.twentyConfigService.get('SENTRY_ENVIRONMENT'), - release: this.twentyConfigService.get('SENTRY_RELEASE'), + release: this.twentyConfigService.get('APP_VERSION'), dsn: this.twentyConfigService.get('SENTRY_FRONT_DSN'), }, captcha: { diff --git a/packages/twenty-server/src/engine/core-modules/exception-handler/exception-handler.module-factory.ts b/packages/twenty-server/src/engine/core-modules/exception-handler/exception-handler.module-factory.ts index e4aff0270..667574617 100644 --- a/packages/twenty-server/src/engine/core-modules/exception-handler/exception-handler.module-factory.ts +++ b/packages/twenty-server/src/engine/core-modules/exception-handler/exception-handler.module-factory.ts @@ -29,7 +29,7 @@ export const exceptionHandlerModuleFactory = async ( type: ExceptionHandlerDriver.Sentry, options: { environment: twentyConfigService.get('SENTRY_ENVIRONMENT'), - release: twentyConfigService.get('SENTRY_RELEASE'), + release: twentyConfigService.get('APP_VERSION'), dsn: twentyConfigService.get('SENTRY_DSN') ?? '', serverInstance: adapterHost.httpAdapter?.getInstance(), debug: diff --git a/packages/twenty-server/src/engine/core-modules/twenty-config/config-variables.ts b/packages/twenty-server/src/engine/core-modules/twenty-config/config-variables.ts index 7a5bd6966..42cf6a575 100644 --- a/packages/twenty-server/src/engine/core-modules/twenty-config/config-variables.ts +++ b/packages/twenty-server/src/engine/core-modules/twenty-config/config-variables.ts @@ -660,17 +660,6 @@ export class ConfigVariables { @IsString() SENTRY_FRONT_DSN: string; - @ConfigVariablesMetadata({ - group: ConfigVariablesGroup.ExceptionHandler, - description: 'Release version for Sentry logging', - }) - @ValidateIf( - (env) => env.EXCEPTION_HANDLER_DRIVER === ExceptionHandlerDriver.Sentry, - ) - @IsString() - @IsOptional() - SENTRY_RELEASE: string; - @ConfigVariablesMetadata({ group: ConfigVariablesGroup.ExceptionHandler, description: 'Environment name for Sentry logging', diff --git a/packages/twenty-server/src/instrument.ts b/packages/twenty-server/src/instrument.ts index e2f542e0a..c4975eee0 100644 --- a/packages/twenty-server/src/instrument.ts +++ b/packages/twenty-server/src/instrument.ts @@ -26,7 +26,7 @@ const meterDrivers = parseArrayEnvVar( if (process.env.EXCEPTION_HANDLER_DRIVER === ExceptionHandlerDriver.Sentry) { Sentry.init({ environment: process.env.SENTRY_ENVIRONMENT, - release: process.env.SENTRY_RELEASE, + release: process.env.APP_VERSION, dsn: process.env.SENTRY_DSN, integrations: [ // TODO: Redis integration doesn't seem to work - investigate why diff --git a/packages/twenty-website/src/content/developers/self-hosting/setup.mdx b/packages/twenty-website/src/content/developers/self-hosting/setup.mdx index c6640a2cf..42126169b 100644 --- a/packages/twenty-website/src/content/developers/self-hosting/setup.mdx +++ b/packages/twenty-website/src/content/developers/self-hosting/setup.mdx @@ -287,7 +287,6 @@ yarn command:prod cron:calendar:ongoing-stale ['LOG_LEVELS', 'error,warn', "The loglevels which are logged to the logging driver. Can include: 'log', 'warn', 'error'"], ['EXCEPTION_HANDLER_DRIVER', 'sentry', "The exception handler driver can be: 'console' or 'sentry'"], ['SENTRY_ENVIRONMENT', 'main', 'The sentry environment used if sentry logging driver is selected'], - ['SENTRY_RELEASE', 'latest', 'The sentry release used if sentry logging driver is selected'], ['SENTRY_DSN', 'https://xxx@xxx.ingest.sentry.io/xxx', 'The sentry logging endpoint used if sentry logging driver is selected'], ['SENTRY_FRONT_DSN', 'https://xxx@xxx.ingest.sentry.io/xxx', 'The sentry logging endpoint used by the frontend if sentry logging driver is selected'], ['METER_DRIVER', 'console', "The meter driver can be: 'console' and/or 'opentelemetry' "],