newrelic_rpm 3.7.0.177 → 3.7.1.180

data/test/multiverse/lib/multiverse/suite.rb

@@ -107,6 +107,7 @@ module Multiverse
       return unless is_rbx?
 
       f.puts "gem 'rubysl', :platforms => [:rbx]" unless gemfile_text =~ /^\s*gem .rubysl./
+      f.puts "gem 'rubysl-json', :platforms => [:rbx]" unless gemfile_text =~ /^\s*gem .rubysl-json./
       f.puts "gem 'racc', :platforms => [:rbx]" unless gemfile_text =~ /^\s*gem .racc./
     end
 

data/test/multiverse/suites/curb/curb_test.rb

@@ -5,7 +5,6 @@
 require 'curb'
 
 require 'newrelic_rpm'
-require 'test/unit'
 require 'http_client_test_cases'
 require 'new_relic/agent/http_clients/curb_wrappers'
 

data/test/multiverse/suites/deferred_instrumentation/sinatra_test.rb

@@ -4,12 +4,14 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'sinatra', 'sinatra_test_cases'))
 require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'agent_helper'))
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'helpers', 'exceptions'))
 
 require 'newrelic_rpm'
 require 'sinatra'
 
 class DeferredSinatraTestApp < Sinatra::Base
   include NewRelic::Agent::Instrumentation::Rack
+  include NewRelic::TestHelpers::Exceptions
 
   configure do
     # display exceptions so we see what's going on
@@ -45,9 +47,8 @@ class DeferredSinatraTestApp < Sinatra::Base
     "I'm not a teapot."
   end
 
-  class Error < StandardError; end
-  error(Error) { halt 200, 'nothing happened' }
-  condition { raise Error }
+  error(NewRelic::TestHelpers::Exceptions::TestError) { halt 200, 'nothing happened' }
+  condition { raise NewRelic::TestHelpers::Exceptions::TestError }
   get('/error') { }
 
   condition do

data/test/multiverse/suites/excon/excon_test.rb

@@ -4,7 +4,6 @@
 
 require "excon"
 require "newrelic_rpm"
-require "test/unit"
 require "http_client_test_cases"
 
 require File.join(File.dirname(__FILE__), "..", "..", "..", "agent_helper")

data/test/multiverse/suites/httpclient/httpclient_test.rb

@@ -4,7 +4,6 @@
 
 require "httpclient"
 require "newrelic_rpm"
-require "test/unit"
 require "http_client_test_cases"
 
 require File.join(File.dirname(__FILE__), "..", "..", "..", "agent_helper")

data/test/multiverse/suites/mongo/Envfile

@@ -0,0 +1,66 @@
+gemfile <<-RB
+  gem 'mongo', '1.9.2'
+  gem 'bson_ext', :platforms => :ruby
+RB
+
+gemfile <<-RB
+  gem 'mongo', '~>1.8.6'
+  gem 'bson_ext', :platforms => :ruby
+RB
+
+# Newest unsupported version of the driver!
+gemfile <<-RB
+  gem 'mongo', '~>1.7.1'
+  gem 'bson_ext', :platforms => :ruby
+RB
+
+require 'timeout'
+require 'socket'
+
+ENV["MONGO_HOST"] = "localhost" unless ENV["MONGO_HOST"]
+ENV["MONGO_PORT"] = "27017" unless ENV["MONGO_PORT"]
+
+def mongo_running?
+  Timeout::timeout(1) do
+    begin
+      TCPSocket.new(ENV["MONGO_HOST"], ENV["MONGO_PORT"].to_i).close
+      true
+    rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH
+      false
+    end
+  end
+rescue Timeout::Error
+  false
+end
+
+def wait_for_mongo
+  Timeout::timeout(10) do
+    until mongo_running? do
+      sleep(0.1)
+    end
+  end
+end
+
+before_suite do
+  if mongo_running?
+    $started_mongo = false
+  else
+    puts "Starting Mongo for you, will shut down after tests"
+    `mkdir -p tmp`
+    `mongod --port #{ENV["MONGO_PORT"]} --pidfilepath tmp/mongo.pid &`
+    wait_for_mongo
+
+    $started_mongo = true
+    puts "Mongo Mongo Mongo!"
+  end
+end
+
+after_suite do
+  if $started_mongo
+    puts "Shutting down test initiated Mongo."
+    mongo_pid = `cat tmp/mongo.pid`
+    `kill -9 #{mongo_pid}`
+    `rm tmp/mongo.pid`
+    puts "Mongo Mongo Mongo!"
+  end
+end

data/test/multiverse/suites/mongo/config/newrelic.yml

@@ -0,0 +1,19 @@
+---
+development:
+  error_collector:
+    capture_source: true
+    enabled: true
+  apdex_t: 0.5
+  ssl: false
+  monitor_mode: true
+  license_key: bootstrap_newrelic_admin_license_key_000
+  developer_mode: false
+  app_name: test
+  host: 127.0.0.1
+  api_host: 127.0.0.1
+  transaction_tracer:
+    record_sql: obfuscated
+    enabled: true
+    stack_trace_threshold: 0.5
+    transaction_threshold: 1.0
+  capture_params: false

data/test/multiverse/suites/mongo/mongo_instrumentation_test.rb

@@ -0,0 +1,418 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
+require 'mongo'
+require 'newrelic_rpm'
+require 'new_relic/agent/datastores/mongo'
+require 'securerandom'
+require File.join(File.dirname(__FILE__), '..', '..', '..', 'agent_helper')
+
+if NewRelic::Agent::Datastores::Mongo.is_supported_version?
+  require File.join(File.dirname(__FILE__), '..', '..', '..', 'helpers', 'mongo_metric_builder')
+
+  class NewRelic::Agent::Instrumentation::MongoInstrumentationTest < MiniTest::Unit::TestCase
+    include Mongo
+    include ::NewRelic::TestHelpers::MongoMetricBuilder
+
+    def client
+      MongoClient.new(ENV["MONGO_HOST"], ENV["MONGO_PORT"].to_i)
+    end
+
+    def setup
+      @client = client
+      @database_name = 'multiverse'
+      @database = @client.db(@database_name)
+      @collection_name = 'tribbles'
+      @collection = @database.collection(@collection_name)
+
+      @tribble = {'name' => 'soterios johnson'}
+
+      NewRelic::Agent::Transaction.stubs(:recording_web_transaction?).returns(true)
+      NewRelic::Agent.drop_buffered_data
+    end
+
+    def teardown
+      NewRelic::Agent.drop_buffered_data
+    end
+
+    def test_records_metrics_for_insert
+      @collection.insert(@tribble)
+
+      metrics = build_test_metrics(:insert)
+      expected = metrics_with_attributes(metrics, { :call_count => 1 })
+
+      assert_metrics_recorded(expected)
+    end
+
+    def test_records_metrics_for_find
+      @collection.insert(@tribble)
+      NewRelic::Agent.drop_buffered_data
+
+      @collection.find(@tribble).to_a
+
+      metrics = build_test_metrics(:find)
+      expected = metrics_with_attributes(metrics, { :call_count => 1 })
+
+      assert_metrics_recorded(expected)
+    end
+
+    def test_records_metrics_for_find_one
+      @collection.insert(@tribble)
+      NewRelic::Agent.drop_buffered_data
+
+      @collection.find_one
+
+      metrics = build_test_metrics(:findOne)
+      expected = metrics_with_attributes(metrics, { :call_count => 1 })
+
+      assert_metrics_recorded(expected)
+    end
+
+    def test_records_metrics_for_remove
+      @collection.insert(@tribble)
+      NewRelic::Agent.drop_buffered_data
+
+      @collection.remove(@tribble).to_a
+
+      metrics = build_test_metrics(:remove)
+      expected = metrics_with_attributes(metrics, { :call_count => 1 })
+
+      assert_metrics_recorded(expected)
+    end
+
+    def test_records_metrics_for_save
+      @collection.save(@tribble)
+
+      metrics = build_test_metrics(:save)
+      expected = metrics_with_attributes(metrics, { :call_count => 1 })
+
+      assert_metrics_recorded(expected)
+    end
+
+    def test_save_does_not_record_insert
+      @collection.save(@tribble)
+
+      metrics = build_test_metrics(:save)
+      expected = metrics_with_attributes(metrics, { :call_count => 1 })
+
+      assert_metrics_not_recorded(['Datastore/operation/MongoDB/insert'])
+    end
+
+    def test_records_metrics_for_update
+      updated = @tribble.dup
+      updated['name'] = 'codemonkey'
+
+      @collection.update(@tribble, updated)
+
+      metrics = build_test_metrics(:update)
+      expected = metrics_with_attributes(metrics, { :call_count => 1 })
+
+      assert_metrics_recorded(expected)
+    end
+
+    def test_records_metrics_for_distinct
+      @collection.distinct('name')
+
+      metrics = build_test_metrics(:distinct)
+      expected = metrics_with_attributes(metrics, { :call_count => 1 })
+
+      assert_metrics_recorded(expected)
+    end
+
+    def test_records_metrics_for_count
+      @collection.count
+
+      metrics = build_test_metrics(:count)
+      expected = metrics_with_attributes(metrics, { :call_count => 1 })
+
+      assert_metrics_recorded(expected)
+    end
+
+    def test_records_metrics_for_group
+      @collection.group({:key => "name",
+                              :initial => {:count => 0},
+                              :reduce => "function(k,v) { v.count += 1; }" })
+
+      metrics = build_test_metrics(:group)
+      expected = metrics_with_attributes(metrics, { :call_count => 1 })
+
+      assert_metrics_recorded(expected)
+    end
+
+    def test_records_metrics_for_find_and_modify
+      updated = @tribble.dup
+      updated['name'] = 'codemonkey'
+      @collection.find_and_modify(:query => @tribble, :update => updated)
+
+      metrics = build_test_metrics(:findAndModify)
+      expected = metrics_with_attributes(metrics, { :call_count => 1 })
+
+      assert_metrics_recorded(expected)
+    end
+
+    def test_records_metrics_for_find_and_remove
+      @collection.find_and_modify(:query => @tribble, :remove =>true)
+
+      metrics = build_test_metrics(:findAndRemove)
+      expected = metrics_with_attributes(metrics, { :call_count => 1 })
+
+      assert_metrics_recorded(expected)
+    end
+
+    def test_records_metrics_for_create_index
+      @collection.create_index([[unique_field_name, Mongo::ASCENDING]])
+
+      metrics = build_test_metrics(:createIndex)
+      expected = metrics_with_attributes(metrics, { :call_count => 1 })
+
+      assert_metrics_recorded(expected)
+    end
+
+    def test_records_metrics_for_ensure_index
+      @collection.ensure_index({unique_field_name => Mongo::ASCENDING})
+
+      metrics = build_test_metrics(:ensureIndex)
+      expected = metrics_with_attributes(metrics, { :call_count => 1 })
+
+      assert_metrics_recorded(expected)
+    end
+
+    def test_ensure_index_does_not_record_insert
+      @collection.ensure_index({unique_field_name => Mongo::ASCENDING})
+
+      assert_metrics_not_recorded(['Datastore/operation/MongoDB/insert'])
+    end
+
+    def test_records_metrics_for_drop_index
+      name =  @collection.create_index([[unique_field_name, Mongo::ASCENDING]])
+      NewRelic::Agent.drop_buffered_data
+
+      @collection.drop_index(name)
+
+      metrics = build_test_metrics(:dropIndex)
+      expected = metrics_with_attributes(metrics, { :call_count => 1 })
+
+      assert_metrics_recorded(expected)
+    end
+
+    def test_records_metrics_for_drop_indexes
+      @collection.create_index([[unique_field_name, Mongo::ASCENDING]])
+      NewRelic::Agent.drop_buffered_data
+
+      @collection.drop_indexes
+
+      metrics = build_test_metrics(:dropIndexes)
+      expected = metrics_with_attributes(metrics, { :call_count => 1 })
+
+      assert_metrics_recorded(expected)
+    end
+
+    def test_records_metrics_for_reindex
+      @collection.create_index([[unique_field_name, Mongo::ASCENDING]])
+      NewRelic::Agent.drop_buffered_data
+
+      @database.command({ :reIndex => @collection_name })
+
+      metrics = build_test_metrics(:reIndex)
+      expected = metrics_with_attributes(metrics, { :call_count => 1 })
+
+      assert_metrics_recorded(expected)
+    end
+
+    def test_rename_collection
+      with_unique_collection do
+        @collection.rename("renamed_#{@collection_name}")
+
+        metrics = build_test_metrics(:renameCollection)
+        expected = metrics_with_attributes(metrics, { :call_count => 1 })
+
+        assert_metrics_recorded(expected)
+      end
+    end
+
+    def test_rename_collection_via_db
+      with_unique_collection do
+        @database.rename_collection(@collection_name, "renamed_#{@collection_name}")
+
+        metrics = build_test_metrics(:renameCollection)
+        expected = metrics_with_attributes(metrics, { :call_count => 1 })
+
+        assert_metrics_recorded(expected)
+      end
+    end
+
+    def test_drop_collection
+      with_unique_collection do
+        @database.drop_collection(@collection_name)
+
+        metrics = build_test_metrics(:drop)
+        expected = metrics_with_attributes(metrics, { :call_count => 1 })
+
+        assert_metrics_recorded(expected)
+      end
+    end
+
+    def test_collstats
+      @collection.stats
+
+      metrics = build_test_metrics(:collstats)
+      expected = metrics_with_attributes(metrics, { :call_count => 1 })
+
+      assert_metrics_recorded(expected)
+    end
+
+    def test_notices_nosql
+      segment = nil
+
+      in_transaction do
+        @collection.insert(@tribble)
+        segment = find_last_transaction_segment
+      end
+
+      expected = { :database   => 'multiverse',
+        :collection => 'tribbles',
+        :operation  => :insert}
+
+      result = segment.params[:statement]
+
+      assert_equal expected, result, "Expected result (#{result}) to be #{expected}"
+    end
+
+    def test_noticed_nosql_includes_operation
+      segment = nil
+
+      in_transaction do
+        @collection.insert(@tribble)
+        segment = find_last_transaction_segment
+      end
+
+      expected = :insert
+
+      query = segment.params[:statement]
+      result = query[:operation]
+
+      assert_equal expected, result
+    end
+
+    def test_noticed_nosql_includes_save_operation
+      segment = nil
+
+      in_transaction do
+        @collection.save(@tribble)
+        segment = find_last_transaction_segment
+      end
+
+      expected = :save
+
+      query = segment.params[:statement]
+      result = query[:operation]
+
+      assert_equal expected, result
+    end
+
+    def test_noticed_nosql_includes_ensure_index_operation
+      segment = nil
+
+      in_transaction do
+        @collection.ensure_index({unique_field_name => Mongo::ASCENDING})
+        segment = find_last_transaction_segment
+      end
+
+      expected = :ensureIndex
+
+      query = segment.params[:statement]
+      result = query[:operation]
+
+      assert_equal expected, result
+    end
+
+    def test_noticed_nosql_does_not_contain_documents
+      segment = nil
+
+      in_transaction do
+        @collection.insert({'name' => 'soterios johnson'})
+        segment = find_last_transaction_segment
+      end
+
+      statement = segment.params[:statement]
+
+      refute statement.keys.include?(:documents), "Noticed NoSQL should not include documents: #{statement}"
+    end
+
+    def test_noticed_nosql_does_not_contain_selector_values
+      @collection.insert({'password' => '$ecret'})
+      segment = nil
+
+      in_transaction do
+        @collection.remove({'password' => '$ecret'})
+        segment = find_last_transaction_segment
+      end
+
+      statement = segment.params[:statement]
+
+      assert_equal '?', statement[:selector]['password']
+    end
+
+    def test_web_requests_record_all_web_metric
+      NewRelic::Agent::Transaction.stubs(:recording_web_transaction?).returns(true)
+      @collection.insert(@tribble)
+
+      metrics = build_test_metrics(:insert)
+      expected = metrics_with_attributes(metrics, { :call_count => 1 })
+
+      assert_metrics_recorded(expected)
+    end
+
+    def test_web_requests_do_not_record_all_other_metric
+      NewRelic::Agent::Transaction.stubs(:recording_web_transaction?).returns(true)
+      @collection.insert(@tribble)
+
+      assert_metrics_not_recorded(['Datastore/allOther'])
+    end
+
+    def test_other_requests_record_all_other_metric
+      NewRelic::Agent::Transaction.stubs(:recording_web_transaction?).returns(false)
+      @collection.insert(@tribble)
+
+      metrics = build_test_metrics(:insert, :other)
+      expected = metrics_with_attributes(metrics, { :call_count => 1 })
+
+      assert_metrics_recorded(expected)
+    end
+
+    def test_other_requests_do_not_record_all_web_metric
+      NewRelic::Agent::Transaction.stubs(:recording_web_transaction?).returns(false)
+      @collection.insert(@tribble)
+
+      assert_metrics_not_recorded(['Datastore/allWeb'])
+    end
+
+    def with_unique_collection
+      original_collection_name = @collection_name
+      original_collection = @collection
+
+      @collection_name = "coll#{SecureRandom.hex(10)}"
+      @collection = @database.collection(@collection_name)
+
+      # Insert to make sure the collection actually exists...
+      @collection.insert({:junk => "data"})
+      NewRelic::Agent.drop_buffered_data
+
+      yield
+    ensure
+      @collection_name = original_collection_name
+      @collection = original_collection
+    end
+
+    def unique_field_name
+      "field#{SecureRandom.hex(10)}"
+    end
+  end
+
+  class NewRelic::Agent::Instrumentation::MongoConnectionTest < NewRelic::Agent::Instrumentation::MongoInstrumentationTest
+    def client
+      Mongo::Connection.new(ENV["MONGO_HOST"], ENV["MONGO_PORT"].to_i)
+    end
+  end
+end