newrelic_rpm 3.8.0.218 → 3.8.1.221

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

@@ -62,7 +62,7 @@ class ExconTest < Minitest::Test
     end
 
     tt = NewRelic::Agent.agent.transaction_sampler.last_sample
-    segment = tt.root_segment.called_segments.first
+    segment = tt.root_segment.called_segments.first.called_segments.first
     assert_equal("External/localhost/Excon/GET", segment.metric_name)
     assert_equal(target_url, segment.params[:uri])
   end

data/test/multiverse/suites/mongo/Envfile

@@ -1,10 +1,7 @@
-# Versions >= 1.10.0 are not supported at this time.
-if defined?(RUBY_ENGINE) && RUBY_ENGINE != 'jruby'
-  gemfile <<-RB
-    gem 'mongo', '1.10.0'
-    gem 'bson_ext', :platforms => :ruby
-  RB
-end
+gemfile <<-RB
+  gem 'mongo', '1.10.0'
+  gem 'bson_ext', :platforms => :ruby
+RB
 
 gemfile <<-RB
   gem 'mongo', '1.9.2'

data/test/multiverse/suites/mongo/helpers/mongo_operation_tests.rb

@@ -134,10 +134,31 @@ module MongoOperationTests
   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)
+    # The createIndexes command was added to the mongo server in version 2.6.
+    # As of version 1.10.0 of the Ruby driver, the driver will attempt to
+    # service a create_index call by first issuing a createIndexes command to
+    # the server. If the server replies that it doesn't know this command, the
+    # driver will re-issue an equivalent createIndex command.
+    #
+    # So, if we're running with version 1.10.0 or later of the driver, we expect
+    # some additional metrics to be recorded.
+    client_is_1_10_or_later = NewRelic::Agent::Datastores::Mongo.is_version_1_10_or_later?
+
+    create_index_metrics   = metrics_with_attributes(build_test_metrics(:createIndex))
+    create_indexes_metrics = metrics_with_attributes(build_test_metrics(:createIndexes))
+
+    if !client_is_1_10_or_later
+      metrics = create_index_metrics
+    elsif client_is_1_10_or_later && !server_is_2_6_or_later?
+      metrics = create_index_metrics.merge(create_indexes_metrics)
+      metrics['ActiveRecord/all'][:call_count] += 1
+      metrics['Datastore/allWeb'][:call_count] += 1
+      metrics['Datastore/all'][:call_count]    += 1
+    elsif client_is_1_10_or_later && server_is_2_6_or_later?
+      metrics = create_indexes_metrics
+    end
 
-    assert_metrics_recorded(expected)
+    assert_metrics_recorded(metrics)
   end
 
   def test_records_metrics_for_ensure_index
@@ -269,16 +290,18 @@ module MongoOperationTests
 
     in_transaction do
       @collection.insert(@tribble)
+
       segment = find_last_transaction_segment
     end
 
-    expected = { :database   => @database_name,
-                 :collection => @collection_name,
-                 :operation  => :insert}
+    expected = {
+      :database   => @database_name,
+      :collection => @collection_name,
+      :operation  => :insert
+    }
 
     result = segment.params[:statement]
-
-    assert_equal expected, result, "Expected result (#{result}) to be #{expected}"
+    assert_equal expected, result
   end
 
   def test_noticed_nosql_includes_operation
@@ -289,12 +312,25 @@ module MongoOperationTests
       segment = find_last_transaction_segment
     end
 
-    expected = :insert
+    query = segment.params[:statement]
+
+    assert_equal :insert, query[:operation]
+  end
+
+  def test_noticed_nosql_includes_update_operation
+    segment = nil
+
+    in_transaction do
+      updated = @tribble.dup
+      updated['name'] = 't-rex'
+      @collection.update(@tribble, updated)
+
+      segment = find_last_transaction_segment
+    end
 
     query = segment.params[:statement]
-    result = query[:operation]
 
-    assert_equal expected, result
+    assert_equal :update, query[:operation]
   end
 
   def test_noticed_nosql_includes_save_operation
@@ -305,12 +341,8 @@ module MongoOperationTests
       segment = find_last_transaction_segment
     end
 
-    expected = :save
-
     query = segment.params[:statement]
-    result = query[:operation]
-
-    assert_equal expected, result
+    assert_equal :save, query[:operation]
   end
 
   def test_noticed_nosql_includes_ensure_index_operation
@@ -377,6 +409,8 @@ module MongoOperationTests
 
     statement = segment.params[:statement]
 
+    refute statement.inspect.include?('$secret')
+
     assert_equal '?', statement[:selector]['password']
   end
 
@@ -438,4 +472,9 @@ module MongoOperationTests
     NewRelic::Agent.drop_buffered_data
   end
 
+  def server_is_2_6_or_later?
+    client = @collection.db.respond_to?(:client) && @collection.db.client
+    return false unless client
+    client.respond_to?(:max_wire_version) && client.max_wire_version >= 2
+  end
 end

data/test/multiverse/suites/mongo/helpers/mongo_server.rb

@@ -115,18 +115,20 @@ class MongoServer
   def startup_command
     pid_file = "--pidfilepath #{pid_path}"
     log_file = "--logpath #{log_path} "
+    fork     = "--fork"
 
     dbpath = "--dbpath #{db_path}"
     port_flag = "--port #{self.port}"
     small_mongo = "--oplogSize 128 --smallfiles"
-    repl_set = "--fork --replSet multiverse"
+    repl_set = "--replSet multiverse"
 
-    base = "#{port_flag} #{pid_file} #{log_file} #{small_mongo} #{dbpath}"
+    base = "#{port_flag} #{fork} #{pid_file} #{log_file} #{small_mongo} #{dbpath}"
 
+    mongod_path = ENV['MONGOD_PATH'] || 'mongod'
     if self.type == :single
-      "mongod #{base} &"
+      "#{mongod_path} #{base}"
     elsif self.type == :replica
-      "mongod #{repl_set} #{base} &"
+      "#{mongod_path} #{repl_set} #{base}"
     end
   end
 

data/test/multiverse/suites/rails/bad_instrumentation_test.rb

@@ -8,12 +8,12 @@ class BadInstrumentationController < ApplicationController
   include Rails.application.routes.url_helpers
 
   # This action is intended to simulate a chunk of instrumentation that pushes
-  # a TT scope, but then never pops it. Such a situation will break
+  # a traced method frame, but then never pops it. Such a situation will break
   # instrumentation of that request, but should not actually cause the request
   # to fail.
   # https://newrelic.atlassian.net/browse/RUBY-1158
   def failwhale
-    NewRelic::Agent.instance.stats_engine.push_scope('failwhale', Time.now)
+    NewRelic::Agent::TracedMethodStack.push_frame('failwhale', Time.now)
     render :text => 'everything went great'
   end
 end

data/test/multiverse/suites/rails/error_tracing_test.rb

@@ -136,7 +136,9 @@ class ErrorsWithoutSSCTest < ActionDispatch::IntegrationTest
       get '/error/controller_error'
     end
 
-    assert_errors_reported('this is an uncaught controller error', 20, 40, nil, 40)
+    assert_errors_reported('this is an uncaught controller error',
+                           NewRelic::Agent::ErrorCollector::MAX_ERROR_QUEUE_LENGTH,
+                           40, nil, 40)
   end
 
   def test_should_capture_manually_noticed_error

data/test/multiverse/suites/rails/request_statistics_test.rb

@@ -54,10 +54,10 @@ class RequestStatsTest < ActionDispatch::IntegrationTest
       post = $collector.calls_for('analytic_event_data').first
 
       refute_nil( post )
-      assert_kind_of Array, post.body
-      assert_kind_of Array, post.body.first
+      assert_kind_of Array, post.events
+      assert_kind_of Array, post.events.first
 
-      sample = post.body.first.first
+      sample = post.events.first.first
       assert_kind_of Hash, sample
 
       assert_equal 'Controller/request_stats/stats_action', sample['name']
@@ -80,10 +80,10 @@ class RequestStatsTest < ActionDispatch::IntegrationTest
       post = $collector.calls_for('analytic_event_data').first
 
       refute_nil( post )
-      assert_kind_of Array, post.body
-      assert_kind_of Array, post.body.first
+      assert_kind_of Array, post.events
+      assert_kind_of Array, post.events.first
 
-      sample = post.body.first.first
+      sample = post.events.first.first
       assert_kind_of Hash, sample
 
       assert_kind_of String, sample['nr.guid']
@@ -106,10 +106,10 @@ class RequestStatsTest < ActionDispatch::IntegrationTest
       post = $collector.calls_for('analytic_event_data').first
 
       refute_nil( post )
-      assert_kind_of Array, post.body
-      assert_kind_of Array, post.body.first
+      assert_kind_of Array, post.events
+      assert_kind_of Array, post.events.first
 
-      sample = post.body.first.first
+      sample = post.events.first.first
 
       assert_kind_of Hash, sample
       assert_kind_of String, sample['nr.guid']
@@ -126,10 +126,10 @@ class RequestStatsTest < ActionDispatch::IntegrationTest
       post = $collector.calls_for('analytic_event_data').first
 
       refute_nil( post )
-      assert_kind_of Array, post.body
-      assert_kind_of Array, post.body.first
+      assert_kind_of Array, post.events
+      assert_kind_of Array, post.events.first
 
-      sample = post.body.first[0]
+      sample = post.events.first[0]
       assert_kind_of Hash, sample
 
       assert_equal 'Controller/request_stats/stats_action_with_custom_params', sample['name']
@@ -139,7 +139,7 @@ class RequestStatsTest < ActionDispatch::IntegrationTest
         assert_not_includes(sample, key)
       end
 
-      custom_params = post.body.first[1]
+      custom_params = post.events.first[1]
       assert_equal 'blue', custom_params['color']
       assert_equal 'bar', custom_params['1']
       assert_false custom_params.has_key?('bad')
@@ -160,7 +160,7 @@ class RequestStatsTest < ActionDispatch::IntegrationTest
 
       post = $collector.calls_for('analytic_event_data').last
 
-      samples = post.body
+      samples = post.events
       assert_equal(5, samples.size)
       samples.each do |sample|
         # undo the extra layer of wrapping that the collector wants

data/test/multiverse/suites/rails/transaction_ignoring_test.rb

@@ -0,0 +1,45 @@
+# 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 'rails/test_help'
+require './app'
+require 'multiverse_helpers'
+require File.join(File.dirname(__FILE__), '..', '..', '..', 'agent_helper')
+require 'transaction_ignoring_test_cases'
+
+class TransactionIgnorerController < ApplicationController
+  include Rails.application.routes.url_helpers
+
+  def run_transaction
+    NewRelic::Agent.set_transaction_name(params[:txn_name])
+    NewRelic::Agent.notice_error(params[:error_msg]) if params[:error_msg]
+    NewRelic::Agent.instance.sql_sampler.notice_sql("select * from test",
+                                 "Database/test/select",
+                                 nil, 1.5) if params[:slow_sql]
+    render :text => 'some stuff'
+  end
+
+
+end
+
+class TransactionIgnoringTest < ActionDispatch::IntegrationTest
+
+  include MultiverseHelpers
+  include TransactionIgnoringTestCases
+
+  def trigger_transaction(txn_name)
+    get '/transaction_ignorer/run_transaction', :txn_name  => txn_name
+  end
+
+  def trigger_transaction_with_error(txn_name, error_msg)
+    get '/transaction_ignorer/run_transaction', :txn_name  => txn_name,
+                                                :error_msg => error_msg
+  end
+
+  def trigger_transaction_with_slow_sql(txn_name)
+    get '/transaction_ignorer/run_transaction', :txn_name  => txn_name,
+                                                :slow_sql  => 'true'
+  end
+
+end

data/test/multiverse/suites/sequel/sequel_instrumentation_test.rb

@@ -252,7 +252,7 @@ class NewRelic::Agent::Instrumentation::SequelInstrumentationTest < Minitest::Te
   # This is particular to sqlite plans currently. To abstract it up, we'd need to
   # be able to specify a flavor (e.g., :sqlite, :postgres, :mysql, etc.)
   def assert_segment_has_explain_plan( segment, msg=nil )
-    msg = build_message( msg, "Expected ? to have an explain plan", segment )
+    msg = "Expected #{segment.inspect} to have an explain plan"
     assert_block( msg ) { segment.params[:explain_plan].join =~ SQLITE_EXPLAIN_PLAN_COLUMNS_RE }
   end
 

data/test/new_relic/agent/agent/connect_test.rb

@@ -214,9 +214,9 @@ class NewRelic::Agent::Agent::ConnectTest < Minitest::Test
 
     rules = NewRelic::Agent.instance.transaction_rules
     assert_equal 2, rules.size
-    assert(rules.find{|r| r.match_expression == /88/ && r.replacement == '**' },
+    assert(rules.find{|r| r.match_expression == /88/i && r.replacement == '**' },
            "rule not found among #{rules}")
-    assert(rules.find{|r| r.match_expression == /xx/ && r.replacement == 'XX' },
+    assert(rules.find{|r| r.match_expression == /xx/i && r.replacement == 'XX' },
            "rule not found among #{rules}")
   ensure
     NewRelic::Agent.instance.instance_variable_set(:@transaction_rules,
@@ -236,9 +236,9 @@ class NewRelic::Agent::Agent::ConnectTest < Minitest::Test
 
     rules = @stats_engine.metric_rules
     assert_equal 2, rules.size
-    assert(rules.find{|r| r.match_expression == /77/ && r.replacement == '&&' },
+    assert(rules.find{|r| r.match_expression == /77/i && r.replacement == '&&' },
            "rule not found among #{rules}")
-    assert(rules.find{|r| r.match_expression == /yy/ && r.replacement == 'YY' },
+    assert(rules.find{|r| r.match_expression == /yy/i && r.replacement == 'YY' },
            "rule not found among #{rules}")
   ensure
     NewRelic::Agent.instance.instance_variable_set(:@metric_rules,

data/test/new_relic/agent/agent_logger_test.rb

@@ -287,6 +287,38 @@ class AgentLoggerTest < Minitest::Test
     assert_logged(host_regex, host_regex, host_regex)
   end
 
+  def test_should_not_evaluate_blocks_unless_log_level_is_high_enough
+    with_config(:log_level => 'warn') do
+      logger = create_basic_logger
+
+      block_was_evalutated = false
+      logger.info do
+        block_was_evalutated = true
+      end
+
+      refute block_was_evalutated
+    end
+  end
+
+  def test_should_allow_blocks_that_return_a_single_string
+    logger = create_basic_logger
+    logger.warn { "Surely you jest!" }
+
+    assert_logged(/WARN : Surely you jest!/)
+  end
+
+  def test_should_allow_blocks_that_return_an_array
+    logger = create_basic_logger
+    logger.warn do
+      ["You must be joking!", "You can't be serious!"]
+    end
+
+    assert_logged(
+      /WARN : You must be joking!/,
+      /WARN : You can't be serious!/
+    )
+  end
+
   #
   # Helpers
   #

data/test/new_relic/agent/configuration/manager_test.rb

@@ -245,16 +245,24 @@ module NewRelic::Agent::Configuration
     end
 
     def test_should_log_when_applying
-      expects_logging(:debug, anything, includes("asdf"))
-      @manager.apply_config(:test => "asdf")
+      log = with_array_logger(:debug) do
+        @manager.apply_config(:test => "asdf")
+      end
+
+      log_lines = log.array
+      assert_match(/DEBUG.*asdf/, log_lines[0])
     end
 
     def test_should_log_when_removing
       config = { :test => "asdf" }
       @manager.apply_config(config)
 
-      expects_logging(:debug, anything, Not(includes("asdf")))
-      @manager.remove_config(config)
+      log = with_array_logger(:debug) do
+        @manager.remove_config(config)
+      end
+
+      log_lines = log.array
+      refute_match(/DEBUG.*asdf/, log_lines[0])
     end
 
     def test_config_stack_index_for

data/test/new_relic/agent/configuration/yaml_source_test.rb

@@ -58,7 +58,7 @@ module NewRelic::Agent::Configuration
     end
 
     def test_should_log_if_no_file_is_found
-      expects_logging(:error, any_parameters)
+      expects_logging(:warn, any_parameters)
       source = YamlSource.new('no_such_file.yml', 'test')
     end
 
@@ -69,7 +69,7 @@ module NewRelic::Agent::Configuration
 
     def test_should_not_fail_to_log_missing_file_during_startup
       without_logger do
-        ::NewRelic::Agent::StartupLogger.any_instance.expects(:error)
+        ::NewRelic::Agent::StartupLogger.any_instance.expects(:warn)
         source = YamlSource.new('no_such_file.yml', 'test')
       end
     end

data/test/new_relic/agent/cross_app_monitor_test.rb

@@ -175,13 +175,17 @@ module NewRelic::Agent
 
       when_request_runs(for_id(''))
 
-      assert_metrics_recorded_exclusive([])
+      assert_metrics_recorded_exclusive(['transaction'])
     end
 
     def test_setting_response_headers_freezes_transaction_name
+      request = for_id(REQUEST_CROSS_APP_ID)
+      event_listener = NewRelic::Agent.instance.events
+      event_listener.notify(:before_call, request)
+
       in_transaction do
         assert !NewRelic::Agent::Transaction.current.name_frozen?
-        when_request_runs
+        event_listener.notify(:after_call, request, [200, @response, ''])
         assert NewRelic::Agent::Transaction.current.name_frozen?
       end
     end