From 0ce5375b8fa496bfff5d08a1b2a16dd2c3129b09 Mon Sep 17 00:00:00 2001 From: Daria Mayorova Date: Mon, 28 Nov 2022 15:55:10 +0100 Subject: [PATCH 1/2] Add BUGSNAG_RELEASE_STAGE env var and use it in Bugsnag initializer --- config/examples/settings.yml | 3 ++- config/initializers/bugsnag.rb | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/config/examples/settings.yml b/config/examples/settings.yml index 6e9bd48193..9d665a5ddc 100644 --- a/config/examples/settings.yml +++ b/config/examples/settings.yml @@ -11,6 +11,8 @@ base: &default daily_weekly_reports_pref: <%= ENV.fetch('ENABLE_DAILY_WEEKLY_REPORTS_PREF', '1') == '1' %> readonly_custom_domains_settings: <%= ENV.fetch('READONLY_CUSTOM_DOMAINS_SETTINGS', '1') == '1' %> bugsnag_api_key: <%= ENV['BUGSNAG_API_KEY'] %> + bugsnag_release_stage: <%= ENV.fetch('BUGSNAG_RELEASE_STAGE', Rails.env) %> + error_reporting_stages: <%= ENV.fetch('ERROR_REPORTING_STAGES', 'production') %> events_shared_secret: <%= ENV['EVENTS_SHARED_SECRET'] %> recaptcha_public_key: <%= ENV.fetch('RECAPTCHA_PUBLIC_KEY', 'YOUR_RECAPTCHA_PUBLIC_KEY') %> recaptcha_private_key: <%= ENV['RECAPTCHA_PRIVATE_KEY'] %> @@ -37,7 +39,6 @@ base: &default enabled: <%= ENV.fetch('EMAIL_SANITIZER_ENABLED', Rails.env.preview?) %> to: <%= ENV.fetch('EMAIL_SANITIZER_TO', 'saniziter@example.com') %> onpremises: false - error_reporting_stages: <%= ENV.fetch('ERROR_REPORTING_STAGES', 'production') %> apicast_staging_url: <%= ENV.fetch('APICAST_STAGING_URL', 'apicast-staging:8090') %> zync_authentication_token: <%= ENV.fetch('ZYNC_AUTHENTICATON_TOKEN', '') %> access_code: <%= ENV.fetch('ACCESS_CODE', '') %> diff --git a/config/initializers/bugsnag.rb b/config/initializers/bugsnag.rb index 5ec392d5d5..ad2600276b 100644 --- a/config/initializers/bugsnag.rb +++ b/config/initializers/bugsnag.rb @@ -3,9 +3,9 @@ Bugsnag.configure do |config| config.api_key = Rails.configuration.three_scale.bugsnag_api_key config.app_version = System::Deploy.info.revision - config.notify_release_stages = %w[production] stages = Rails.configuration.three_scale.error_reporting_stages - config.notify_release_stages = stages if stages.present? + config.notify_release_stages = stages.present? ? stages : %w[production] + config.release_stage = Rails.configuration.three_scale.bugsnag_release_stage || Rails.env ignore_error_names = ActionDispatch::ExceptionWrapper.rescue_responses.keys + ['WebHookWorker::ClientError'] From f0626727489d956aeecfd472dc01414b92cdb242 Mon Sep 17 00:00:00 2001 From: Daria Mayorova Date: Tue, 29 Nov 2022 11:33:27 +0100 Subject: [PATCH 2/2] Update enabled release stages for Bugsnag --- config/initializers/bugsnag.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/config/initializers/bugsnag.rb b/config/initializers/bugsnag.rb index ad2600276b..c7508bd408 100644 --- a/config/initializers/bugsnag.rb +++ b/config/initializers/bugsnag.rb @@ -4,7 +4,9 @@ config.api_key = Rails.configuration.three_scale.bugsnag_api_key config.app_version = System::Deploy.info.revision stages = Rails.configuration.three_scale.error_reporting_stages - config.notify_release_stages = stages.present? ? stages : %w[production] + # TODO: after upgrading Bugsnag replace `notify_release_stages` (deprecated in v6.23) with `enabled_release_stages` + # see https://github.com/bugsnag/bugsnag-ruby/releases/tag/v6.23.0 + config.notify_release_stages = stages.present? ? stages : %w[staging production] config.release_stage = Rails.configuration.three_scale.bugsnag_release_stage || Rails.env ignore_error_names = ActionDispatch::ExceptionWrapper.rescue_responses.keys + ['WebHookWorker::ClientError']