[active_record] decouple ActiveRecord and Sinatra integrations #330
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ufoot
previously approved these changes
Jan 26, 2018
| @@ -57,22 +58,18 @@ def self.adapter_port | |||
| @adapter_port ||= Datadog::Contrib::Rails::Utils.adapter_port | |||
| end | |||
|
|
|||
| def self.tracer | |||
There was a problem hiding this comment.
So normally as this is quite internal, nobody was using this. I let you decide wether it's worth mentioning in the release notes, but I'd say no.
palazzem
commented
Jan 26, 2018
| end | ||
| end | ||
|
|
||
| it 'calls the instrumentation when is used standalone' do |
There was a problem hiding this comment.
this could be considered a regression test, since undoing the patch doesn't make it pass
hawknewton
reviewed
Jan 26, 2018
| def self.database_service | ||
| return @database_service if defined?(@database_service) | ||
|
|
||
| @database_service = get_option(:service_name) || adapter_name | ||
| tracer.set_service_info(@database_service, 'sinatra', Ext::AppTypes::DB) | ||
| get_option(:tracer).set_service_info(@database_service, 'sinatra', Ext::AppTypes::DB) |
There was a problem hiding this comment.
@hawknewton correct! removing it!
palazzem
force-pushed
the
palazzem/activerecord-sinatra-fix
branch
from
4e94e37
to
2be20c3
Compare
palazzem
commented
Jan 26, 2018
| expect(span.get_tag('sql.query')).to eq(nil) | ||
| end | ||
|
|
||
| it 'sends the right service information' do |
There was a problem hiding this comment.
@hawknewton added this integration test for the wrong service name you've discovered. Now it should be fine, thank you very much!
There was a problem hiding this comment.
@palazzem Awesome, thank you very much.
palazzem
force-pushed
the
palazzem/activerecord-sinatra-fix
branch
from
fc319c4
to
3816ea9
Compare
LotharSee
approved these changes
Jan 26, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Overview
Closes #328.
When ActiveRecord is used standalone it should work without expecting other integrations to be activated. The following must be a legit instrumentation: