Skip to content

Commit 9a71b79

Browse files
authored
Merge pull request #263 from instana/hm/mongodb
Support tracing MongoDb
2 parents 52908f5 + a52e16a commit 9a71b79

File tree

8 files changed

+139
-7
lines changed

8 files changed

+139
-7
lines changed

.circleci/config.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ executors:
1515
command: ["server", "/data"]
1616
- image: s12v/sns
1717
- image: softwaremill/elasticmq-native
18+
- image: circleci/mongo:5-focal-ram
1819
ruby_26:
1920
docker:
2021
- image: circleci/ruby:2.6-node
@@ -29,6 +30,7 @@ executors:
2930
command: ["server", "/data"]
3031
- image: s12v/sns
3132
- image: softwaremill/elasticmq-native
33+
- image: circleci/mongo:5-focal-ram
3234
ruby_27:
3335
docker:
3436
- image: circleci/ruby:2.7-node
@@ -43,6 +45,7 @@ executors:
4345
command: ["server", "/data"]
4446
- image: s12v/sns
4547
- image: softwaremill/elasticmq-native
48+
- image: circleci/mongo:5-focal-ram
4649
ruby_25_mysql2:
4750
docker:
4851
- image: circleci/ruby:2.5-node
@@ -280,6 +283,7 @@ workflows:
280283
- "./gemfiles/sidekiq_50.gemfile"
281284
- "./gemfiles/sinatra_14.gemfile"
282285
- "./gemfiles/shoryuken_50.gemfile"
286+
- "./gemfiles/mongo_216.gemfile"
283287
rails:
284288
jobs:
285289
- test_apprisal:

Appraisals

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ appraise 'cuba-30' do
1313
gem 'cuba', '>= 3.0', '< 4.0'
1414
end
1515

16-
appraise 'dalli-20' do
16+
appraise 'dalli-20' do
1717
gem 'dalli', '>= 2.0', '< 3.0'
1818
end
1919

@@ -69,7 +69,7 @@ appraise 'rails-60' do
6969
gem 'sqlite3', '~> 1.4'
7070
end
7171

72-
appraise 'redis-40' do
72+
appraise 'redis-40' do
7373
gem 'redis', '>= 4.0.0', '< 5.0'
7474
end
7575

@@ -87,7 +87,7 @@ appraise 'resque-122' do
8787
end
8888

8989
appraise 'resque-20' do
90-
gem 'resque', '>= 2.0', '< 3.0'
90+
gem 'resque', '>= 2.0', '< 3.0'
9191
end
9292

9393
appraise 'roda-20' do
@@ -118,3 +118,7 @@ end
118118
appraise 'sidekiq-50' do
119119
gem 'sidekiq', '>= 5.0', '< 6.0'
120120
end
121+
122+
appraise 'mongo-216' do
123+
gem 'mongo', '>= 2.16', '< 3'
124+
end

gemfiles/mongo_216.gemfile

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# This file was generated by Appraisal
2+
3+
# (c) Copyright IBM Corp. 2021
4+
# (c) Copyright Instana Inc. 2021
5+
6+
source "https://rubygems.org"
7+
8+
gem "rake"
9+
gem "minitest", "5.9.1"
10+
gem "minitest-reporters"
11+
gem "webmock"
12+
gem "puma"
13+
gem "rubocop", "~> 1.9"
14+
gem "rack-test"
15+
gem "simplecov", "~> 0.21.2"
16+
gem "mongo", ">= 2.16", "< 3"
17+
18+
gemspec path: "../"

lib/instana/activators/mongo.rb

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# (c) Copyright IBM Corp. 2021
2+
# (c) Copyright Instana Inc. 2021
3+
4+
module Instana
5+
module Activators
6+
class Mongo < Activator
7+
def can_instrument?
8+
defined?(::Mongo::Client) && defined?(::Mongo::Monitoring::Global)
9+
end
10+
11+
def instrument
12+
require 'instana/instrumentation/mongo'
13+
14+
::Mongo::Monitoring::Global.subscribe(
15+
::Mongo::Monitoring::COMMAND,
16+
::Instana::Mongo.new
17+
)
18+
19+
true
20+
end
21+
end
22+
end
23+
end

lib/instana/instrumentation/mongo.rb

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# (c) Copyright IBM Corp. 2021
2+
# (c) Copyright Instana Inc. 2021
3+
4+
module Instana
5+
class Mongo
6+
REMOVED_COMMAND_ELEMENTS = %w[lsid $db documents].freeze
7+
8+
def initialize
9+
@requests = {}
10+
end
11+
12+
def started(event)
13+
tags = {
14+
namespace: event.database_name,
15+
command: event.command_name,
16+
peer: {
17+
hostname: event.address.host,
18+
port: event.address.port
19+
},
20+
json: filter_statement(event.command)
21+
}
22+
23+
@requests[event.request_id] = ::Instana.tracer.log_async_entry(:mongo, {mongo: tags})
24+
end
25+
26+
def failed(event)
27+
span = @requests.delete(event.request_id)
28+
span.add_error(Exception.new(event.message))
29+
30+
::Instana.tracer.log_async_exit(:mongo, {}, span)
31+
end
32+
33+
def succeeded(event)
34+
span = @requests.delete(event.request_id)
35+
::Instana.tracer.log_async_exit(:mongo, {}, span)
36+
end
37+
38+
private
39+
40+
def filter_statement(command)
41+
command.delete_if { |k, _| REMOVED_COMMAND_ELEMENTS.include?(k) }
42+
43+
JSON.dump(command)
44+
end
45+
end
46+
end

lib/instana/tracing/span.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ class Span
77
:memcache, :'net-http', :rack, :render, :'rpc-client',
88
:'rpc-server', :'sidekiq-client', :'sidekiq-worker',
99
:redis, :'resque-client', :'resque-worker', :'graphql.server', :dynamodb, :s3, :sns, :sqs, :'aws.lambda.entry', :activejob, :log, :"mail.actionmailer",
10-
:"aws.lambda.invoke" ].freeze
10+
:"aws.lambda.invoke", :mongo ].freeze
1111
ENTRY_SPANS = [ :rack, :'resque-worker', :'rpc-server', :'sidekiq-worker', :'graphql.server', :sqs,
1212
:'aws.lambda.entry' ].freeze
1313
EXIT_SPANS = [ :activerecord, :excon, :'net-http', :'resque-client',
1414
:'rpc-client', :'sidekiq-client', :redis, :dynamodb, :s3, :sns, :sqs, :log, :"mail.actionmailer",
15-
:"aws.lambda.invoke" ].freeze
15+
:"aws.lambda.invoke", :mongo ].freeze
1616
HTTP_SPANS = [ :rack, :excon, :'net-http' ].freeze
1717

1818
attr_accessor :parent
@@ -120,7 +120,7 @@ def add_error(e)
120120
elsif @data[:n] == :activerecord
121121
@data[:data][:activerecord][:error] = e.message
122122
else
123-
log(:error, Time.now, { :message => e.message, :parameters => e.class.to_s })
123+
log(:error, Time.now, message: e.message, parameters: e.class.to_s)
124124
end
125125
e.instance_variable_set(:@instana_logged, true)
126126
end

lib/instana/tracing/span_context.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def trace_state_header
4747
state.unshift("in=#{trace_id_header};#{span_id_header}")
4848
end
4949

50-
state.reject { |v| v.nil? }.join(',')
50+
state.take(32).reject { |v| v.nil? }.join(',')
5151
end
5252

5353
def to_hash

test/instrumentation/mongo_test.rb

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# (c) Copyright IBM Corp. 2021
2+
# (c) Copyright Instana Inc. 2021
3+
4+
require 'test_helper'
5+
6+
class MongoTest < Minitest::Test
7+
def setup
8+
clear_all!
9+
end
10+
11+
def test_mongo
12+
Instana.tracer.start_or_continue_trace(:'mongo-test') do
13+
client = Mongo::Client.new('mongodb://127.0.0.1:27017/instana')
14+
client[:people].delete_many({ name: /$S*/ })
15+
client[:people].insert_many([{ _id: 1, name: "Stan" }])
16+
end
17+
18+
spans = ::Instana.processor.queued_spans
19+
delete_span, insert_span, = spans
20+
21+
delete_data = delete_span[:data][:mongo]
22+
insert_data = insert_span[:data][:mongo]
23+
24+
assert_equal delete_span[:n], :mongo
25+
assert_equal insert_span[:n], :mongo
26+
27+
assert_equal delete_data[:namespace], "instana"
28+
assert_equal delete_data[:command], "delete"
29+
assert_equal delete_data[:peer], {hostname: "127.0.0.1", port: 27017}
30+
assert delete_data[:json].include?("delete")
31+
32+
assert_equal insert_data[:namespace], "instana"
33+
assert_equal insert_data[:command], "insert"
34+
assert_equal insert_data[:peer], {hostname: "127.0.0.1", port: 27017}
35+
assert insert_data[:json].include?("insert")
36+
end
37+
end

0 commit comments

Comments
 (0)