-
Notifications
You must be signed in to change notification settings - Fork 375
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix ActiveRecord adapter name for Rails 7 #3051
Conversation
1de2f86
to
3d8f8a2
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
looks good to me, will let someone from apm-ruby team to approve as I still lack context
b2911b7
to
1f86fc9
Compare
Codecov Report
@@ Coverage Diff @@
## master #3051 +/- ##
=======================================
Coverage 98.12% 98.12%
=======================================
Files 1324 1324
Lines 74830 74847 +17
Branches 3404 3406 +2
=======================================
+ Hits 73425 73444 +19
+ Misses 1405 1403 -2
... and 6 files with indirect coverage changes 📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not that familiar with this adapter, but LGTM
@@ -587,6 +587,15 @@ elsif ruby_version?('2.3') | |||
appraise 'core-old' do | |||
gem 'dogstatsd-ruby', '~> 4' | |||
end | |||
|
|||
# Somehow, I failed to install this appraisal group with Ruby 2.4 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should this comment be here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I supposed we are going to deprecate old ruby and Rails 3.x in the future, so did not invest too much solving this, so I left a comment instead.
spec/datadog/tracing/contrib/active_record/configuration/resolver_spec.rb
Outdated
Show resolved
Hide resolved
…ver_spec.rb Co-authored-by: Marco Costa <marco.costa@datadoghq.com>
Closes #2924
What does this PR do?
Fix
Utils.adapter_name
for version > 7respond_to? :db_config
, instead of Rails version checkUtils.adapter_name
for settings spec to avoid flaky specRemove::ActiveRecord::ConnectionAdapters::ConnectionSpecification::Resolver
for connection resolver