Capture Cockroach DB config in sentry-rails ActiveRecordSubscriber

getsentry · Nov 27, 2023 · 86a0ffc · 86a0ffc
1 parent 168b43a
commit 86a0ffc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -27,6 +27,7 @@
 - Respect custom `Delayed::Job.max_attempts` if it's defined [#2176](https:/getsentry/sentry-ruby/pull/2176)
 - Fixed a bug where `Net::HTTP` instrumentation won't work for some IPv6 addresses [#2180](https:/getsentry/sentry-ruby/pull/2180)
 - Allow non-string error message to be reported to sentry ([#2137](https:/getsentry/sentry-ruby/pull/2137))
+- `sentry-rails` will now capture Cockroach DB adapter config into spans data [#2182](https:/getsentry/sentry-ruby/pull/2182)
 
 ## 5.13.0
 

diff --git a/sentry-rails/lib/sentry/rails/tracing/active_record_subscriber.rb b/sentry-rails/lib/sentry/rails/tracing/active_record_subscriber.rb
@@ -26,11 +26,15 @@ def self.subscribe!
  end
 
  next unless connection
-
+ 
  db_config = if connection.pool.respond_to?(:db_config)
  connection.pool.db_config.configuration_hash
  elsif connection.pool.respond_to?(:spec)
  connection.pool.spec.config
+ # CockroachDB pool shows up as NullPool, but we can grab
+ # it's configuration from the instance variable.
+ elsif connection.instance_variable_defined?(:@config)
+ connection.instance_variable_get(:@config)
  end
 
  next unless db_config