fix(rails): support silenced ActiveRecord events

Author: solnic

sentry-rails/lib/sentry/rails/log_subscribers/active_record_subscriber.rb

@@ -30,6 +30,7 @@ class ActiveRecordSubscriber < Sentry::Rails::LogSubscriber
         # @param event [ActiveSupport::Notifications::Event] The SQL event
         def sql(event)
           return unless Sentry.initialized?
+          return if silenced?(event)
           return if EXCLUDED_NAMES.include?(event.payload[:name])
 
           sql = event.payload[:sql]
@@ -120,6 +121,10 @@ def add_db_config_attributes(attributes, db_config)
           attributes[:server_socket_address] = db_config[:socket] if db_config[:socket]
         end
 
+        def silenced?(event)
+          super || ActiveRecord::Base.logger.silencer
+        end
+
         if ::Rails.version.to_f >= 6.1
           def extract_db_config_from_connection(connection)
             if connection.pool.respond_to?(:db_config)

sentry-rails/spec/dummy/test_rails_app/config/application.rb

@@ -9,8 +9,6 @@
 require "action_cable/engine"
 require "active_storage/engine"
 
-ActiveRecord::Base.logger = Logger.new(nil)
-
 module Sentry
   module Rails
     module Test
@@ -83,7 +81,6 @@ def self.load_test_schema
         # This can be inherited and extended by subclasses
         def configure
           config.root = Test::Application.root_path
-          config.logger = ActiveSupport::Logger.new(nil)
           config.active_support.deprecation = :silence
           config.hosts = nil
           config.secret_key_base = "test 123"

sentry-rails/spec/sentry/rails/log_subscribers/active_record_subscriber_spec.rb

@@ -46,6 +46,16 @@
         expect(log_event[:attributes][:sql][:value]).to include("posts")
       end
 
+      it "does not log silenced logs" do
+        ActiveRecord::Base.logger.silence { Post.create! }
+
+        Sentry.get_current_client.flush
+
+        expect(
+          sentry_logs.find { |log| log[:body].include?("Database query: Post Create") }
+        ).to be(nil)
+      end
+
       context "when send_default_pii is enabled" do
         before do
           Sentry.configuration.send_default_pii = true