Skip including db attributes if connection is not in the payload

Author: solnic

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

@@ -74,18 +74,9 @@ def build_log_message(statement_name)
         def extract_db_config(payload)
           connection = payload[:connection]
 
-          if payload[:connection_id] && !connection
-            connection = ActiveRecord::Base.connection_pool.connections.find do |conn|
-              conn.object_id == payload[:connection_id]
-            end
-          end
-
           return unless connection
 
           extract_db_config_from_connection(connection)
-        rescue => e
-          Sentry.configuration.sdk_logger.debug("Failed to extract db config: #{e.message}")
-          nil
         end
 
         def add_db_config_attributes(attributes, db_config)

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

@@ -59,22 +59,24 @@
     end
   end
 
-  describe "database configuration extraction" do
-    it "includes database configuration in log attributes" do
-      Post.create!
+  if Rails.version.to_f >= 7.2
+    describe "database configuration extraction" do
+      it "includes database configuration in log attributes" do
+        Post.create!
 
-      Sentry.get_current_client.flush
+        Sentry.get_current_client.flush
 
-      log_event = sentry_logs.find do |log|
-        log[:body]&.include?("Database query") &&
-          log[:attributes]&.dig(:sql, :value)&.include?("INSERT")
-      end
+        log_event = sentry_logs.find do |log|
+          log[:body]&.include?("Database query") &&
+            log[:attributes]&.dig(:sql, :value)&.include?("INSERT")
+        end
 
-      expect(log_event).not_to be_nil
+        expect(log_event).not_to be_nil
 
-      attributes = log_event[:attributes]
-      expect(attributes[:db_system][:value]).to eq("sqlite3")
-      expect(attributes[:db_name][:value]).to eq("db")
+        attributes = log_event[:attributes]
+        expect(attributes[:db_system][:value]).to eq("sqlite3")
+        expect(attributes[:db_name][:value]).to eq("db")
+      end
     end
   end