newrelic_rpm 3.11.2.286 → 3.12.0.288

data/test/multiverse/suites/httpclient/Envfile

@@ -1,4 +1,8 @@
-httpclient_versions = %w(2.3.3 2.2.0)
+httpclient_versions = %w(2.6.0
+                         2.5.3
+                         2.4.0
+                         2.3.4
+                         2.2.0)
 
 httpclient_versions.each do |httpclient_version|
   gemfile <<-RB

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

@@ -68,8 +68,8 @@ class HTTPClientTest < Minitest::Test
         raise e unless e == test_exception
       end
 
-      last_segment = find_last_transaction_segment()
-      assert_equal("External/localhost/HTTPClient/GET", last_segment.metric_name)
+      last_node = find_last_transaction_node()
+      assert_equal("External/localhost/HTTPClient/GET", last_node.metric_name)
     end
   end
 end

data/test/multiverse/suites/memcached/Envfile

@@ -14,7 +14,7 @@ memcache_client_versions.each do |version|
     gem 'memcache-client', '~> #{version}', :require => 'memcache'
     # version lockdown for ZenTest that cooperates with all Rubies
     # and the build VMs
-    gem 'ZenTest', '3.4.2'
+    gem 'ZenTest', '3.4.2' unless RUBY_VERSION >= '2.2.0'
   RB
 end
 

data/test/multiverse/suites/mongo/Envfile

@@ -1,3 +1,10 @@
+if RUBY_VERSION >= '1.9.3'
+  gemfile <<-RB
+    gem 'mongo', '~>2.0.1'
+    gem 'bson_ext', :platforms => :ruby
+  RB
+end
+
 gemfile <<-RB
   gem 'mongo', '1.10.0'
   gem 'bson_ext', :platforms => :ruby
@@ -34,7 +41,7 @@ class PreExistingMongo
   end
 end
 
-$mongo = PreExistingMongo.new("localhost", 27017)
+$mongo = PreExistingMongo.new("127.0.0.1", 27017)
 
 def mongo_running?
   Timeout::timeout(1) do

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

@@ -305,12 +305,12 @@ module MongoOperationTests
   end
 
   def test_notices_nosql
-    segment = nil
+    node = nil
 
     in_transaction do
       @collection.insert(@tribble)
 
-      segment = find_last_transaction_segment
+      node = find_last_transaction_node
     end
 
     expected = {
@@ -319,114 +319,114 @@ module MongoOperationTests
       :operation  => :insert
     }
 
-    result = segment.params[:statement]
+    result = node.params[:statement]
     assert_equal expected, result
   end
 
   def test_noticed_nosql_includes_operation
-    segment = nil
+    node = nil
 
     in_transaction do
       @collection.insert(@tribble)
-      segment = find_last_transaction_segment
+      node = find_last_transaction_node
     end
 
-    query = segment.params[:statement]
+    query = node.params[:statement]
 
     assert_equal :insert, query[:operation]
   end
 
   def test_noticed_nosql_includes_update_operation
-    segment = nil
+    node = nil
 
     in_transaction do
       updated = @tribble.dup
       updated['name'] = 't-rex'
       @collection.update(@tribble, updated)
 
-      segment = find_last_transaction_segment
+      node = find_last_transaction_node
     end
 
-    query = segment.params[:statement]
+    query = node.params[:statement]
 
     assert_equal :update, query[:operation]
   end
 
   def test_noticed_nosql_includes_save_operation
-    segment = nil
+    node = nil
 
     in_transaction do
       @collection.save(@tribble)
-      segment = find_last_transaction_segment
+      node = find_last_transaction_node
     end
 
-    query = segment.params[:statement]
+    query = node.params[:statement]
     assert_equal :save, query[:operation]
   end
 
   def test_noticed_nosql_includes_ensure_index_operation
-    segment = nil
+    node = nil
 
     in_transaction do
       @collection.ensure_index([[unique_field_name, Mongo::ASCENDING]])
-      segment = find_last_transaction_segment
+      node = find_last_transaction_node
     end
 
-    assert_ensure_index_in_transaction_segment(segment)
+    assert_ensure_index_in_transaction_node(node)
   end
 
   def test_noticed_nosql_includes_ensure_index_operation_with_symbol
-    segment = nil
+    node = nil
 
     in_transaction do
       @collection.ensure_index(unique_field_name.to_sym)
-      segment = find_last_transaction_segment
+      node = find_last_transaction_node
     end
 
-    assert_ensure_index_in_transaction_segment(segment)
+    assert_ensure_index_in_transaction_node(node)
   end
 
   def test_noticed_nosql_includes_ensure_index_operation_with_string
-    segment = nil
+    node = nil
 
     in_transaction do
       @collection.ensure_index(unique_field_name)
-      segment = find_last_transaction_segment
+      node = find_last_transaction_node
     end
 
-    assert_ensure_index_in_transaction_segment(segment)
+    assert_ensure_index_in_transaction_node(node)
   end
 
-  def assert_ensure_index_in_transaction_segment(segment)
-    query = segment.params[:statement]
+  def assert_ensure_index_in_transaction_node(node)
+    query = node.params[:statement]
     result = query[:operation]
 
     assert_equal :ensureIndex, result
   end
 
   def test_noticed_nosql_does_not_contain_documents
-    segment = nil
+    node = nil
 
     in_transaction do
       @collection.insert({'name' => 'soterios johnson'})
-      segment = find_last_transaction_segment
+      node = find_last_transaction_node
     end
 
-    statement = segment.params[:statement]
+    statement = node.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
+    node = nil
 
     in_transaction do
       @collection.remove({'password' => '$ecret'})
-      segment = find_last_transaction_segment
+      node = find_last_transaction_node
     end
 
-    statement = segment.params[:statement]
+    statement = node.params[:statement]
 
     refute statement.inspect.include?('$secret')
 

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

@@ -7,31 +7,66 @@ require 'newrelic_rpm'
 require 'new_relic/agent/datastores/mongo'
 
 if !NewRelic::Agent::Datastores::Mongo.is_supported_version?
-  require File.join(File.dirname(__FILE__), 'helpers', 'mongo_server')
-
   class NewRelic::Agent::Instrumentation::MongoInstrumentationTest < Minitest::Test
     include Mongo
 
     def setup
-      @client = Mongo::Connection.new($mongo.host, $mongo.port)
       @database_name = "multiverse"
-      @database = @client.db(@database_name)
       @collection_name = "tribbles-#{SecureRandom.hex(16)}"
-      @collection = @database.collection(@collection_name)
-
       @tribble = {'name' => 'soterios johnson'}
 
+      setup_collection
+
       NewRelic::Agent.drop_buffered_data
     end
 
     def teardown
       NewRelic::Agent.drop_buffered_data
-      @database.drop_collection(@collection_name)
+      drop_collection
     end
 
     def test_records_metrics_for_insert
-      @collection.insert(@tribble)
+      insert_to_collection
       assert_metrics_not_recorded(["Datastore/all", "Datastore/allWeb", "Datastore/allOther"])
     end
+
+    # API changes between 1.x and 2.x that we need to work around to make
+    # sure that we're testing unsupported versions properly
+    module Mongo1xUnsupported
+      def setup_collection
+        client = Mongo::Connection.new($mongo.host, $mongo.port)
+        @database = client.db(@database_name)
+        @collection = @database.collection(@collection_name)
+      end
+
+      def drop_collection
+        @database.drop_collection(@collection_name)
+      end
+
+      def insert_to_collection
+        @collection.insert(@tribble)
+      end
+    end
+
+    module Mongo2xUnsupported
+      def setup_collection
+        client = Mongo::Client.new(["#{$mongo.host}:#{$mongo.port}"], :database => @database_name, :connect => :direct)
+        @collection = client[@collection_name]
+      end
+
+      def drop_collection
+        @collection.drop
+      end
+
+      def insert_to_collection
+        @collection.insert_one(@tribble)
+      end
+    end
+
+    if NewRelic::Agent::Datastores::Mongo.is_version2?
+      include Mongo2xUnsupported
+    else
+      include Mongo1xUnsupported
+    end
   end
 end

data/test/multiverse/suites/rack/rack_parameter_filtering_test.rb

@@ -24,7 +24,12 @@ if NewRelic::Agent::Instrumentation::RackHelpers.rack_version_supported?
           :file => Rack::Test::UploadedFile.new(__FILE__, 'text/plain')
         }
         post '/', params
-        assert_equal({"title" => "blah", "file" => "[FILE]"}, last_transaction_trace_request_params)
+
+        expected = {
+          "request.parameters.title" => "blah",
+          "request.parameters.file" => "[FILE]"
+        }
+        assert_equal expected, last_transaction_trace_request_params
       end
     end
 
@@ -32,8 +37,13 @@ if NewRelic::Agent::Instrumentation::RackHelpers.rack_version_supported?
       with_config(:capture_params => true) do
         params = {"name" => "name", "password" => "mypass"}
         post '/', params
-        assert_equal params, last_transaction_trace_request_params
+
+        expected = {
+          "request.parameters.name" => "name",
+          "request.parameters.password" => "mypass"
+        }
+        assert_equal expected, last_transaction_trace_request_params
       end
     end
   end
-end
+end

data/test/multiverse/suites/rails/Envfile

@@ -1,12 +1,12 @@
 if RUBY_VERSION >= '1.9.3'
   gemfile <<-RB
-    gem 'rails', '~>4.2.0'
+    gem 'rails', '~>4.2.1'
     gem 'haml', :require => false
     gem 'minitest', '5.2.3'
   RB
 
   gemfile <<-RB
-    gem 'rails', '~>4.1.7'
+    gem 'rails', '~>4.1.10'
     # Multiverse has an incompatibility with Minitest 5.3.0, so lock here for
     # now
     gem 'minitest', '5.2.3'
@@ -16,7 +16,7 @@ if RUBY_VERSION >= '1.9.3'
   RB
 
   gemfile <<-RB
-    gem 'rails', '~>4.0.11'
+    gem 'rails', '~>4.0.13'
     gem 'haml', '4.0.2'   # Getting load issues with haml 4.0.3
   RB
 end

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

@@ -61,7 +61,7 @@ class ErrorController < ApplicationController
   end
 
   def error_with_custom_params
-    NewRelic::Agent.add_custom_parameters(:texture => 'chunky')
+    NewRelic::Agent.add_custom_attributes(:texture => 'chunky')
     raise 'bad things'
   end
 
@@ -113,16 +113,17 @@ class ErrorsWithoutSSCTest < RailsMultiverseTest
 
     def test_should_capture_request_uri_and_params
       get '/error/controller_error?eat=static'
-      assert_equal('/error/controller_error', last_error.params[:request_uri])
+      assert_equal('/error/controller_error', attributes_for_single_error_posted("request_uri"))
 
-      expected_params = { 'eat' => 'static' }
+      expected_params = {
+        'request.parameters.eat' => 'static',
+        'httpResponseCode' => 500
+      }
 
-      if Rails::VERSION::MAJOR == 3
-        expected_params['action']     = 'controller_error'
-        expected_params['controller'] = 'error'
+      attributes = agent_attributes_for_single_error_posted
+      expected_params.each do |key, value|
+        assert_equal value, attributes[key]
       end
-
-      assert_equal(expected_params, last_error.params[:request_params])
     end
   end
 
@@ -181,16 +182,16 @@ class ErrorsWithoutSSCTest < RailsMultiverseTest
 
   def test_should_apply_parameter_filtering
     get '/error/controller_error?secret=shouldnotbecaptured&other=whatever'
-    params = last_error.params[:request_params]
-    assert_equal('[FILTERED]', params['secret'])
-    assert_equal('whatever', params['other'])
+    attributes = agent_attributes_for_single_error_posted
+    assert_equal('[FILTERED]', attributes['request.parameters.secret'])
+    assert_equal('whatever', attributes['request.parameters.other'])
   end
 
   def test_should_apply_parameter_filtering_for_non_standard_errors
     get '/error/exception_error?secret=shouldnotbecaptured&other=whatever'
-    params = last_error.params[:request_params]
-    assert_equal('[FILTERED]', params['secret'])
-    assert_equal('whatever', params['other'])
+    attributes = agent_attributes_for_single_error_posted
+    assert_equal('[FILTERED]', attributes['request.parameters.secret'])
+    assert_equal('whatever', attributes['request.parameters.other'])
   end
 
   def test_should_not_notice_errors_from_ignored_action
@@ -231,28 +232,47 @@ class ErrorsWithoutSSCTest < RailsMultiverseTest
     assert_error_reported_once('this is a server ignored error')
   end
 
-  # These really shouldn't be skipped for Rails 4, see RUBY-1242
-  if ::Rails::VERSION::MAJOR.to_i < 4
-    def test_captured_errors_should_include_custom_params
+  def test_captured_errors_should_include_custom_params
+    with_config(:'error_collector.attributes.enabled' => true) do
       get '/error/error_with_custom_params'
       assert_error_reported_once('bad things')
-      error = errors_with_message('bad things').first
-      custom_params = error.params[:custom_params]
-      assert_equal({:texture => 'chunky'}, custom_params)
+
+      attributes = user_attributes_for_single_error_posted
+      assert_equal({'texture' => 'chunky'}, attributes)
     end
+  end
 
-    def test_captured_errors_should_not_include_custom_params_if_config_says_no
-      with_config(:'error_collector.capture_attributes' => false) do
-        get '/error/error_with_custom_params'
-      end
+  def test_captured_errors_should_include_custom_params_with_legacy_setting
+    with_config(:'error_collector.capture_attributes' => true) do
+      get '/error/error_with_custom_params'
+      assert_error_reported_once('bad things')
+
+      attributes = user_attributes_for_single_error_posted
+      assert_equal({'texture' => 'chunky'}, attributes)
+    end
+  end
+
+  def test_captured_errors_should_not_include_custom_params_if_config_says_no
+    with_config(:'error_collector.attributes.enabled' => false) do
+      get '/error/error_with_custom_params'
       assert_error_reported_once('bad things')
-      error = errors_with_message('bad things').first
-      custom_params = error.params[:custom_params]
-      assert_equal({}, custom_params)
+
+      attributes = user_attributes_for_single_error_posted
+      assert_empty attributes
+    end
+  end
+
+  def test_captured_errors_should_not_include_custom_params_if_legacy_setting_says_no
+    with_config(:'error_collector.capture_attributes' => false) do
+      get '/error/error_with_custom_params'
+      assert_error_reported_once('bad things')
+
+      attributes = user_attributes_for_single_error_posted
+      assert_empty attributes
     end
   end
 
- protected
+  protected
 
   def errors_with_message(message)
     @error_collector.errors.select{|error| error.message == message}
@@ -280,10 +300,11 @@ end
 class ErrorsWithSSCTest < ErrorsWithoutSSCTest
   def setup_collector_mocks
     $collector.stub('connect', {
-      "listen_to_server_config" => true,
       "agent_run_id" => 1,
-      "error_collector.ignore_errors" => 'NewRelic::TestHelpers::Exceptions::IgnoredError,NewRelic::TestHelpers::Exceptions::ServerIgnoredError',
-      "error_collector.enabled" => true,
+      "agent_config" => {
+        "error_collector.ignore_errors" => 'NewRelic::TestHelpers::Exceptions::IgnoredError,NewRelic::TestHelpers::Exceptions::ServerIgnoredError',
+        "error_collector.enabled" => true,
+      },
       "collect_errors" => true
     }, 200)
   end