Merge pull request #6240 from adullact/6239_fix_sentry-environment

#6239 - Fix sentry environment

app/controllers/application_controller.rb

@@ -244,7 +244,7 @@ class ApplicationController < ActionController::Base
     sentry = Rails.application.secrets.sentry
 
     {
-      key: sentry[:client_key],
+      key: sentry[:js_client_key],
       enabled: sentry[:enabled],
       environment: sentry[:environment],
       browser: { modern: BrowserSupport.supported?(browser) },

config/initializers/sentry.rb

@@ -1,9 +1,12 @@
 Sentry.init do |config|
-  config.dsn = ENV['SENTRY_ENABLED'] == 'enabled' ? ENV['SENTRY_DSN_RAILS'] : nil
+  secrets = Rails.application.secrets.sentry
+
+  config.dsn = secrets[:enabled] ? secrets[:rails_client_key] : nil
   config.send_default_pii = false
-  config.enabled_environments = ['production']
+  config.environment = secrets[:environment] || Rails.env
+  config.enabled_environments = ['production', secrets[:environment].presence].compact
   config.breadcrumbs_logger = [:active_support_logger]
-  config.traces_sample_rate = ENV['SENTRY_ENABLED'] == 'enabled' ? 0.001 : nil
+  config.traces_sample_rate = secrets[:enabled] ? 0.001 : nil
   config.excluded_exceptions += [
     # Ignore exceptions caught by ActiveJob.retry_on
     # https://github.com/getsentry/sentry-ruby/issues/1347

config/secrets.yml

@@ -50,7 +50,8 @@ defaults: &defaults
     client_key: <%= ENV['MATOMO_ID'] %>
   sentry:
     enabled: <%= ENV['SENTRY_ENABLED'] == 'enabled' %>
-    client_key: <%= ENV['SENTRY_DSN_JS'] %>
+    js_client_key: <%= ENV['SENTRY_DSN_JS'] %>
+    rails_client_key: <%= ENV['SENTRY_DSN_RAILS'] %>
     environment: <%= ENV['SENTRY_CURRENT_ENV'] %>
   crisp:
     enabled: <%= ENV['CRISP_ENABLED'] == 'enabled' %>