Merge pull request #574 from City-of-Helsinki/update-configuration

Automatic update
City-of-Helsinki · Oct 18, 2024 · ae2c34d · ae2c34d
2 parents 2f84f1a + c19d5c5
commit ae2c34d
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 32 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/raven.settings.yml b/conf/cmi/raven.settings.yml
@@ -29,7 +29,7 @@ rate_limit: 0
 send_request_body: false
 request_tracing: true
 traces_sample_rate: 0.2
-browser_traces_sample_rate: null
+browser_traces_sample_rate: 0.2
 database_tracing: true
 twig_tracing: true
 auto_session_tracking: false

diff --git a/conf/cmi/user.role.anonymous.yml b/conf/cmi/user.role.anonymous.yml
@@ -9,6 +9,7 @@ dependencies:
     - external_entities
     - helfi_api_base
     - media
+    - raven
     - rest
     - system
 _core:
@@ -21,6 +22,7 @@ permissions:
   - 'access content'
   - 'display eu cookie compliance popup'
   - 'restful get helfi_global_mobile_menu'
+  - 'send javascript errors to sentry'
   - 'view helfi_announcements external entity'
   - 'view helfi_news external entity'
   - 'view helfi_news_groups external entity'

diff --git a/conf/cmi/user.role.authenticated.yml b/conf/cmi/user.role.authenticated.yml
@@ -11,6 +11,7 @@ dependencies:
     - helfi_api_base
     - media
     - paragraphs
+    - raven
     - rest
     - system
     - tfa
@@ -28,6 +29,7 @@ permissions:
   - 'disable own tfa'
   - 'display eu cookie compliance popup'
   - 'restful get helfi_global_mobile_menu'
+  - 'send javascript errors to sentry'
   - 'setup own tfa'
   - 'view helfi_announcements external entity'
   - 'view helfi_news external entity'

diff --git a/public/sites/default/settings.php b/public/sites/default/settings.php
@@ -389,6 +389,11 @@ function drupal_get_env(string|array $variables) : mixed {
 $default_log_level = getenv('APP_ENV') === 'production' ? 'info' : 'debug';
 $settings['helfi_api_base.log_level'] = getenv('LOG_LEVEL') ?: $default_log_level;
 
+// Turn sentry JS error tracking on if SENTRY_DSN_PUBLIC is defined.
+if (getenv('SENTRY_DSN_PUBLIC')) {
+  $config['raven.settings']['javascript_error_handler'] = TRUE;
+}
+
 /**
  * Deployment identifier.
  *