traceview 3.7.0-java → 3.7.1-java

data/test/instrumentation/mongo_v2_view_test.rb

@@ -0,0 +1,435 @@
+# Copyright (c) 2015 AppNeta, Inc.
+# All rights reserved.
+
+require 'minitest_helper'
+
+unless ENV['TV_MONGO_SERVER']
+  ENV['TV_MONGO_SERVER'] = "127.0.0.1:27017"
+end
+
+if defined?(::Mongo::VERSION) && Mongo::VERSION >= '2.0.0'
+  describe "MongoCollectionView" do
+    before do
+      clear_all_traces
+
+      @client = Mongo::Client.new([ ENV['TV_MONGO_SERVER'] ], :database => "traceview-#{ENV['RACK_ENV']}")
+      if Mongo::VERSION < '2.2'
+        Mongo::Logger.logger.level = Logger::INFO
+      else
+        @client.logger.level = Logger::INFO
+      end
+
+      @db = @client.database
+
+      @collections = @db.collection_names
+      @testCollection = @client[:test_collection]
+      @testCollection.create unless @collections.include? "test_collection"
+
+      # These are standard entry/exit KVs that are passed up with all mongo operations
+      @entry_kvs = {
+        'Layer' => 'mongo',
+        'Label' => 'entry',
+        'Flavor' => 'mongodb',
+        'Database' => 'traceview-test',
+        'RemoteHost' => ENV['TV_MONGO_SERVER'] }
+
+      @exit_kvs = { 'Layer' => 'mongo', 'Label' => 'exit' }
+      @collect_backtraces = TraceView::Config[:mongo][:collect_backtraces]
+    end
+
+    after do
+      TraceView::Config[:mongo][:collect_backtraces] = @collect_backtraces
+    end
+
+    it "should trace find_one_and_delete" do
+      coll = @db[:test_collection]
+      r = nil
+
+      # Insert a doc to assure we get a result
+      doc = {"name" => "MyName", "type" => "MyType", "count" => 1, "info" => {"x" => 203, "y" => '102'}}
+      coll.insert_one(doc)
+      cv = coll.find({:name => "MyName"})
+
+      TraceView::API.start_trace('mongo_test', '', {}) do
+        r = cv.find_one_and_delete
+      end
+
+      traces = get_all_traces
+      traces.count.must_equal 4
+
+      validate_outer_layers(traces, 'mongo_test')
+      validate_event_keys(traces[1], @entry_kvs)
+      validate_event_keys(traces[2], @exit_kvs)
+
+      r.must_be_instance_of BSON::Document
+
+      traces[1]['Collection'].must_equal "test_collection"
+      traces[1].has_key?('Backtrace').must_equal TraceView::Config[:mongo][:collect_backtraces]
+      traces[1]['QueryOp'].must_equal "find_one_and_delete"
+      traces[1]['Query'].must_equal "{\"name\":\"MyName\"}"
+      traces[1].has_key?('Query').must_equal true
+    end
+
+    it "should trace find_one_and_update" do
+      coll = @db[:test_collection]
+      r = nil
+
+      # Insert a doc to assure we get a result
+      doc = {"name" => "MyName", "type" => "MyType", "count" => 1, "info" => {"x" => 203, "y" => '102'}}
+      coll.insert_one(doc)
+      cv = coll.find({:name => "MyName"})
+
+      TraceView::API.start_trace('mongo_test', '', {}) do
+        r = cv.find_one_and_update({ "$set" => { :name => 'test1' }}, :return_document => :after)
+      end
+
+      traces = get_all_traces
+      traces.count.must_equal 4
+
+      validate_outer_layers(traces, 'mongo_test')
+      validate_event_keys(traces[1], @entry_kvs)
+      validate_event_keys(traces[2], @exit_kvs)
+
+      r.must_be_instance_of BSON::Document
+
+      traces[1]['Collection'].must_equal "test_collection"
+      traces[1].has_key?('Backtrace').must_equal TraceView::Config[:mongo][:collect_backtraces]
+      traces[1]['QueryOp'].must_equal "find_one_and_update"
+      traces[1]['Query'].must_equal "{\"name\":\"MyName\"}"
+      traces[1].has_key?('Query').must_equal true
+    end
+
+    it "should trace update_one" do
+      coll = @db[:test_collection]
+      r = nil
+
+      # Insert a doc to assure we get a result
+      doc = {"name" => "MyName", "type" => "MyType", "count" => 1, "info" => {"x" => 203, "y" => '102'}}
+      coll.insert_one(doc)
+      cv = coll.find({:name => "MyName"})
+
+      TraceView::API.start_trace('mongo_test', '', {}) do
+        r = cv.update_one({ "$set" => { :name => 'test1' }}, :return_document => :after)
+      end
+
+      traces = get_all_traces
+      traces.count.must_equal 4
+
+      validate_outer_layers(traces, 'mongo_test')
+      validate_event_keys(traces[1], @entry_kvs)
+      validate_event_keys(traces[2], @exit_kvs)
+
+      r.class.ancestors.include?(Mongo::Operation::Result).must_equal true
+
+      traces[1]['Collection'].must_equal "test_collection"
+      traces[1].has_key?('Backtrace').must_equal TraceView::Config[:mongo][:collect_backtraces]
+      traces[1]['QueryOp'].must_equal "update_one"
+      traces[1]['Query'].must_equal "{\"name\":\"MyName\"}"
+      traces[1].has_key?('Query').must_equal true
+    end
+
+    it "should trace update_many" do
+      coll = @db[:test_collection]
+      r = nil
+
+      # Insert a doc to assure we get a result
+      doc = {"name" => "MyName", "type" => "MyType", "count" => 1, "info" => {"x" => 203, "y" => '102'}}
+      coll.insert_one(doc)
+      cv = coll.find({:name => "MyName"})
+
+      TraceView::API.start_trace('mongo_test', '', {}) do
+        r = cv.update_many({ "$set" => { :name => 'test1' }}, :return_document => :after)
+      end
+
+      traces = get_all_traces
+      traces.count.must_equal 4
+
+      validate_outer_layers(traces, 'mongo_test')
+      validate_event_keys(traces[1], @entry_kvs)
+      validate_event_keys(traces[2], @exit_kvs)
+
+      r.class.ancestors.include?(Mongo::Operation::Result).must_equal true
+
+      traces[1]['Collection'].must_equal "test_collection"
+      traces[1].has_key?('Backtrace').must_equal TraceView::Config[:mongo][:collect_backtraces]
+      traces[1]['QueryOp'].must_equal "update_many"
+      traces[1]['Query'].must_equal "{\"name\":\"MyName\"}"
+      traces[1].has_key?('Query').must_equal true
+    end
+
+    it "should trace collection delete_one" do
+      coll = @db[:test_collection]
+      r = nil
+
+      # Insert a doc to assure we get a result
+      doc = {"name" => "MyName", "type" => "MyType", "count" => 1, "info" => {"x" => 203, "y" => '102'}}
+      coll.insert_one(doc)
+      cv = coll.find({:name => "MyName"})
+
+      TraceView::API.start_trace('mongo_test', '', {}) do
+        r = cv.delete_one
+      end
+
+      traces = get_all_traces
+      traces.count.must_equal 4
+
+      validate_outer_layers(traces, 'mongo_test')
+      validate_event_keys(traces[1], @entry_kvs)
+      validate_event_keys(traces[2], @exit_kvs)
+
+      r.class.ancestors.include?(Mongo::Operation::Result).must_equal true
+
+      traces[1]['Collection'].must_equal "test_collection"
+      traces[1].has_key?('Backtrace').must_equal TraceView::Config[:mongo][:collect_backtraces]
+      traces[1]['QueryOp'].must_equal "delete_one"
+      traces[1]['Query'].must_equal "{\"name\":\"MyName\"}"
+      traces[1].has_key?('Query').must_equal true
+    end
+
+    it "should trace collection delete_many" do
+      coll = @db[:test_collection]
+      r = nil
+
+      # Insert a doc to assure we get a result
+      doc = {"name" => "MyName", "type" => "MyType", "count" => 1, "info" => {"x" => 203, "y" => '102'}}
+      coll.insert_one(doc)
+      cv = coll.find({ :name => 'MyName' })
+
+      TraceView::API.start_trace('mongo_test', '', {}) do
+        r = cv.delete_many
+      end
+
+      traces = get_all_traces
+      traces.count.must_equal 4
+
+      validate_outer_layers(traces, 'mongo_test')
+      validate_event_keys(traces[1], @entry_kvs)
+      validate_event_keys(traces[2], @exit_kvs)
+
+      r.class.ancestors.include?(Mongo::Operation::Result).must_equal true
+
+      traces[1]['Collection'].must_equal "test_collection"
+      traces[1].has_key?('Backtrace').must_equal TraceView::Config[:mongo][:collect_backtraces]
+      traces[1]['QueryOp'].must_equal "delete_many"
+      traces[1]['Query'].must_equal "{\"name\":\"MyName\"}"
+      traces[1].has_key?('Query').must_equal true
+    end
+
+    it "should trace collection view delete_one" do
+      coll = @db[:test_collection]
+      r = nil
+
+      # Insert a doc to assure we get a result
+      doc = {"name" => "MyName", "type" => "MyType", "count" => 1, "info" => {"x" => 203, "y" => '102'}}
+      coll.insert_one(doc)
+      cv = coll.find({ :name => 'MyName' })
+
+      TraceView::API.start_trace('mongo_test', '', {}) do
+        r = cv.delete_one
+      end
+
+      traces = get_all_traces
+      traces.count.must_equal 4
+
+      validate_outer_layers(traces, 'mongo_test')
+      validate_event_keys(traces[1], @entry_kvs)
+      validate_event_keys(traces[2], @exit_kvs)
+
+      r.class.ancestors.include?(Mongo::Operation::Result).must_equal true
+
+      traces[1]['Collection'].must_equal "test_collection"
+      traces[1].has_key?('Backtrace').must_equal TraceView::Config[:mongo][:collect_backtraces]
+      traces[1]['QueryOp'].must_equal "delete_one"
+      traces[1]['Query'].must_equal "{\"name\":\"MyName\"}"
+      traces[1].has_key?('Query').must_equal true
+    end
+
+    it "should trace collection view delete_many" do
+      coll = @db[:test_collection]
+      r = nil
+
+      # Insert a doc to assure we get a result
+      doc = {"name" => "MyName", "type" => "MyType", "count" => 1, "info" => {"x" => 203, "y" => '102'}}
+      coll.insert_one(doc)
+      cv = coll.find({ :name => 'MyName' })
+
+      TraceView::API.start_trace('mongo_test', '', {}) do
+        r = cv.delete_many
+      end
+
+      traces = get_all_traces
+      traces.count.must_equal 4
+
+      validate_outer_layers(traces, 'mongo_test')
+      validate_event_keys(traces[1], @entry_kvs)
+      validate_event_keys(traces[2], @exit_kvs)
+
+      r.class.ancestors.include?(Mongo::Operation::Result).must_equal true
+
+      traces[1]['Collection'].must_equal "test_collection"
+      traces[1].has_key?('Backtrace').must_equal TraceView::Config[:mongo][:collect_backtraces]
+      traces[1]['QueryOp'].must_equal "delete_many"
+      traces[1]['Query'].must_equal "{\"name\":\"MyName\"}"
+      traces[1].has_key?('Query').must_equal true
+    end
+
+    it "should trace replace_one" do
+      coll = @db[:test_collection]
+      r = nil
+
+      # Insert a doc to assure we get a result
+      doc = {"name" => "MyName", "type" => "MyType", "count" => 1, "info" => {"x" => 203, "y" => '102'}}
+      coll.insert_one(doc)
+      cv = coll.find({ :name => 'MyName' })
+
+      TraceView::API.start_trace('mongo_test', '', {}) do
+        r = cv.replace_one({ :name => 'test1' })
+      end
+
+      traces = get_all_traces
+      traces.count.must_equal 4
+
+      validate_outer_layers(traces, 'mongo_test')
+      validate_event_keys(traces[1], @entry_kvs)
+      validate_event_keys(traces[2], @exit_kvs)
+
+      r.class.ancestors.include?(Mongo::Operation::Result).must_equal true
+
+      traces[1]['Collection'].must_equal "test_collection"
+      traces[1].has_key?('Backtrace').must_equal TraceView::Config[:mongo][:collect_backtraces]
+      traces[1]['QueryOp'].must_equal "replace_one"
+      traces[1]['Query'].must_equal "{\"name\":\"MyName\"}"
+      traces[1].has_key?('Query').must_equal true
+    end
+
+    it "should trace count" do
+      coll = @db[:test_collection]
+      r = nil
+
+      cv = coll.find({ :name => 'MyName' })
+
+      TraceView::API.start_trace('mongo_test', '', {}) do
+        r = cv.count({ :name => 'MyName' })
+      end
+
+      traces = get_all_traces
+      traces.count.must_equal 4
+
+      validate_outer_layers(traces, 'mongo_test')
+      validate_event_keys(traces[1], @entry_kvs)
+      validate_event_keys(traces[2], @exit_kvs)
+
+      r.is_a?(Numeric).must_equal true
+
+      traces[1]['Collection'].must_equal "test_collection"
+      traces[1].has_key?('Backtrace').must_equal TraceView::Config[:mongo][:collect_backtraces]
+      traces[1]['QueryOp'].must_equal "count"
+      traces[1]['Query'].must_equal "{\"name\":\"MyName\"}"
+      traces[1].has_key?('Query').must_equal true
+    end
+
+    it "should trace distinct" do
+      coll = @db[:test_collection]
+      r = nil
+
+      cv = coll.find({ :name => 'MyName' })
+
+      TraceView::API.start_trace('mongo_test', '', {}) do
+        r = cv.distinct('name', { :name => 'MyName' })
+      end
+
+      traces = get_all_traces
+      traces.count.must_equal 4
+
+      validate_outer_layers(traces, 'mongo_test')
+      validate_event_keys(traces[1], @entry_kvs)
+      validate_event_keys(traces[2], @exit_kvs)
+
+      r.is_a?(Array).must_equal true
+
+      traces[1]['Collection'].must_equal "test_collection"
+      traces[1].has_key?('Backtrace').must_equal TraceView::Config[:mongo][:collect_backtraces]
+      traces[1]['QueryOp'].must_equal "distinct"
+      traces[1]['Query'].must_equal "{\"name\":\"MyName\"}"
+      traces[1].has_key?('Query').must_equal true
+    end
+
+    it "should trace aggregate" do
+      coll = @db[:test_collection]
+      r = nil
+
+      cv = coll.find({ :name => 'MyName' })
+
+      TraceView::API.start_trace('mongo_test', '', {}) do
+        r = cv.aggregate([ { "$group" => { "_id" => "$city", "tpop" => { "$sum" => "$pop" }}} ])
+      end
+
+      traces = get_all_traces
+      traces.count.must_equal 4
+
+      validate_outer_layers(traces, 'mongo_test')
+      validate_event_keys(traces[1], @entry_kvs)
+      validate_event_keys(traces[2], @exit_kvs)
+
+      r.must_be_instance_of Mongo::Collection::View::Aggregation
+
+      traces[1]['Collection'].must_equal "test_collection"
+      traces[1].has_key?('Backtrace').must_equal TraceView::Config[:mongo][:collect_backtraces]
+      traces[1]['QueryOp'].must_equal "aggregate"
+      traces[1].key?('Query').must_equal false
+    end
+
+    it "should trace map_reduce" do
+      coll = @db[:test_collection]
+      view = coll.find(:name => "MyName")
+
+      TraceView::API.start_trace('mongo_test', '', {}) do
+        map    = "function() { emit(this.name, 1); }"
+        reduce = "function(k, vals) { var sum = 0; for(var i in vals) sum += vals[i]; return sum; }"
+        view.map_reduce(map, reduce, { :out => "mr_results", :limit => 100, :read => :primary })
+      end
+
+      traces = get_all_traces
+      traces.count.must_equal 4
+
+      validate_outer_layers(traces, 'mongo_test')
+      validate_event_keys(traces[1], @entry_kvs)
+      validate_event_keys(traces[2], @exit_kvs)
+
+      traces[1]['Collection'].must_equal "test_collection"
+      traces[1].has_key?('Backtrace').must_equal TraceView::Config[:mongo][:collect_backtraces]
+      traces[1]['QueryOp'].must_equal "map_reduce"
+      traces[1]['Map_Function'].must_equal "function() { emit(this.name, 1); }"
+      traces[1]['Reduce_Function'].must_equal "function(k, vals) { var sum = 0; for(var i in vals) sum += vals[i]; return sum; }"
+      traces[1]['Limit'].must_equal 100
+    end
+
+    it "should obey :collect_backtraces setting when true" do
+      TraceView::Config[:mongo][:collect_backtraces] = true
+
+      coll = @db[:test_collection]
+
+      TraceView::API.start_trace('mongo_test', '', {}) do
+        doc = {"name" => "MyName", "type" => "MyType", "count" => 1, "info" => {"x" => 203, "y" => '102'}}
+        coll.insert_one(doc)
+      end
+
+      traces = get_all_traces
+      layer_has_key(traces, 'mongo', 'Backtrace')
+    end
+
+    it "should obey :collect_backtraces setting when false" do
+      TraceView::Config[:mongo][:collect_backtraces] = false
+
+      coll = @db[:test_collection]
+
+      TraceView::API.start_trace('mongo_test', '', {}) do
+        doc = {"name" => "MyName", "type" => "MyType", "count" => 1, "info" => {"x" => 203, "y" => '102'}}
+        coll.insert_one(doc)
+      end
+
+      traces = get_all_traces
+      layer_doesnt_have_key(traces, 'mongo', 'Backtrace')
+    end
+  end
+end

data/test/instrumentation/moped_test.rb

@@ -25,8 +25,7 @@ if RUBY_VERSION >= '1.9.3'
         'Label' => 'entry',
         'Flavor' => 'mongodb',
         'Database' => 'moped_test',
-        'RemoteHost' => ENV['TV_MONGO_SERVER'].split(':')[0],
-        'RemotePort' => ENV['TV_MONGO_SERVER'].split(':')[1].to_i }
+        'RemoteHost' => ENV['TV_MONGO_SERVER'] }
 
       @exit_kvs = { 'Layer' => 'mongo', 'Label' => 'exit' }
       @collect_backtraces = TraceView::Config[:moped][:collect_backtraces]

data/test/minitest_helper.rb

@@ -124,7 +124,7 @@ end
 def validate_event_keys(event, kvs)
   kvs.each do |k, v|
     assert_equal true, event.key?(k), "#{k} is missing"
-    assert event[k] == v, "#{k} != #{v}"
+    assert event[k] == v, "#{k} != #{v} (#{event[k]})"
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: traceview
 version: !ruby/object:Gem::Version
-  version: 3.7.0
+  version: 3.7.1
 platform: java
 authors:
 - Peter Giacomo Lombardo
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-03-16 00:00:00.000000000 Z
+date: 2016-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -152,6 +152,7 @@ files:
 - lib/traceview/inst/memcache.rb
 - lib/traceview/inst/memcached.rb
 - lib/traceview/inst/mongo.rb
+- lib/traceview/inst/mongo2.rb
 - lib/traceview/inst/moped.rb
 - lib/traceview/inst/rack.rb
 - lib/traceview/inst/redis.rb
@@ -196,7 +197,10 @@ files:
 - test/instrumentation/httpclient_test.rb
 - test/instrumentation/memcache_test.rb
 - test/instrumentation/memcached_test.rb
-- test/instrumentation/mongo_test.rb
+- test/instrumentation/mongo_v1_test.rb
+- test/instrumentation/mongo_v2_index_test.rb
+- test/instrumentation/mongo_v2_test.rb
+- test/instrumentation/mongo_v2_view_test.rb
 - test/instrumentation/moped_test.rb
 - test/instrumentation/rack_test.rb
 - test/instrumentation/redis_hashes_test.rb
@@ -294,11 +298,13 @@ test_files:
 - test/instrumentation/redis_sortedsets_test.rb
 - test/instrumentation/rack_test.rb
 - test/instrumentation/sidekiq-client_test.rb
+- test/instrumentation/mongo_v2_index_test.rb
 - test/instrumentation/cassandra_test.rb
 - test/instrumentation/redis_strings_test.rb
 - test/instrumentation/typhoeus_test.rb
 - test/instrumentation/sequel_mysql2_test.rb
 - test/instrumentation/bunny_consumer_test.rb
+- test/instrumentation/mongo_v2_view_test.rb
 - test/instrumentation/sidekiq-worker_test.rb
 - test/instrumentation/redis_misc_test.rb
 - test/instrumentation/faraday_test.rb
@@ -307,12 +313,13 @@ test_files:
 - test/instrumentation/memcache_test.rb
 - test/instrumentation/resque_test.rb
 - test/instrumentation/redis_hashes_test.rb
-- test/instrumentation/mongo_test.rb
 - test/instrumentation/redis_lists_test.rb
+- test/instrumentation/mongo_v2_test.rb
 - test/instrumentation/curb_test.rb
 - test/instrumentation/memcached_test.rb
 - test/instrumentation/em_http_request_test.rb
 - test/instrumentation/rest-client_test.rb
+- test/instrumentation/mongo_v1_test.rb
 - test/reporter/reporter_test.rb
 - test/models/widget.rb
 - test/profiling/method_profiling_test.rb