From 41c3a98d7dd8860a0decb1eeafc34922ab0b4fb8 Mon Sep 17 00:00:00 2001 From: Paul Chavard Date: Thu, 28 Jan 2021 14:49:22 +0100 Subject: [PATCH] Update Raven references to use Sentry --- app/controllers/api/v2/graphql_controller.rb | 2 +- app/controllers/application_controller.rb | 6 +++--- app/jobs/application_job.rb | 2 +- app/jobs/cron/auto_archive_procedure_job.rb | 2 +- app/mailers/application_mailer.rb | 3 +-- app/models/assign_to.rb | 2 +- spec/controllers/application_controller_spec.rb | 16 ++++++++-------- .../jobs/cron/auto_archive_procedure_job_spec.rb | 2 +- 8 files changed, 17 insertions(+), 18 deletions(-) diff --git a/app/controllers/api/v2/graphql_controller.rb b/app/controllers/api/v2/graphql_controller.rb index 34b564012..dafa1099c 100644 --- a/app/controllers/api/v2/graphql_controller.rb +++ b/app/controllers/api/v2/graphql_controller.rb @@ -61,7 +61,7 @@ class API::V2::GraphqlController < API::V2::BaseController def handle_error_in_production(exception) id = SecureRandom.uuid - Raven.capture_exception(exception, extra: { exception_id: id }) + Sentry.capture_exception(exception, extra: { exception_id: id }) render json: { errors: [ diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 7768815e7..103e5a4ae 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -10,7 +10,7 @@ class ApplicationController < ActionController::Base protect_from_forgery with: :exception, if: -> { !Rails.env.test? } before_action :set_current_roles before_action :load_navbar_left_pannel_partial_url - before_action :set_raven_context + before_action :set_sentry_user before_action :redirect_if_untrusted before_action :reject, if: -> { feature_enabled?(:maintenance_mode) } before_action :configure_permitted_parameters, if: :devise_controller? @@ -149,8 +149,8 @@ class ApplicationController < ActionController::Base end end - def set_raven_context - Raven.user_context(sentry_user) + def set_sentry_user + Sentry.set_user(sentry_user) end # private method called by rails fwk diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb index 1caa5b3ac..e858bae90 100644 --- a/app/jobs/application_job.rb +++ b/app/jobs/application_job.rb @@ -12,7 +12,7 @@ class ApplicationJob < ActiveJob::Base end def error(job, exception) - Raven.capture_exception(exception) + Sentry.capture_exception(exception) end def max_attempts diff --git a/app/jobs/cron/auto_archive_procedure_job.rb b/app/jobs/cron/auto_archive_procedure_job.rb index c3a1ceb39..9a998cf43 100644 --- a/app/jobs/cron/auto_archive_procedure_job.rb +++ b/app/jobs/cron/auto_archive_procedure_job.rb @@ -13,7 +13,7 @@ class Cron::AutoArchiveProcedureJob < Cron::CronJob procedure.close! rescue StandardError => e - Raven.capture_exception(e, extra: { procedure_id: procedure.id }) + Sentry.capture_exception(e, extra: { procedure_id: procedure.id }) end end end diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb index 8efa47136..dd5ed4084 100644 --- a/app/mailers/application_mailer.rb +++ b/app/mailers/application_mailer.rb @@ -25,8 +25,7 @@ class ApplicationMailer < ActionMailer::Base rescue StandardError => e # A problem occured when reading logo, maybe the logo is missing and we should clean the procedure to remove logo reference ? - Raven.extra_context(procedure_id: procedure.id) - Raven.capture_exception(e) + Sentry.capture_exception(e, extra: { procedure_id: procedure.id }) nil end end diff --git a/app/models/assign_to.rb b/app/models/assign_to.rb index 07ddde607..82146a7d5 100644 --- a/app/models/assign_to.rb +++ b/app/models/assign_to.rb @@ -35,7 +35,7 @@ class AssignTo < ApplicationRecord # a bug somewhere else that we need to fix. errors = procedure_presentation.errors - Raven.capture_message( + Sentry.capture_message( "Destroying invalid ProcedurePresentation", extra: { procedure_presentation: procedure_presentation.as_json } ) diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb index 506cb613f..0c4bfb67e 100644 --- a/spec/controllers/application_controller_spec.rb +++ b/spec/controllers/application_controller_spec.rb @@ -1,17 +1,17 @@ describe ApplicationController, type: :controller do - describe 'before_action: set_raven_context' do + describe 'before_action: set_sentry_user' do it 'is present' do before_actions = ApplicationController ._process_action_callbacks .filter { |process_action_callbacks| process_action_callbacks.kind == :before } .map(&:filter) - expect(before_actions).to include(:set_raven_context) + expect(before_actions).to include(:set_sentry_user) expect(before_actions).to include(:redirect_if_untrusted) end end - describe 'set_raven_context and append_info_to_payload' do + describe 'set_sentry_user and append_info_to_payload' do let(:current_user) { nil } let(:current_instructeur) { nil } let(:current_administrateur) { nil } @@ -24,15 +24,15 @@ describe ApplicationController, type: :controller do expect(@controller).to receive(:current_instructeur).and_return(current_instructeur) expect(@controller).to receive(:current_administrateur).and_return(current_administrateur) expect(@controller).to receive(:current_super_admin).and_return(current_super_admin) - allow(Raven).to receive(:user_context) + allow(Sentry).to receive(:set_user) - @controller.send(:set_raven_context) + @controller.send(:set_sentry_user) @controller.send(:append_info_to_payload, payload) end context 'when no one is logged in' do it do - expect(Raven).to have_received(:user_context) + expect(Sentry).to have_received(:set_user) .with({ id: 'Guest' }) end @@ -53,7 +53,7 @@ describe ApplicationController, type: :controller do let(:current_user) { create(:user) } it do - expect(Raven).to have_received(:user_context) + expect(Sentry).to have_received(:set_user) .with({ id: "User##{current_user.id}" }) end @@ -79,7 +79,7 @@ describe ApplicationController, type: :controller do let(:current_super_admin) { create(:super_admin) } it do - expect(Raven).to have_received(:user_context) + expect(Sentry).to have_received(:set_user) .with({ id: "User##{current_user.id}" }) end diff --git a/spec/jobs/cron/auto_archive_procedure_job_spec.rb b/spec/jobs/cron/auto_archive_procedure_job_spec.rb index 5d00582f4..3ce167b74 100644 --- a/spec/jobs/cron/auto_archive_procedure_job_spec.rb +++ b/spec/jobs/cron/auto_archive_procedure_job_spec.rb @@ -72,7 +72,7 @@ RSpec.describe Cron::AutoArchiveProcedureJob, type: :job do error = StandardError.new('nop') expect(buggy_procedure).to receive(:close!).and_raise(error) expect(job).to receive(:procedures_to_close).and_return([buggy_procedure, procedure_hier]) - expect(Raven).to receive(:capture_exception).with(error, extra: { procedure_id: buggy_procedure.id }) + expect(Sentry).to receive(:capture_exception).with(error, extra: { procedure_id: buggy_procedure.id }) subject end