-
Notifications
You must be signed in to change notification settings - Fork 372
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[active_record] decouple ActiveRecord and Sinatra integrations (#330)
* [active_record] use internal tracer instead of coupling the implementation to Sinatra * [active_record] update the app name for the service details * [active_record] add standalone test for ActiveRecord
- Loading branch information
Emanuele Palazzetti
committed
Jan 26, 2018
1 parent
77f52cc
commit daaf5fe
Showing
7 changed files
with
85 additions
and
7 deletions.
There are no files selected for viewing
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
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
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
require 'active_record' | ||
require 'mysql2' | ||
|
||
logger = Logger.new(STDOUT) | ||
logger.level = Logger::INFO | ||
|
||
# connecting to any kind of database is enough to test the integration | ||
ActiveRecord::Base.establish_connection('mysql2://root:root@127.0.0.1:53306/mysql') | ||
|
||
class ApplicationRecord < ActiveRecord::Base | ||
self.abstract_class = true | ||
end | ||
|
||
class Article < ApplicationRecord | ||
end | ||
|
||
# check if the migration has been executed | ||
# MySQL JDBC drivers require that, otherwise we get a | ||
# "Table '?' already exists" error | ||
begin | ||
Article.count() | ||
rescue ActiveRecord::StatementInvalid | ||
logger.info 'Executing database migrations' | ||
ActiveRecord::Schema.define(version: 20161003090450) do | ||
create_table 'articles', force: :cascade do |t| | ||
t.string 'title' | ||
t.datetime 'created_at', null: false | ||
t.datetime 'updated_at', null: false | ||
end | ||
end | ||
else | ||
logger.info 'Database already exists; nothing to do' | ||
end | ||
|
||
# force an access to prevent extra spans during tests | ||
Article.count() |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
require 'spec_helper' | ||
require 'ddtrace' | ||
|
||
require_relative 'app' | ||
|
||
RSpec.describe 'ActiveRecord instrumentation' do | ||
let(:tracer) { ::Datadog::Tracer.new(writer: FauxWriter.new) } | ||
|
||
before(:each) do | ||
Datadog.configure do |c| | ||
c.use :active_record, tracer: tracer | ||
end | ||
end | ||
|
||
it 'calls the instrumentation when is used standalone' do | ||
Article.count | ||
spans = tracer.writer.spans | ||
services = tracer.writer.services | ||
|
||
# expect service and trace is sent | ||
expect(spans.size).to eq(1) | ||
expect(services['mysql2']).to eq({'app'=>'active_record', 'app_type'=>'db'}) | ||
|
||
span = spans[0] | ||
expect(span.service).to eq('mysql2') | ||
expect(span.name).to eq('mysql2.query') | ||
expect(span.span_type).to eq('sql') | ||
expect(span.resource.strip).to eq('SELECT COUNT(*) FROM `articles`') | ||
expect(span.get_tag('active_record.db.vendor')).to eq('mysql2') | ||
expect(span.get_tag('active_record.db.name')).to eq('mysql') | ||
expect(span.get_tag('active_record.db.cached')).to eq(nil) | ||
expect(span.get_tag('out.host')).to eq('127.0.0.1') | ||
expect(span.get_tag('out.port')).to eq('53306') | ||
expect(span.get_tag('sql.query')).to eq(nil) | ||
end | ||
end |