newrelic_rpm 3.13.0.299 → 3.13.1.300

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

@@ -7,7 +7,8 @@ require 'newrelic_rpm'
 require 'new_relic/agent/datastores/mongo'
 require 'securerandom'
 
-if NewRelic::Agent::Datastores::Mongo.is_supported_version?
+if NewRelic::Agent::Datastores::Mongo.is_supported_version? &&
+    !NewRelic::Agent::Datastores::Mongo.is_monitoring_enabled?
   require File.join(File.dirname(__FILE__), '..', '..', '..', 'helpers', 'mongo_metric_builder')
   require File.join(File.dirname(__FILE__), 'helpers', 'mongo_server')
   require File.join(File.dirname(__FILE__), 'helpers', 'mongo_replica_set')

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

@@ -7,7 +7,8 @@ require 'newrelic_rpm'
 require 'new_relic/agent/datastores/mongo'
 require 'securerandom'
 
-if NewRelic::Agent::Datastores::Mongo.is_supported_version?
+if NewRelic::Agent::Datastores::Mongo.is_supported_version? &&
+    !NewRelic::Agent::Datastores::Mongo.is_monitoring_enabled?
   require File.join(File.dirname(__FILE__), '..', '..', '..', 'helpers', 'mongo_metric_builder')
   require File.join(File.dirname(__FILE__), 'helpers', 'mongo_server')
   require File.join(File.dirname(__FILE__), 'helpers', 'mongo_replica_set')

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

@@ -63,7 +63,7 @@ if !NewRelic::Agent::Datastores::Mongo.is_supported_version?
       end
     end
 
-    if NewRelic::Agent::Datastores::Mongo.is_version2?
+    if NewRelic::Agent::Datastores::Mongo.is_unsupported_2x?
       include Mongo2xUnsupported
     else
       include Mongo1xUnsupported

data/test/multiverse/suites/rails/rails3_app/app_rails3_plus.rb

@@ -47,6 +47,13 @@ if !defined?(MyApp)
   end
 
   if defined?(Sinatra)
+    module Sinatra
+      class Application < Base
+        # Override to not accidentally start the app in at_exit handler
+        set :run, Proc.new { false }
+      end
+    end
+
     class SinatraTestApp < Sinatra::Base
       get '/' do
         raise "Intentional error" if params["raise"]

data/test/multiverse/suites/sidekiq/Envfile

@@ -6,7 +6,7 @@ end
 if RUBY_VERSION >= '2.0.0' || (RUBY_PLATFORM == 'java')
   gemfile <<-RB
     gem 'json'
-    gem 'sidekiq', '~> 3.3.4'
+    gem 'sidekiq', '~> 3.4.2'
     gem 'rack'
 
     gem 'newrelic_rpm', :require => false, :path => File.expand_path('../../../../')

data/test/new_relic/agent/agent/start_test.rb

@@ -89,7 +89,6 @@ class NewRelic::Agent::Agent::StartTest < Minitest::Test
   private :at_exit
 
   def test_install_exit_handler_positive
-    NewRelic::LanguageSupport.expects(:using_engine?).with('rbx').returns(false)
     NewRelic::LanguageSupport.expects(:using_engine?).with('jruby').returns(false)
     self.expects(:sinatra_classic_app?).returns(false)
     # we are overriding at_exit above, to immediately return, so we can
@@ -110,15 +109,11 @@ class NewRelic::Agent::Agent::StartTest < Minitest::Test
 
   def test_install_exit_handler_weird_ruby
     with_config(:send_data_one_exit => true) do
-      NewRelic::LanguageSupport.expects(:using_engine?).with('rbx').returns(false)
       NewRelic::LanguageSupport.expects(:using_engine?).with('jruby').returns(false)
       self.expects(:sinatra_classic_app?).returns(true)
       install_exit_handler
-      NewRelic::LanguageSupport.expects(:using_engine?).with('rbx').returns(false)
       NewRelic::LanguageSupport.expects(:using_engine?).with('jruby').returns(true)
       install_exit_handler
-      NewRelic::LanguageSupport.expects(:using_engine?).with('rbx').returns(true)
-      install_exit_handler
     end
   end
 

data/test/new_relic/agent/database_test.rb

@@ -370,7 +370,7 @@ class NewRelic::Agent::DatabaseTest < Minitest::Test
     assert_equal('a' * (NewRelic::Agent::Database::MAX_QUERY_LENGTH - 3) + '...', truncated_query)
   end
 
-  INVALID_UTF8_STRING = (''.respond_to?(:force_encoding) ? "\x80".force_encoding('UTF-8') : "\x80")
+  INVALID_UTF8_STRING = (''.respond_to?(:force_encoding) ? "select \x80".force_encoding('UTF-8') : "select \x80")
 
   def test_capture_query_mis_encoded
     query = INVALID_UTF8_STRING
@@ -382,6 +382,13 @@ class NewRelic::Agent::DatabaseTest < Minitest::Test
     assert_equal(expected_query, captured)
   end
 
+  def test_parse_operation_from_query_mis_encoded
+    query = INVALID_UTF8_STRING
+    expected = "select"
+    parsed = NewRelic::Agent::Database.parse_operation_from_query(query)
+    assert_equal(expected, parsed)
+  end
+
   sql_parsing_tests = load_cross_agent_test('sql_parsing')
   sql_parsing_tests.each_with_index do |test_case, i|
     define_method("test_sql_parsing_#{i}") do

data/test/new_relic/agent/datastores/mongo/event_formatter_test.rb

@@ -0,0 +1,154 @@
+# 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 File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','..','test_helper'))
+require 'new_relic/agent/datastores/mongo/event_formatter'
+
+module NewRelic
+  module Agent
+    module Datastores
+      module Mongo
+        class EventFormatterTest < Minitest::Test
+
+          DATABASE = 'multiverse'.freeze
+
+          FIND_COMMAND = {
+            "find" => "tribbles",
+            "filter" => { "_id" => { "$gt" => 1 }, "name" => "joe" },
+            "sort" => { "_id" => 1 },
+            "limit" => 2,
+            "skip" => 2,
+            "comment" => "test",
+            "hint" => { "_id" => 1 },
+            "max" => { "_id" => 6 },
+            "maxScan" => 5000,
+            "maxTimeMS" => 6000,
+            "min" => { "_id" => 0 },
+            "readPreference" => { "mode" => "secondaryPreferred" },
+            "returnKey" => false,
+            "showRecordId" => false,
+            "snapshot" => false
+          }.freeze
+
+          INSERT_COMMAND = {
+            "insert" => "tribbles",
+            "ordered" => true,
+            "documents" => [{ :name => "test" }]
+          }.freeze
+
+          UPDATE_COMMAND = {
+            "update" => "tribbles",
+            "ordered" => true,
+            "updates" => [
+              {
+                :q => { :_id => { "$gt" => 1 }},
+                :u => { "$inc" => { :x => 1 }},
+                :multi => false,
+                :upsert => false
+              }
+            ]
+          }.freeze
+
+          DELETE_COMMAND = {
+            "delete" => "tribbles",
+            "ordered" => true,
+            "deletes" => [{ :q => { :_id => { "$gt" => 1 }}, :limit => 1 }]
+          }.freeze
+
+          if RUBY_VERSION > "1.9.3"
+
+            def test_doesnt_modify_incoming_statement
+              formatted = EventFormatter.format('find', DATABASE, FIND_COMMAND)
+              refute_same FIND_COMMAND, formatted
+            end
+
+            def test_can_disable_statement_capturing_queries
+              with_config(:'mongo.capture_queries' => false) do
+                formatted = EventFormatter.format('find', DATABASE, FIND_COMMAND)
+                assert_nil formatted
+              end
+            end
+
+            def test_event_formatter_obfuscates_by_default
+              expected = {
+                :operation => :find,
+                :database => DATABASE,
+                :collection => "tribbles",
+                "find" => "tribbles",
+                "filter" => { "_id" => { "$gt" => "?" }, "name" => "?" },
+                "sort" => { "_id" => 1 },
+                "limit" => 2,
+                "skip" => 2,
+                "comment" => "test",
+                "hint" => { "_id" => 1 },
+                "max" => { "_id" => 6 },
+                "maxScan" => 5000,
+                "maxTimeMS" => 6000,
+                "min" => { "_id" => 0 },
+                "readPreference" => { "mode" => "secondaryPreferred" },
+                "returnKey" => false,
+                "showRecordId" => false,
+                "snapshot" => false
+              }
+
+              formatted = EventFormatter.format(:find, DATABASE, FIND_COMMAND)
+              assert_equal expected, formatted
+            end
+
+            def test_event_formatter_raw_selectors
+              with_config(:'mongo.obfuscate_queries' => false) do
+                formatted = EventFormatter.format(:find, DATABASE, FIND_COMMAND)
+                expected = FIND_COMMAND.merge(
+                  :operation => :find,
+                  :database => DATABASE,
+                  :collection => 'tribbles'
+                )
+                assert_equal expected, formatted
+              end
+            end
+
+            def test_event_formatter_blacklists_inserts
+              expected = {
+                :operation => :insert,
+                :database => DATABASE,
+                :collection => "tribbles",
+                "insert" => "tribbles",
+                "ordered" => true
+              }
+
+              formatted = EventFormatter.format(:insert, DATABASE, INSERT_COMMAND)
+              assert_equal expected, formatted
+            end
+
+            def test_event_formatter_blacklists_updates
+              expected = {
+                :operation => :update,
+                :database => DATABASE,
+                :collection => "tribbles",
+                "update" => "tribbles",
+                "ordered" => true
+              }
+
+              formatted = EventFormatter.format(:update, DATABASE, UPDATE_COMMAND)
+              assert_equal expected, formatted
+            end
+
+            def test_event_formatter_blacklists_deletes
+              expected = {
+                :operation => :delete,
+                :database => DATABASE,
+                :collection => "tribbles",
+                "delete" => "tribbles",
+                "ordered" => true
+              }
+
+              formatted = EventFormatter.format(:delete, DATABASE, DELETE_COMMAND)
+              assert_equal expected, formatted
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/test/new_relic/agent/error_collector_test.rb

@@ -471,19 +471,6 @@ class NewRelic::Agent::ErrorCollectorTest < Minitest::Test
     assert_equal('STACK STACK STACK', @error_collector.extract_stack_trace(exception))
   end
 
-  def test_over_queue_limit_negative
-    refute @error_collector.over_queue_limit?(nil)
-  end
-
-  def test_over_queue_limit_positive
-    expects_logging(:warn, includes('The error reporting queue has reached 20'))
-    21.times do
-      @error_collector.notice_error("", {})
-    end
-
-    assert @error_collector.over_queue_limit?('hooray')
-  end
-
   def test_skip_notice_error_is_true_if_the_error_collector_is_disabled
     error = StandardError.new
     with_config(:'error_collector.enabled' => false) do

data/test/new_relic/agent/error_trace_aggregator_test.rb

@@ -0,0 +1,30 @@
+# 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 File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
+require File.expand_path(File.join(File.dirname(__FILE__),'..','data_container_tests'))
+
+module NewRelic
+  module Agent
+    class ErrorTraceAggregatorTest < Minitest::Test
+      def setup
+        @aggregator = ErrorTraceAggregator.new(20)
+      end
+
+      def test_over_queue_limit_negative
+        refute @aggregator.over_queue_limit?(nil)
+      end
+
+      def test_over_queue_limit_positive
+        expects_logging(:warn, includes('The error reporting queue has reached 20'))
+        21.times do
+          error = stub(:message => "", :is_internal => false)
+          @aggregator.add_to_error_queue(error)
+        end
+
+        assert @aggregator.over_queue_limit?('hooray')
+      end
+    end
+  end
+end

data/test/new_relic/agent/instrumentation/mongodb_command_subscriber_test.rb

@@ -0,0 +1,72 @@
+# 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 File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','test_helper'))
+require 'new_relic/agent/instrumentation/mongodb_command_subscriber'
+
+class NewRelic::Agent::Instrumentation::MongodbCommandSubscriberTest < Minitest::Test
+
+  if RUBY_VERSION > "1.9.3"
+    def setup
+      @started_event = mock('started event')
+      @started_event.stubs(:operation_id).returns(1)
+      @started_event.stubs(:command_name).returns('find')
+      @started_event.stubs(:database_name).returns('mongodb-test')
+      @started_event.stubs(:command).returns({ 'find' => 'users', 'filter' => { 'name' => 'test' }})
+
+      @succeeded_event = mock('succeeded event')
+      @succeeded_event.stubs(:operation_id).returns(1)
+      @succeeded_event.stubs(:duration).returns(2)
+
+      @subscriber = NewRelic::Agent::Instrumentation::MongodbCommandSubscriber.new
+
+      @stats_engine = NewRelic::Agent.instance.stats_engine
+      @stats_engine.clear_stats
+    end
+
+    def test_records_metrics_for_simple_find
+      simulate_query
+
+      metric_name = 'Datastore/statement/MongoDB/users/find'
+      assert_metrics_recorded(
+        metric_name => { :call_count => 1, :total_call_time => 2.0 }
+      )
+    end
+
+    def test_records_scoped_metrics
+      in_transaction('test_txn') { simulate_query }
+
+      metric_name = 'Datastore/statement/MongoDB/users/find'
+      assert_metrics_recorded(
+        [ metric_name, 'test_txn' ] => { :call_count => 1, :total_call_time => 2 }
+      )
+    end
+
+    def test_records_nothing_if_tracing_disabled
+      NewRelic::Agent.disable_all_tracing { simulate_query }
+      metric_name = 'Datastore/statement/MongoDB/users/find'
+      assert_metrics_not_recorded([ metric_name ])
+    end
+
+    def test_records_rollup_metrics
+      in_web_transaction { simulate_query }
+
+      assert_metrics_recorded(
+        'Datastore/operation/MongoDB/find' => { :call_count => 1, :total_call_time => 2 },
+        'Datastore/allWeb' => { :call_count => 1, :total_call_time => 2 },
+        'Datastore/all' => { :call_count => 1, :total_call_time => 2 }
+      )
+    end
+
+    def test_should_not_raise_due_to_an_exception_during_instrumentation_callback
+      @subscriber.stubs(:metrics).raises(StandardError)
+      simulate_query
+    end
+
+    def simulate_query
+      @subscriber.started(@started_event)
+      @subscriber.succeeded(@succeeded_event)
+    end
+  end
+end

data/test/new_relic/agent/stats_engine/metric_stats_test.rb

@@ -161,32 +161,34 @@ class NewRelic::Agent::MetricStatsTest < Minitest::Test
     ])
   end
 
-  def test_record_scoped_and_unscoped_metrics_is_thread_safe
-    threads = []
-    nthreads = 25
-    iterations = 100
-
-    nthreads.times do |tid|
-      threads << Thread.new do
-        iterations.times do
-          in_transaction('txn') do
-            @engine.tl_record_scoped_and_unscoped_metrics('m1', ['m3'], 1)
-            @engine.tl_record_scoped_and_unscoped_metrics('m2', ['m4'], 1)
+  unless NewRelic::LanguageSupport.rubinius? # Routine segfaults with rbx, see RUBY-1507
+    def test_record_scoped_and_unscoped_metrics_is_thread_safe
+      threads = []
+      nthreads = 25
+      iterations = 100
+
+      nthreads.times do |tid|
+        threads << Thread.new do
+          iterations.times do
+            in_transaction('txn') do
+              @engine.tl_record_scoped_and_unscoped_metrics('m1', ['m3'], 1)
+              @engine.tl_record_scoped_and_unscoped_metrics('m2', ['m4'], 1)
+            end
           end
         end
       end
+      threads.each { |t| t.join }
+
+      expected = { :call_count => nthreads * iterations }
+      assert_metrics_recorded(
+        'm1'          => expected,
+        'm2'          => expected,
+        ['m1', 'txn'] => expected,
+        ['m2', 'txn'] => expected,
+        'm3'          => expected,
+        'm4'          => expected
+      )
     end
-    threads.each { |t| t.join }
-
-    expected = { :call_count => nthreads * iterations }
-    assert_metrics_recorded(
-      'm1'          => expected,
-      'm2'          => expected,
-      ['m1', 'txn'] => expected,
-      ['m2', 'txn'] => expected,
-      'm3'          => expected,
-      'm4'          => expected
-    )
   end
 
   def test_record_scoped_and_unscoped_metrics_records_unscoped_if_not_in_txn

data/test/new_relic/agent/system_info_test.rb

@@ -31,8 +31,16 @@ class NewRelic::Agent::SystemInfoTest < Minitest::Test
         assert_equal(num_physical_cores    , info[:num_physical_cores    ])
         assert_equal(num_logical_processors, info[:num_logical_processors])
       end
+    elsif File.basename(file) =~ /malformed/
+      define_method("test_#{File.basename(file)}") do
+        cpuinfo = File.read(file)
+        info = @sysinfo.parse_cpuinfo(cpuinfo)
+        assert_equal(nil, info[:num_physical_package])
+        assert_equal(nil, info[:num_physical_cores])
+        assert_equal(nil, info[:num_logical_processors])
+      end
     else
-      fail "Bad filename: cross_agent_tests/proc_cpuinfo/#{file}"
+      fail "Bad filename: #{file}"
     end
   end