Fix: Get connection from connection_pool instead of ActiveRecord::Bas…

…e.connection (#2278)
getsentry · Mar 20, 2024 · ffffce9 · ffffce9
1 parent 5612850
commit ffffce9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## Unreleased
+
+### Bug Fixes
+
+- Don't instantiate connection in `ActiveRecordSubscriber` ([#2278](https://github.com/getsentry/sentry-ruby/pull/2278))
+
 ## 5.17.1
 
 ### Bug Fixes

diff --git a/sentry-rails/lib/sentry/rails/tracing/active_record_subscriber.rb b/sentry-rails/lib/sentry/rails/tracing/active_record_subscriber.rb
@@ -21,8 +21,7 @@ def self.subscribe!
                 span.set_data(:connection_id, payload[:connection_id])
 
                 # we fallback to the base connection on rails < 6.0.0 since the payload doesn't have it
-                base_connection = ActiveRecord::Base.connection
-                connection ||= base_connection if payload[:connection_id] == base_connection.object_id
+                connection ||= ActiveRecord::Base.connection_pool.connections.find { |conn| conn.object_id == payload[:connection_id] }
               end
 
               next unless connection