newrelic_rpm 3.14.3.313 → 3.15.0.314

data/test/multiverse/suites/active_record/Envfile

@@ -1,14 +1,25 @@
 boilerplate_gems = <<-BOILERPLATE
   gem 'rack'
   gem 'rake'
+  gem 'i18n', '< 0.7.0' if RUBY_VERSION < '1.9.3' # i18n >= 0.7.0 only works on Ruby 1.9.3 and newer
+
   if RUBY_PLATFORM == 'java'
     gem "activerecord-jdbcmysql-adapter"
-  else
+  elsif RUBY_VERSION <= '1.9.3'
     gem 'mysql'
+  else
+    gem 'mysql2', '~> 0.3.20'
   end
-  gem 'i18n', '< 0.7.0' if RUBY_VERSION < '1.9.3' # i18n >= 0.7.0 only works on Ruby 1.9.3 and newer
 BOILERPLATE
 
+if RUBY_VERSION >= '2.2.2' && RUBY_PLATFORM != 'java'
+  gemfile <<-RB
+    gem 'activerecord', '~> 5.0.0beta2'
+    gem 'minitest', '~> 5.2.3'
+    #{boilerplate_gems}
+  RB
+end
+
 if RUBY_VERSION >= '1.9.3'
   gemfile <<-RB
     gem 'activerecord', '~> 4.2.0'
@@ -45,6 +56,7 @@ if RUBY_VERSION < '2.2.0'
 
   gemfile <<-RB
     gem 'activerecord', '~> 3.0.20'
+    gem 'activerecord-mysql2-adapter' if RUBY_PLATFORM != 'java'
     #{boilerplate_gems}
   RB
 end

data/test/multiverse/suites/active_record/active_record_test.rb

@@ -473,7 +473,7 @@ class ActiveRecordInstrumentationTest < Minitest::Test
     statement = node.params[:sql]
     assert_match(/^SELECT /, statement.sql)
 
-    assert_equal(adapter, statement.adapter)
+    assert_match(statement.adapter.to_s, adapter.to_s)
     refute_nil(statement.config)
     refute_nil(statement.explainer)
   end

data/test/multiverse/suites/active_record/config/database.yml

@@ -1,9 +1,12 @@
 mysql: &mysql
-<% if defined?(JRuby) %>
-  adapter: jdbcmysql
-<% else %>
-  adapter: mysql
-<% end %>
+  adapter: <%=
+    if defined?(JRuby)
+      'jdbcmysql'
+    elsif RUBY_VERSION <= '1.9.3'
+      'mysql'
+    else
+      'mysql2'
+    end %>
   socket: <%= (`uname -s` =~ /Linux/ ) ? "" :"/tmp/mysql.sock" %>
   username: root
   host: localhost

data/test/multiverse/suites/datamapper/datamapper_test.rb

@@ -331,7 +331,8 @@ class DataMapperTest < Minitest::Test
       NewRelic::Agent.notice_error(e)
     end
 
-    refute last_traced_error.message.include?('&password=')
+    refute last_traced_error.message.include?('&password='),
+      "error message expected not to contain '&password=' but did: #{last_traced_error && last_traced_error.message}"
   end
 
   def assert_against_record(operation)

data/test/multiverse/suites/grape/Envfile

@@ -2,7 +2,7 @@ suite_condition("Grape is only supported for versions >= 1.9.3") do
   RUBY_VERSION >= '1.9.3'
 end
 
-versions = %w(0.9.0 0.8.0 0.7.0 0.6.1 0.5.0 0.4.1 0.3.2 0.2.6 0.2.0 0.1.5)
+versions = %w(0.14.0 0.13.0 0.12.0 0.11.0 0.10.0 0.9.0 0.8.0 0.7.0 0.6.1 0.5.0 0.4.1 0.3.2 0.2.6 0.2.0 0.1.5)
 
 versions.each do |version|
   gemfile <<-RB

data/test/multiverse/suites/rails/Envfile

@@ -1,3 +1,11 @@
+if RUBY_VERSION >= '2.2.2' && RUBY_PLATFORM != 'java'
+  gemfile <<-RB
+    gem 'rails', '~>5.0.0beta2'
+    gem 'haml', :require => false
+    gem 'minitest', '5.2.3'
+  RB
+end
+
 if RUBY_VERSION >= '1.9.3'
   gemfile <<-RB
     gem 'rails', '~>4.2.1'

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

@@ -52,6 +52,11 @@ class ErrorController < ApplicationController
   end
 
   def noticed_error
+    NewRelic::Agent.notice_error(RuntimeError.new('this error should be noticed'))
+    render :text => "Shoulda noticed an error"
+  end
+
+  def deprecated_noticed_error
     newrelic_notice_error(RuntimeError.new('this error should be noticed'))
     render :text => "Shoulda noticed an error"
   end
@@ -145,6 +150,14 @@ class ErrorsWithoutSSCTest < RailsMultiverseTest
                                'Controller/error/model_error')
   end
 
+  if Rails::VERSION::MAJOR < 5
+    def test_should_capture_deprecated_noticed_error_in_controller
+      get '/error/deprecated_noticed_error'
+      assert_error_reported_once('this error should be noticed',
+                                 'Controller/error/deprecated_noticed_error')
+    end
+  end
+
   def test_should_capture_noticed_error_in_controller
     get '/error/noticed_error'
     assert_error_reported_once('this error should be noticed',

data/test/new_relic/agent/system_info_test.rb

@@ -90,6 +90,12 @@ class NewRelic::Agent::SystemInfoTest < Minitest::Test
     assert_nil @sysinfo.parse_linux_meminfo_in_mib("")
   end
 
+  def test_ram_in_mb_nil_when_proc_meminfo_unreadable
+    NewRelic::Agent::SystemInfo.stubs(:ruby_os_identifier).returns("linux")
+    NewRelic::Agent::SystemInfo.expects(:proc_try_read).with('/proc/meminfo').returns(nil)
+    assert_nil NewRelic::Agent::SystemInfo.ram_in_mib, "Expected ram_in_mib to be nil"
+  end
+
   def test_system_info_darwin_predicate
     NewRelic::Agent::SystemInfo.stubs(:ruby_os_identifier).returns("darwin13")
     assert NewRelic::Agent::SystemInfo.darwin?, "Expected OS to match darwin"

data/test/new_relic/agent/transaction_test.rb

@@ -1293,10 +1293,10 @@ class NewRelic::Agent::TransactionTest < Minitest::Test
   end
 
   def test_assigns_synthetics_to_intrinsic_attributes
-    txn = in_transaction do |txn|
-      txn.raw_synthetics_header = ""
-      txn.synthetics_payload = [1, 1, 100, 200, 300]
-      txn
+    txn = in_transaction do |t|
+      t.raw_synthetics_header = ""
+      t.synthetics_payload = [1, 1, 100, 200, 300]
+      t
     end
 
     result = txn.attributes.intrinsic_attributes_for(NewRelic::Agent::AttributeFilter::DST_TRANSACTION_TRACER)
@@ -1307,7 +1307,7 @@ class NewRelic::Agent::TransactionTest < Minitest::Test
 
 
   def test_intrinsic_attributes_include_gc_time
-    txn = in_transaction do |txn|
+    txn = in_transaction do |t|
       NewRelic::Agent::StatsEngine::GCProfiler.stubs(:record_delta).returns(10.0)
     end
 
@@ -1320,9 +1320,9 @@ class NewRelic::Agent::TransactionTest < Minitest::Test
 
     NewRelic::Agent.instance.cross_app_monitor.stubs(:client_referring_transaction_trip_id).returns('PDX-NRT')
 
-    txn = in_transaction do |txn|
+    txn = in_transaction do |t|
       NewRelic::Agent::TransactionState.tl_get.is_cross_app_caller = true
-      guid = txn.guid
+      guid = t.guid
     end
 
     result = txn.attributes.intrinsic_attributes_for(NewRelic::Agent::AttributeFilter::DST_TRANSACTION_TRACER)
@@ -1343,10 +1343,10 @@ class NewRelic::Agent::TransactionTest < Minitest::Test
   def test_intrinsic_attributes_include_path_hash
     path_hash = nil
 
-    txn = in_transaction do |txn|
+    txn = in_transaction do |t|
       state = NewRelic::Agent::TransactionState.tl_get
       state.is_cross_app_caller = true
-      path_hash = txn.cat_path_hash(state)
+      path_hash = t.cat_path_hash(state)
     end
 
     result = txn.attributes.intrinsic_attributes_for(NewRelic::Agent::AttributeFilter::DST_TRANSACTION_TRACER)
@@ -1354,9 +1354,9 @@ class NewRelic::Agent::TransactionTest < Minitest::Test
   end
 
   def test_synthetics_attributes_not_included_if_not_valid_synthetics_request
-    txn = in_transaction do |txn|
-      txn.raw_synthetics_header = nil
-      txn.synthetics_payload = nil
+    txn = in_transaction do |t|
+      t.raw_synthetics_header = nil
+      t.synthetics_payload = nil
     end
 
     result = txn.attributes.intrinsic_attributes_for(NewRelic::Agent::AttributeFilter::DST_TRANSACTION_TRACER)
@@ -1366,8 +1366,8 @@ class NewRelic::Agent::TransactionTest < Minitest::Test
   end
 
   def test_intrinsic_attributes_include_cpu_time
-    txn = in_transaction do |txn|
-      txn.stubs(:cpu_burn).returns(22.0)
+    txn = in_transaction do |t|
+      t.stubs(:cpu_burn).returns(22.0)
     end
 
     result = txn.attributes.intrinsic_attributes_for(NewRelic::Agent::AttributeFilter::DST_TRANSACTION_TRACER)

data/test/new_relic/agent/utilization_data_test.rb

@@ -132,6 +132,15 @@ module NewRelic::Agent
       assert_equal 128, utilization_data.to_collector_hash[:total_ram_mib]
     end
 
+    def test_memory_is_nil_when_proc_meminfo_is_unreadable
+      NewRelic::Agent::SystemInfo.stubs(:ruby_os_identifier).returns("linux")
+      NewRelic::Agent::SystemInfo.stubs(:proc_try_read).returns(nil)
+
+      utilization_data = UtilizationData.new
+
+      assert_nil utilization_data.to_collector_hash[:total_ram_mib], "Expected total_ram_mib to be nil"
+    end
+
     def test_metadata_version_is_present_in_collector_hash
       utilization_data = UtilizationData.new
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 3.14.3.313
+  version: 3.15.0.314
 platform: ruby
 authors:
 - Tim Krajcar
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-05 00:00:00.000000000 Z
+date: 2016-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -187,7 +187,7 @@ description: |
   information about the performance of your web application as it runs
   in production. The New Relic Ruby Agent is dual-purposed as a either a
   Gem or plugin, hosted on
-  http://github.com/newrelic/rpm/
+  https://github.com/newrelic/rpm/
 email: support@newrelic.com
 executables:
 - mongrel_rpm
@@ -326,6 +326,8 @@ files:
 - lib/new_relic/agent/instrumentation/rails4/action_controller.rb
 - lib/new_relic/agent/instrumentation/rails4/action_view.rb
 - lib/new_relic/agent/instrumentation/rails4/errors.rb
+- lib/new_relic/agent/instrumentation/rails5/action_controller.rb
+- lib/new_relic/agent/instrumentation/rails5/action_view.rb
 - lib/new_relic/agent/instrumentation/rails_middleware.rb
 - lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb
 - lib/new_relic/agent/instrumentation/rake.rb
@@ -427,6 +429,7 @@ files:
 - lib/new_relic/control/frameworks/rails.rb
 - lib/new_relic/control/frameworks/rails3.rb
 - lib/new_relic/control/frameworks/rails4.rb
+- lib/new_relic/control/frameworks/rails5.rb
 - lib/new_relic/control/frameworks/ruby.rb
 - lib/new_relic/control/frameworks/sinatra.rb
 - lib/new_relic/control/instance_methods.rb
@@ -563,6 +566,13 @@ files:
 - test/environments/rails42/config/database.yml
 - test/environments/rails42/config/environment.rb
 - test/environments/rails42/db/schema.rb
+- test/environments/rails50/Gemfile
+- test/environments/rails50/Rakefile
+- test/environments/rails50/config/application.rb
+- test/environments/rails50/config/boot.rb
+- test/environments/rails50/config/database.yml
+- test/environments/rails50/config/environment.rb
+- test/environments/rails50/db/schema.rb
 - test/fixtures/cross_agent_tests/README.md
 - test/fixtures/cross_agent_tests/attribute_configuration.json
 - test/fixtures/cross_agent_tests/aws.json
@@ -1299,7 +1309,7 @@ files:
 - vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/web_frontend.rb
 - vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/web_service.rb
 - vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/web_transaction.rb
-homepage: http://www.github.com/newrelic/rpm
+homepage: https://github.com/newrelic/rpm
 licenses:
 - New Relic
 - MIT