From c46ab38055539463377d51b9a5393bcd71a44245 Mon Sep 17 00:00:00 2001 From: Paul Chavard Date: Thu, 28 Jan 2021 14:49:03 +0100 Subject: [PATCH] Add sentry-rails --- Gemfile | 3 +- Gemfile.lock | 138 ++++++++++++++++++---------------- config/initializers/raven.rb | 8 -- config/initializers/sentry.rb | 6 ++ 4 files changed, 83 insertions(+), 72 deletions(-) delete mode 100644 config/initializers/raven.rb create mode 100644 config/initializers/sentry.rb diff --git a/Gemfile b/Gemfile index dd0a1f48a..828546342 100644 --- a/Gemfile +++ b/Gemfile @@ -70,7 +70,8 @@ gem 'rqrcode' gem 'ruby-saml-idp' gem 'sanitize-url' gem 'sassc-rails' # Use SCSS for stylesheets -gem 'sentry-raven' +gem 'sentry-rails' +gem 'sentry-ruby' gem 'sib-api-v3-sdk' gem 'skylight' gem 'smart_listing' diff --git a/Gemfile.lock b/Gemfile.lock index 9a3451400..7800cd8e0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -22,38 +22,38 @@ GEM specs: aasm (5.1.1) concurrent-ruby (~> 1.0) - actioncable (6.0.3.3) - actionpack (= 6.0.3.3) + actioncable (6.0.3.4) + actionpack (= 6.0.3.4) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.0.3.3) - actionpack (= 6.0.3.3) - activejob (= 6.0.3.3) - activerecord (= 6.0.3.3) - activestorage (= 6.0.3.3) - activesupport (= 6.0.3.3) + actionmailbox (6.0.3.4) + actionpack (= 6.0.3.4) + activejob (= 6.0.3.4) + activerecord (= 6.0.3.4) + activestorage (= 6.0.3.4) + activesupport (= 6.0.3.4) mail (>= 2.7.1) - actionmailer (6.0.3.3) - actionpack (= 6.0.3.3) - actionview (= 6.0.3.3) - activejob (= 6.0.3.3) + actionmailer (6.0.3.4) + actionpack (= 6.0.3.4) + actionview (= 6.0.3.4) + activejob (= 6.0.3.4) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.0.3.3) - actionview (= 6.0.3.3) - activesupport (= 6.0.3.3) + actionpack (6.0.3.4) + actionview (= 6.0.3.4) + activesupport (= 6.0.3.4) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.0.3.3) - actionpack (= 6.0.3.3) - activerecord (= 6.0.3.3) - activestorage (= 6.0.3.3) - activesupport (= 6.0.3.3) + actiontext (6.0.3.4) + actionpack (= 6.0.3.4) + activerecord (= 6.0.3.4) + activestorage (= 6.0.3.4) + activesupport (= 6.0.3.4) nokogiri (>= 1.8.5) - actionview (6.0.3.3) - activesupport (= 6.0.3.3) + actionview (6.0.3.4) + activesupport (= 6.0.3.4) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) @@ -68,25 +68,25 @@ GEM jsonapi-renderer (>= 0.1.1.beta1, < 0.3) active_storage_validations (0.9.0) rails (>= 5.2.0) - activejob (6.0.3.3) - activesupport (= 6.0.3.3) + activejob (6.0.3.4) + activesupport (= 6.0.3.4) globalid (>= 0.3.6) - activemodel (6.0.3.3) - activesupport (= 6.0.3.3) - activerecord (6.0.3.3) - activemodel (= 6.0.3.3) - activesupport (= 6.0.3.3) - activestorage (6.0.3.3) - actionpack (= 6.0.3.3) - activejob (= 6.0.3.3) - activerecord (= 6.0.3.3) + activemodel (6.0.3.4) + activesupport (= 6.0.3.4) + activerecord (6.0.3.4) + activemodel (= 6.0.3.4) + activesupport (= 6.0.3.4) + activestorage (6.0.3.4) + actionpack (= 6.0.3.4) + activejob (= 6.0.3.4) + activerecord (= 6.0.3.4) marcel (~> 0.3.1) activestorage-openstack (1.4.1) fog-openstack (~> 1.0) marcel mime-types rails (>= 5.2.2) - activesupport (6.0.3.3) + activesupport (6.0.3.4) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -182,7 +182,7 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.7) + concurrent-ruby (1.1.8) connection_pool (2.2.3) crack (0.4.4) crass (1.0.6) @@ -237,7 +237,7 @@ GEM http_parser.rb (~> 0.6.0) encryptor (3.0.0) equalizer (0.0.11) - erubi (1.9.0) + erubi (1.10.0) erubis (2.7.0) et-orbi (1.2.4) tzinfo @@ -248,8 +248,11 @@ GEM execjs (2.7.0) factory_bot (5.1.2) activesupport (>= 4.2.0) - faraday (1.0.1) + faraday (1.3.0) + faraday-net_http (~> 1.0) multipart-post (>= 1.2, < 3) + ruby2_keywords + faraday-net_http (1.0.1) ffi (1.13.1) ffi-geos (2.1.0) ffi (>= 1.0.0) @@ -356,7 +359,7 @@ GEM http_accept_language (2.1.1) http_parser.rb (0.6.0) httpclient (2.8.3) - i18n (1.8.5) + i18n (1.8.7) concurrent-ruby (~> 1.0) iban-tools (1.1.0) ice_nine (0.11.2) @@ -409,7 +412,7 @@ GEM railties (>= 4) request_store (~> 1.0) logstash-event (1.2.02) - loofah (2.7.0) + loofah (2.9.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) lumberjack (1.2.4) @@ -429,7 +432,7 @@ GEM mini_magick (4.11.0) mini_mime (1.0.2) mini_portile2 (2.5.0) - minitest (5.14.2) + minitest (5.14.3) momentjs-rails (2.20.1) railties (>= 3.1) multi_json (1.15.0) @@ -513,20 +516,20 @@ GEM rack rack-test (1.1.0) rack (>= 1.0, < 3) - rails (6.0.3.3) - actioncable (= 6.0.3.3) - actionmailbox (= 6.0.3.3) - actionmailer (= 6.0.3.3) - actionpack (= 6.0.3.3) - actiontext (= 6.0.3.3) - actionview (= 6.0.3.3) - activejob (= 6.0.3.3) - activemodel (= 6.0.3.3) - activerecord (= 6.0.3.3) - activestorage (= 6.0.3.3) - activesupport (= 6.0.3.3) + rails (6.0.3.4) + actioncable (= 6.0.3.4) + actionmailbox (= 6.0.3.4) + actionmailer (= 6.0.3.4) + actionpack (= 6.0.3.4) + actiontext (= 6.0.3.4) + actionview (= 6.0.3.4) + activejob (= 6.0.3.4) + activemodel (= 6.0.3.4) + activerecord (= 6.0.3.4) + activestorage (= 6.0.3.4) + activesupport (= 6.0.3.4) bundler (>= 1.3.0) - railties (= 6.0.3.3) + railties (= 6.0.3.4) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) @@ -545,14 +548,14 @@ GEM rails-i18n (6.0.0) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 7) - railties (6.0.3.3) - actionpack (= 6.0.3.3) - activesupport (= 6.0.3.3) + railties (6.0.3.4) + actionpack (= 6.0.3.4) + activesupport (= 6.0.3.4) method_source rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) rainbow (3.0.0) - rake (13.0.1) + rake (13.0.3) rake-progressbar (0.0.5) rb-fsevent (0.10.4) rb-inotify (0.10.1) @@ -646,7 +649,7 @@ GEM ruby-saml-idp (0.3.5) ruby-vips (2.0.17) ffi (~> 1.9) - ruby2_keywords (0.0.2) + ruby2_keywords (0.0.4) ruby_parser (3.15.0) sexp_processor (~> 4.9) rubyzip (2.3.0) @@ -671,8 +674,16 @@ GEM childprocess (>= 0.5, < 4.0) rubyzip (>= 1.2.2) semantic_range (2.3.0) - sentry-raven (3.1.0) + sentry-rails (4.1.6) + rails (>= 5.0) + sentry-ruby-core (~> 4.1.2) + sentry-ruby (4.1.5) + concurrent-ruby (~> 1.0, >= 1.0.2) faraday (>= 1.0) + sentry-ruby-core (= 4.1.5) + sentry-ruby-core (4.1.5) + concurrent-ruby + faraday sexp_processor (4.15.1) shellany (0.0.1) shoulda-matchers (4.4.1) @@ -718,14 +729,14 @@ GEM httpclient (>= 2.4) sysexits (1.2.0) temple (0.8.2) - thor (1.0.1) + thor (1.1.0) thread_safe (0.3.6) tilt (2.0.10) timecop (0.9.1) ttfunk (1.6.2.1) typhoeus (1.4.0) ethon (>= 0.9.0) - tzinfo (1.2.7) + tzinfo (1.2.9) thread_safe (~> 0.1) unf (0.1.4) unf_ext @@ -774,7 +785,7 @@ GEM nokogiri (~> 1.8) xray-rails (0.3.2) rails (>= 3.1.0) - zeitwerk (2.4.0) + zeitwerk (2.4.2) zip_tricks (5.3.1) zipline (1.2.1) rails (>= 3.2.1, < 6.1) @@ -884,7 +895,8 @@ DEPENDENCIES sanitize-url sassc-rails scss_lint - sentry-raven + sentry-rails + sentry-ruby shoulda-matchers sib-api-v3-sdk simple_xlsx_reader diff --git a/config/initializers/raven.rb b/config/initializers/raven.rb deleted file mode 100644 index f1c6fab27..000000000 --- a/config/initializers/raven.rb +++ /dev/null @@ -1,8 +0,0 @@ -if ENV['SENTRY_ENABLED'] == 'enabled' - require 'raven' - - Raven.configure do |config| - config.dsn = ENV['SENTRY_DSN_RAILS'] - config.environments = ['production', 'staging'] - end -end diff --git a/config/initializers/sentry.rb b/config/initializers/sentry.rb new file mode 100644 index 000000000..1b1ec6c86 --- /dev/null +++ b/config/initializers/sentry.rb @@ -0,0 +1,6 @@ +Sentry.init do |config| + config.dsn = ENV['SENTRY_ENABLED'] == 'enabled' ? ENV['SENTRY_DSN_RAILS'] : nil + config.send_default_pii = false + config.enabled_environments = ['production'] + config.breadcrumbs_logger = [:active_support_logger] +end