diff --git a/Gemfile b/Gemfile index ce2324e1b..66d7cbac3 100644 --- a/Gemfile +++ b/Gemfile @@ -38,8 +38,6 @@ gem "useragent", bc: "useragent" # Telemetry, logging, and operations gem "mission_control-jobs" -gem "sentry-ruby" -gem "sentry-rails" gem "yabeda" gem "yabeda-actioncable" gem "yabeda-activejob", github: "basecamp/yabeda-activejob", branch: "bulk-and-scheduled-jobs" diff --git a/Gemfile.lock b/Gemfile.lock index 0996ac69b..7f0fd21f4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -433,12 +433,6 @@ GEM rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 4.0) websocket (~> 1.0) - sentry-rails (6.1.2) - railties (>= 5.2.0) - sentry-ruby (~> 6.1.2) - sentry-ruby (6.1.2) - bigdecimal - concurrent-ruby (~> 1.0, >= 1.0.2) sniffer (0.5.0) anyway_config (>= 1.0) dry-initializer (~> 3) @@ -583,8 +577,6 @@ DEPENDENCIES rqrcode rubocop-rails-omakase selenium-webdriver - sentry-rails - sentry-ruby solid_cable (>= 3.0) solid_cache (~> 1.0) solid_queue (~> 1.2) diff --git a/Gemfile.saas b/Gemfile.saas index 779c8c419..250038269 100644 --- a/Gemfile.saas +++ b/Gemfile.saas @@ -8,4 +8,6 @@ gem "activeresource", require: "active_resource" gem "queenbee", bc: "queenbee-plugin" gem "fizzy-saas", bc: "fizzy-saas" gem "rails_structured_logging", bc: "rails-structured-logging" +gem "sentry-ruby" +gem "sentry-rails" diff --git a/app/controllers/concerns/request_forgery_protection.rb b/app/controllers/concerns/request_forgery_protection.rb index f11ef8ad0..056832a34 100644 --- a/app/controllers/concerns/request_forgery_protection.rb +++ b/app/controllers/concerns/request_forgery_protection.rb @@ -43,7 +43,7 @@ module RequestForgeryProtection Rails.logger.info "CSRF protection check: " + info.map { it.join(" ") }.join(", ") if (origin && token) != sec_fetch_site - Sentry.capture_message "CSRF protection mismatch", level: :info, extra: { info: info } + Sentry.try :capture_message, "CSRF protection mismatch", level: :info, extra: { info: info } end end end diff --git a/config/initializers/sentry.rb b/config/initializers/sentry.rb deleted file mode 100644 index 11f352c97..000000000 --- a/config/initializers/sentry.rb +++ /dev/null @@ -1,9 +0,0 @@ -if !Rails.env.local? && ENV["SKIP_TELEMETRY"].blank? - Sentry.init do |config| - config.dsn = ENV["SENTRY_DSN"] - config.breadcrumbs_logger = %i[ active_support_logger http_logger ] - config.send_default_pii = false - config.release = ENV["GIT_REVISION"] - config.excluded_exceptions += [ "ActiveRecord::ConcurrentMigrationError" ] - end -end