newrelic_rpm 3.9.9.275 → 3.10.0.279

data/test/new_relic/agent/parameter_filtering_test.rb

@@ -0,0 +1,39 @@
+# 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/parameter_filtering'
+
+module NewRelic
+  module Agent
+    class ParameterFilteringTest < Minitest::Test
+
+      def test_apply_filters_returns_params_when_rails_is_not_present
+        undefine_constant(:"ActionDispatch::Http::ParameterFilter") do
+          params = {"password" => "mypass"}
+          result = ParameterFiltering.apply_filters({}, params)
+          assert_equal params, result
+        end
+      end
+
+      def test_apply_filters_replaces_file_uploads_with_placeholder
+        env = {"CONTENT_TYPE" => "multipart/form-data"}
+        params = {
+          :name => "name",
+          :file => {
+            :filename => "data.jpg",
+            :tempfile => "file_data"
+          }
+        }
+
+        expected = {:name => "name", :file => "[FILE]"}
+        result = ParameterFiltering.apply_filters(env, params)
+        assert_equal expected, result
+
+        # argument should not be mutated
+        assert_equal({ :filename => "data.jpg", :tempfile => "file_data" }, params[:file])
+      end
+    end
+  end
+end

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

@@ -94,7 +94,7 @@ class NewRelic::Agent::StatsEngine
         GC::Profiler.clear
         count_after_clear = GC.count
 
-        assert_operator count_before_allocations, :<,  count_after_allocations
+        assert_operator count_before_allocations, :<=, count_after_allocations
         assert_operator count_after_allocations,  :<=, count_after_clear
       ensure
         GC::Profiler.disable if defined?(::GC::Profiler)

data/test/new_relic/agent/transaction_test.rb

@@ -236,8 +236,7 @@ class NewRelic::Agent::TransactionTest < Minitest::Test
   end
 
   def test_name_is_unset_if_nil
-    in_transaction do |txn|
-      txn.default_name = nil
+    in_transaction(:transaction_name => nil) do |txn|
       assert !txn.name_set?
     end
   end
@@ -248,6 +247,30 @@ class NewRelic::Agent::TransactionTest < Minitest::Test
     end
   end
 
+  def test_set_default_transaction_name_without_category
+    in_transaction('foo', :category => :controller) do |txn|
+      NewRelic::Agent::Transaction.set_default_transaction_name('bar')
+      assert_equal("Controller/bar", txn.best_name)
+      assert_equal("Controller/bar", txn.frame_stack.last.name)
+    end
+  end
+
+  def test_set_default_transaction_name_with_category
+    in_transaction('foo', :category => :controller) do |txn|
+      NewRelic::Agent::Transaction.set_default_transaction_name('bar', :rack)
+      assert_equal("Controller/Rack/bar", txn.best_name)
+      assert_equal("Controller/Rack/bar", txn.frame_stack.last.name)
+    end
+  end
+
+  def test_set_default_transaction_name_with_category_and_segment_name
+    in_transaction('foo', :category => :controller) do |txn|
+      NewRelic::Agent::Transaction.set_default_transaction_name('bar', :grape, 'baz')
+      assert_equal("Controller/Grape/bar", txn.best_name)
+      assert_equal("baz", txn.frame_stack.last.name)
+    end
+  end
+
   def test_generates_guid_on_initialization
     in_transaction do |txn|
       refute_empty txn.guid
@@ -1078,8 +1101,89 @@ class NewRelic::Agent::TransactionTest < Minitest::Test
     assert_metrics_recorded(['foo'])
   end
 
+  def test_transaction_start_sets_default_name_for_transactions_with_matching_categories
+    in_transaction('outside_cascade') do
+      in_transaction('inside_cascade') do |txn|
+        assert_equal 'inside_cascade', txn.best_name
+      end
+    end
+  end
+
+  def test_similar_category?
+    web_category1 = NewRelic::Agent::Transaction::WEB_TRANSACTION_CATEGORIES.first
+    web_category2 = NewRelic::Agent::Transaction::WEB_TRANSACTION_CATEGORIES.last
+
+    in_transaction('test', :category => web_category1) do |txn|
+      assert txn.similar_category?(web_category2)
+    end
+  end
+
+  def test_similar_category_returns_false_with_mismatched_categories
+    web_category = NewRelic::Agent::Transaction::WEB_TRANSACTION_CATEGORIES.first
+
+    in_transaction('test', :category => web_category) do |txn|
+      frame = stub(:category => :other)
+      refute txn.similar_category?(frame)
+    end
+  end
+
+  def test_similar_category_returns_true_with_nonweb_categories
+    in_transaction('test', :category => :other) do |txn|
+      frame = stub(:category => :other)
+      assert txn.similar_category?(frame)
+    end
+  end
+
+  def test_set_overriding_transaction_name_sets_name_from_api
+    in_transaction('test') do |txn|
+      txn.class.set_overriding_transaction_name('name_from_api', 'category')
+
+      assert_equal 'category/name_from_api', txn.best_name
+    end
+  end
+
   def assert_has_custom_parameter(txn, key, value = key)
     assert_equal(value, txn.custom_parameters[key])
   end
 
+  def test_wrap_transaction
+    state = NewRelic::Agent::TransactionState.tl_get
+    NewRelic::Agent::Transaction.wrap(state, 'test', :other) do
+      # No-op
+    end
+
+    assert_metrics_recorded(['test'])
+  end
+
+  def test_wrap_transaction_with_early_failure
+    yielded = false
+    state = NewRelic::Agent::TransactionState.tl_get
+    NewRelic::Agent::Transaction.any_instance.stubs(:start).raises("Boom")
+    NewRelic::Agent::Transaction.wrap(state, 'test', :other) do
+      yielded = true
+    end
+
+    assert yielded
+  end
+
+  def test_wrap_transaction_with_late_failure
+    state = NewRelic::Agent::TransactionState.tl_get
+    NewRelic::Agent::Transaction.any_instance.stubs(:stop).raises("Boom")
+    NewRelic::Agent::Transaction.wrap(state, 'test', :other) do
+      # No-op
+    end
+
+    refute_metrics_recorded(['test'])
+  end
+
+  def test_wrap_transaction_notices_errors
+    state = NewRelic::Agent::TransactionState.tl_get
+    assert_raises RuntimeError do
+      NewRelic::Agent::Transaction.wrap(state, 'test', :other) do
+        raise "O_o"
+      end
+    end
+
+    assert_metrics_recorded(["Errors/all"])
+  end
 end

data/test/new_relic/agent/vm/rubinius_vm_test.rb

@@ -7,62 +7,63 @@ require 'new_relic/agent/vm/rubinius_vm'
 
 if NewRelic::LanguageSupport.rubinius?
   class NewRelic::Agent::VM::RubiniusVMTest < Minitest::Test
-    def test_normal_usage
-      with_stats({ :gc => {
-        :full  => { :count => 1 },
-        :young => { :count => 2 }
-      }})
+    def setup
+      @snap = NewRelic::Agent::VM::Snapshot.new
+      @vm = NewRelic::Agent::VM::RubiniusVM.new
+    end
+
+    def test_gc_runs
+      @vm.gather_gc_stats(@snap)
+
+      refute_nil @snap.gc_runs
+    end
 
-      has_major_minor(1, 2)
+    def test_gather_stats_from_metrics_sets_major_gc_count
+      @vm.gather_stats_from_metrics(@snap)
+
+      refute_nil @snap.major_gc_count
     end
 
-    def test_missing_full
-      with_stats({ :gc => {
-        :young => { :count => 2 }
-      }})
+    def test_gather_stats_from_metrics_sets_minor_gc_count
+      @vm.gather_stats_from_metrics(@snap)
 
-      has_major_minor(nil, 2)
+      refute_nil @snap.minor_gc_count
     end
 
-    def test_missing_full_count
-      with_stats({ :gc => {
-        :full  => { },
-        :young => { :count => 2 }
-      }})
+    def test_gather_stats_from_metrics_sets_major_gc_count
+      @vm.gather_stats_from_metrics(@snap)
 
-      has_major_minor(nil, 2)
+      refute_nil @snap.major_gc_count
     end
 
-    def test_missing_young
-      with_stats({ :gc => {
-        :full => { :count => 1 }
-      }})
+    def test_gather_stats_from_metrics_sets_heap_live_slots
+      @vm.gather_stats_from_metrics(@snap)
 
-      has_major_minor(1, nil)
+      refute_nil @snap.heap_live
     end
 
-    def test_missing_young_count
-      with_stats({ :gc => {
-        :full  => { :count => 1},
-        :young => { }
-      }})
+    def test_gather_stats_from_metrics_sets_total_allocated_objects
+      @vm.gather_stats_from_metrics(@snap)
 
-      has_major_minor(1, nil)
+      refute_nil @snap.total_allocated_object
     end
 
-    def test_missing_gc
-      with_stats({})
-      has_major_minor(nil, nil)
+    def test_gather_stats_from_metrics_sets_method_cache_invalidations
+      @vm.gather_stats_from_metrics(@snap)
+
+      refute_nil @snap.method_cache_invalidations
     end
 
-    def with_stats(stats)
-      GC.stubs(:stat).returns(stats)
+    def test_gather_gc_time
+      @vm.gather_gc_time(@snap)
+
+      refute_nil @snap.gc_total_time
     end
 
-    def has_major_minor(major, minor)
-      snapshot = NewRelic::Agent::VM::RubiniusVM.new.snapshot
-      assert_equal(major, snapshot.major_gc_count)
-      assert_equal(minor, snapshot.minor_gc_count)
+    def test_gather_tread_stats
+      @vm.gather_thread_stats(@snap)
+
+      refute_nil @snap.thread_count
     end
   end
 end

data/test/new_relic/agent_test.rb

@@ -352,15 +352,20 @@ module NewRelic
       Transactor.new.txn do
         NewRelic::Agent.set_transaction_name('new_name', :category => :task)
       end
-      assert engine.lookup_stats('OtherTransaction/Background/new_name')
+
+      assert_metrics_recorded 'OtherTransaction/Background/new_name'
+
       Transactor.new.txn do
         NewRelic::Agent.set_transaction_name('new_name', :category => :rack)
       end
-      assert engine.lookup_stats('Controller/Rack/new_name')
+
+      assert_metrics_recorded 'Controller/Rack/new_name'
+
       Transactor.new.txn do
         NewRelic::Agent.set_transaction_name('new_name', :category => :sinatra)
       end
-      assert engine.lookup_stats('Controller/Sinatra/new_name')
+
+      assert_metrics_recorded 'Controller/Sinatra/new_name'
     end
 
     def test_set_transaction_name_uses_current_txn_category_default

data/test/new_relic/filtering_test_app.rb

@@ -0,0 +1,18 @@
+# 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.
+
+# This is a simple test app for testing parameter filtering as provided by
+# the NewRelic::Agent:ParameterFiltering module.
+
+class FilteringTestApp
+  def call(env)
+    req = Rack::Request.new(env)
+    txn = ::NewRelic::Agent::Transaction.tl_current
+    params = req.params
+    filtered = ::NewRelic::Agent::ParameterFiltering.apply_filters(env, params)
+    txn.filtered_params = filtered
+    raise "Intentional error" if params["raise"]
+    [200, {}, ["Filters applied"]]
+  end
+end

data/test/new_relic/latest_changes_test.rb

@@ -21,7 +21,7 @@ module NewRelic
     def test_read_default_changelog
       result = NewRelic::LatestChanges.read
       assert_match(/# New Relic Ruby Agent Release Notes #/, result)
-      assert_match(/## v\d\.\d\.\d ##/, result)
+      assert_match(/## v\d\.\d{1,2}\.\d{1,2} ##/, result)
     end
 
     def test_latest_changes_from_fakechangelog

data/test/new_relic/rack/browser_monitoring_test.rb

@@ -84,10 +84,10 @@ EOL
     end
   end
 
-  def test_should_only_instrument_successfull_html_requests
-    assert app.should_instrument?({}, 200, {'Content-Type' => 'text/html'})
-    assert !app.should_instrument?({}, 500, {'Content-Type' => 'text/html'})
-    assert !app.should_instrument?({}, 200, {'Content-Type' => 'text/xhtml'})
+  def test_should_only_instrument_successful_html_requests
+    assert app.should_instrument?({}, 200, {'Content-Type' => 'text/html'}), "Expected to instrument 200 requests."
+    assert !app.should_instrument?({}, 500, {'Content-Type' => 'text/html'}), "Expected not to instrument 500 requests."
+    assert !app.should_instrument?({}, 200, {'Content-Type' => 'text/xhtml'}), "Expected not to instrument requests with content type other than text/html."
   end
 
   def test_should_not_instrument_when_content_disposition

data/test/performance/lib/performance/instrumentation/gc_stats.rb

@@ -5,7 +5,7 @@
 module Performance
   module Instrumentation
     class MRIGCStats < Instrumentor
-      platforms :mri_193, :mri_20, :mri_21
+      platforms :mri_193, :mri_20, :mri_21, :mri_22
       on_by_default
 
       def before(*)
@@ -17,15 +17,17 @@ module Performance
       end
 
       def results
-        heap_live_before = @stats_before[:heap_live_num] || @stats_before[:heap_live_slot]
-        heap_live_after  = @stats_after[:heap_live_num]  || @stats_after[:heap_live_slot]
+        heap_live_before = @stats_before[:heap_live_slots] || @stats_before[:heap_live_num] || @stats_before[:heap_live_slot]
+        heap_live_after  = @stats_after[:heap_live_slots]  || @stats_after[:heap_live_num]  || @stats_after[:heap_live_slot]
 
         res = {
           :gc_runs      => @stats_after[:count] - @stats_before[:count],
           :live_objects => heap_live_after      - heap_live_before
         }
         if RUBY_VERSION >= "2.0.0"
-          res[:allocations] = @stats_after[:total_allocated_object] - @stats_before[:total_allocated_object]
+          allocs_before = @stats_before[:total_allocated_objects] || @stats_before[:total_allocated_object]
+          allocs_after  = @stats_after[:total_allocated_objects]  || @stats_after[:total_allocated_object]
+          res[:allocations] = allocs_after - allocs_before
         end
         res
       end

data/test/performance/lib/performance/platform.rb

@@ -26,6 +26,7 @@ module Performance
       when :mri_193 then !jruby? && RUBY_VERSION =~ /^1\.9\.3/
       when :mri_20  then !jruby? && RUBY_VERSION =~ /^2\.0\./
       when :mri_21  then !jruby? && RUBY_VERSION =~ /^2\.1\./
+      when :mri_22  then !jruby? && RUBY_VERSION =~ /^2\.2\./
       end
     end
 

data/test/performance/suites/thread_profiling.rb

@@ -51,6 +51,18 @@ class ThreadProfiling < Performance::TestCase
   def teardown
     @cvar.broadcast
     @threads.each(&:join)
+  rescue Exception => e
+    if e.message =~ /Deadlock/
+      Thread.list.select(&:alive?).each do |t|
+        STDERR.puts "*" * 80
+        STDERR.puts "Live thread: #{t.inspect}"
+        STDERR.puts "Backtrace:"
+        STDERR.puts (t.backtrace || []).join("\n")
+        STDERR.puts "*" * 80
+      end
+    end
+
+    raise e
   end
 
   def test_gather_backtraces(timer)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 3.9.9.275
+  version: 3.10.0.279
   prerelease: 
 platform: ruby
 authors:
 - Jason Clark
 - Tim Krajcar
-- Chris Pine
 - Jonan Scheffler
+- Matthew Wear
 - Ben Weintraub
 autorequire: 
 bindir: bin
@@ -41,7 +41,7 @@ cert_chain:
   K0ZZTXduQWIrVm1OT2h2MVMrc0poYmpaMzBQS2d6NnZMaFQ2dW5pZUNqTGs5
   d0dHbWxTSwpZamJudkE5cXJhTExhalNqCi0tLS0tRU5EIENFUlRJRklDQVRF
   LS0tLS0K
-date: 2014-12-29 00:00:00.000000000 Z
+date: 2015-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -140,13 +140,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.9.12
 - !ruby/object:Gem::Dependency
-  name: guard
+  name: hometown
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: 0.2.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -154,7 +154,23 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: 0.2.5
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-minitest
   requirement: !ruby/object:Gem::Requirement
@@ -176,33 +192,33 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: hometown
+  name: i18n
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.6.11
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.6.11
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -381,6 +397,7 @@ files:
 - lib/new_relic/agent/new_relic_service/pruby_marshaller.rb
 - lib/new_relic/agent/null_logger.rb
 - lib/new_relic/agent/obfuscator.rb
+- lib/new_relic/agent/parameter_filtering.rb
 - lib/new_relic/agent/pipe_channel_manager.rb
 - lib/new_relic/agent/pipe_service.rb
 - lib/new_relic/agent/rules_engine.rb
@@ -897,6 +914,8 @@ files:
 - test/multiverse/suites/grape/config/newrelic.yml
 - test/multiverse/suites/grape/grape_test.rb
 - test/multiverse/suites/grape/grape_test_api.rb
+- test/multiverse/suites/grape/grape_versioning_test.rb
+- test/multiverse/suites/grape/grape_versioning_test_api.rb
 - test/multiverse/suites/grape/unsupported_version_test.rb
 - test/multiverse/suites/high_security/Envfile
 - test/multiverse/suites/high_security/config/newrelic.yml
@@ -931,7 +950,9 @@ files:
 - test/multiverse/suites/rack/http_response_code_test.rb
 - test/multiverse/suites/rack/nested_non_rack_app_test.rb
 - test/multiverse/suites/rack/rack_auto_instrumentation_test.rb
+- test/multiverse/suites/rack/rack_cascade_test.rb
 - test/multiverse/suites/rack/rack_env_mutation_test.rb
+- test/multiverse/suites/rack/rack_parameter_filtering_test.rb
 - test/multiverse/suites/rack/rack_unsupported_version_test.rb
 - test/multiverse/suites/rack/url_map_test.rb
 - test/multiverse/suites/rails/Envfile
@@ -1085,6 +1106,7 @@ files:
 - test/new_relic/agent/mock_scope_listener.rb
 - test/new_relic/agent/new_relic_service_test.rb
 - test/new_relic/agent/obfuscator_test.rb
+- test/new_relic/agent/parameter_filtering_test.rb
 - test/new_relic/agent/pipe_channel_manager_test.rb
 - test/new_relic/agent/pipe_service_test.rb
 - test/new_relic/agent/rpm_agent_test.rb
@@ -1152,6 +1174,7 @@ files:
 - test/new_relic/fake_instance_metadata_service.rb
 - test/new_relic/fake_rpm_site.rb
 - test/new_relic/fake_server.rb
+- test/new_relic/filtering_test_app.rb
 - test/new_relic/framework_test.rb
 - test/new_relic/http_client_test_cases.rb
 - test/new_relic/json_wrapper_test.rb