From a03119b64c259f8a4183e2833061240573760783 Mon Sep 17 00:00:00 2001 From: Iwaide Date: Wed, 20 Mar 2024 19:33:35 +0900 Subject: [PATCH 1/2] fix: Get connection from connection_pool --- .../lib/sentry/rails/tracing/active_record_subscriber.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sentry-rails/lib/sentry/rails/tracing/active_record_subscriber.rb b/sentry-rails/lib/sentry/rails/tracing/active_record_subscriber.rb index 3eeff2db6..ab25273a9 100644 --- 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 From 11a1f51db764257a10d208eaef7fc50fb2d3f02c Mon Sep 17 00:00:00 2001 From: Neel Shah Date: Wed, 20 Mar 2024 15:03:17 +0100 Subject: [PATCH 2/2] changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a68fd45c5..ece53ce61 100644 --- 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