newrelic_rpm 3.7.1.188 → 3.7.2.190.beta

data/test/new_relic/noticed_error_test.rb

@@ -4,7 +4,7 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__),'..','test_helper'))
 
-class NewRelic::Agent::NoticedErrorTest < Test::Unit::TestCase
+class NewRelic::Agent::NoticedErrorTest < MiniTest::Unit::TestCase
   include NewRelic::TestHelpers::Exceptions
 
   def setup

data/test/new_relic/rack/agent_hooks_test.rb

@@ -5,7 +5,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
 require 'new_relic/rack/agent_hooks'
 
-class AgentHooksTest < Test::Unit::TestCase
+class AgentHooksTest < MiniTest::Unit::TestCase
 
   def setup
     @app = stub_everything

data/test/new_relic/rack/all_test.rb

@@ -5,7 +5,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
 require 'new_relic/rack/browser_monitoring'
 require 'new_relic/rack/developer_mode'
-class NewRelic::Rack::AllTest < Test::Unit::TestCase
+class NewRelic::Rack::AllTest < MiniTest::Unit::TestCase
   # just here to load the files above
 
   def test_truth

data/test/new_relic/rack/browser_monitoring_test.rb

@@ -10,7 +10,7 @@ require 'new_relic/rack/browser_monitoring'
 
 ENV['RACK_ENV'] = 'test'
 
-class BrowserMonitoringTest < Test::Unit::TestCase
+class BrowserMonitoringTest < MiniTest::Unit::TestCase
   include Rack::Test::Methods
 
   class TestApp
@@ -75,7 +75,9 @@ EOL
   end
 
   def test_make_sure_header_is_set
-    assert NewRelic::Agent.browser_timing_header.size > 0
+    in_transaction do
+      assert NewRelic::Agent.browser_timing_header.size > 0
+    end
   end
 
   def test_should_only_instrument_successfull_html_requests

data/test/new_relic/rack/deferred_instrumentation_test.rb

@@ -4,7 +4,7 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
 
-class NewRelic::Rack::DeferredInstrumentationTest < Test::Unit::TestCase
+class NewRelic::Rack::DeferredInstrumentationTest < MiniTest::Unit::TestCase
   class TestApp
     def call(env)
       [200, {}, ["whatever"]]
@@ -19,7 +19,7 @@ class NewRelic::Rack::DeferredInstrumentationTest < Test::Unit::TestCase
     # On Ruby 1.8.7, this will cause the file to be evaluated multiple times.
     path1 = "new_relic/agent/instrumentation/rack"
     path2 = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'lib', 'new_relic', 'agent', 'instrumentation', 'rack'))
-    assert_not_equal(path2, path1)
+    refute_equal(path2, path1)
 
     require path1
     require path2
@@ -28,8 +28,6 @@ class NewRelic::Rack::DeferredInstrumentationTest < Test::Unit::TestCase
       run(::NewRelic::Rack::DeferredInstrumentationTest::TestApp.new)
     end
 
-    assert_nothing_raised do
-      builder.to_app
-    end
+    builder.to_app
   end
 end

data/test/new_relic/rack/developer_mode_helper_test.rb

@@ -8,7 +8,7 @@ require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','ui',
                                    'helpers','developer_mode_helper.rb'))
 
 ENV['RACK_ENV'] = 'test'
-class DeveloperModeTest < Test::Unit::TestCase
+class DeveloperModeTest < MiniTest::Unit::TestCase
   include NewRelic::DeveloperModeHelper
 
 

data/test/new_relic/rack/developer_mode_test.rb

@@ -11,7 +11,7 @@ require 'new_relic/rack/developer_mode'
 
 ENV['RACK_ENV'] = 'test'
 
-class DeveloperModeTest < Test::Unit::TestCase
+class DeveloperModeTest < MiniTest::Unit::TestCase
   include Rack::Test::Methods
   include TransactionSampleTestHelper
 

data/test/new_relic/rack/error_collector_test.rb

@@ -8,7 +8,7 @@ require 'rack/test'
 require 'new_relic/rack/error_collector'
 
 module NewRelic::Rack
-  class ErrorCollectorTest < Test::Unit::TestCase
+  class ErrorCollectorTest < MiniTest::Unit::TestCase
     include Rack::Test::Methods
 
     class TestApp
@@ -41,7 +41,7 @@ module NewRelic::Rack
     end
 
     def test_notice_and_reraise_errors
-      assert_raise RuntimeError do
+      assert_raises RuntimeError do
         get '/'
       end
 
@@ -53,7 +53,7 @@ module NewRelic::Rack
         !error.kind_of?(RuntimeError)
       end
 
-      assert_raise RuntimeError do
+      assert_raises RuntimeError do
         get '/'
       end
 
@@ -63,7 +63,7 @@ module NewRelic::Rack
 
     if defined?(::Rails)
       def test_ignore_errors_from_ignored_actions
-        assert_raise RuntimeError do
+        assert_raises RuntimeError do
           get '/ignored'
         end
 
@@ -84,7 +84,7 @@ module NewRelic::Rack
         Rack::Request.stubs(:new).returns(bad_request)
       end
 
-      assert_raise RuntimeError do
+      assert_raises RuntimeError do
         get '/'
       end
 
@@ -100,7 +100,7 @@ module NewRelic::Rack
       if defined?(ActionDispatch::Request)
         ActionDispatch::Request.stubs(:new).raises('bad news')
 
-        assert_raise RuntimeError do
+        assert_raises RuntimeError do
           get '/foo/bar?q=12'
         end
 
@@ -110,7 +110,7 @@ module NewRelic::Rack
     end
 
     def test_captures_parameters_with_rails
-      assert_raise RuntimeError do
+      assert_raises RuntimeError do
         get '/?foo=bar&baz=qux'
       end
 
@@ -121,7 +121,7 @@ module NewRelic::Rack
 
     def test_captures_parameters_without_rails
       undefine_constant(:'ActionDispatch::Request') do
-        assert_raise RuntimeError do
+        assert_raises RuntimeError do
           get '/?foo=bar&baz=qux'
         end
       end

data/test/new_relic/rack/transaction_reset_test.rb

@@ -0,0 +1,35 @@
+# 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/rack/transaction_reset'
+require 'new_relic/agent/transaction_state'
+
+module NewRelic
+  module Rack
+    class TransactionResetTest < MiniTest::Unit::TestCase
+      class ExampleMiddleware
+        include TransactionReset
+      end
+
+      attr_reader :middleware, :env
+
+      def setup
+        @middleware = ExampleMiddleware.new
+        @env = {}
+      end
+
+      def test_resets
+        NewRelic::Agent::TransactionState.expects(:reset).once
+        middleware.ensure_transaction_reset(env)
+      end
+
+      def test_resets_only_once
+        NewRelic::Agent::TransactionState.expects(:reset).once
+        middleware.ensure_transaction_reset(env)
+        middleware.ensure_transaction_reset(env)
+      end
+    end
+  end
+end

data/test/new_relic/transaction_analysis/segment_summary_test.rb

@@ -4,7 +4,7 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__),'..', '..','test_helper'))
 require 'new_relic/transaction_analysis/segment_summary'
-class NewRelic::TransactionAnalysis::SegmentSummaryTest < Test::Unit::TestCase
+class NewRelic::TransactionAnalysis::SegmentSummaryTest < MiniTest::Unit::TestCase
 
   def setup
     @sample = mock('sample')
@@ -28,7 +28,7 @@ class NewRelic::TransactionAnalysis::SegmentSummaryTest < Test::Unit::TestCase
   def test_insert_error
     segment = mock('segment')
     segment.expects(:metric_name).returns('Controller/bar').twice
-    assert_raise(ArgumentError) do
+    assert_raises(ArgumentError) do
       @ss << segment
     end
   end

data/test/new_relic/transaction_analysis_test.rb

@@ -4,7 +4,7 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__),'..', 'test_helper'))
 require 'new_relic/transaction_analysis'
-class NewRelic::TransactionAnalysisTest < Test::Unit::TestCase
+class NewRelic::TransactionAnalysisTest < MiniTest::Unit::TestCase
   include NewRelic::TransactionAnalysis
 
   # these are mostly stub tests just making sure that the API doesn't

data/test/new_relic/transaction_sample/composite_segment_test.rb

@@ -4,7 +4,7 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'test_helper'))
 require 'new_relic/transaction_sample/composite_segment'
-class NewRelic::TransactionSample::CompositeSegmentTest < Test::Unit::TestCase
+class NewRelic::TransactionSample::CompositeSegmentTest < MiniTest::Unit::TestCase
   def test_composite_segment_creation
     fake_segment = mock_segment
     NewRelic::TransactionSample::CompositeSegment.new([fake_segment])

data/test/new_relic/transaction_sample/fake_segment_test.rb

@@ -4,11 +4,9 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'test_helper'))
 require 'new_relic/transaction_sample/fake_segment'
-class NewRelic::TransactionSample::FakeSegmentTest < Test::Unit::TestCase
+class NewRelic::TransactionSample::FakeSegmentTest < MiniTest::Unit::TestCase
   def test_fake_segment_creation
-    assert_nothing_raised do
-      NewRelic::TransactionSample::FakeSegment.new(0.1, 'Custom/test/metric', nil)
-    end
+    NewRelic::TransactionSample::FakeSegment.new(0.1, 'Custom/test/metric', nil)
   end
 
   def test_parent_segment

data/test/new_relic/transaction_sample/segment_test.rb

@@ -4,7 +4,7 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'test_helper'))
 require 'new_relic/transaction_sample/segment'
-class NewRelic::TransactionSample::SegmentTest < Test::Unit::TestCase
+class NewRelic::TransactionSample::SegmentTest < MiniTest::Unit::TestCase
   def test_segment_creation
     # basic smoke test
     s = NewRelic::TransactionSample::Segment.new(Time.now, 'Custom/test/metric', nil)
@@ -321,18 +321,14 @@ class NewRelic::TransactionSample::SegmentTest < Test::Unit::TestCase
     s.params = {:sql => statement}
     connection = mock('connection')
     NewRelic::Agent::Database.expects(:get_connection).with(config).raises(RuntimeError.new("whee"))
-    assert_nothing_raised do
-      s.explain_sql
-    end
+    s.explain_sql
   end
 
   def test_explain_sql_can_handle_missing_config
     # If TT segment came over from Resque child, might not be a Statement
     s = NewRelic::TransactionSample::Segment.new(Time.now, 'Custom/test/metric', nil)
     s.params = { :sql => "SELECT * FROM galaxy" }
-    assert_nothing_raised do
-      s.explain_sql
-    end
+    s.explain_sql
   end
 
   def test_explain_sql_can_use_already_existing_plan

data/test/new_relic/transaction_sample/summary_segment_test.rb

@@ -4,7 +4,7 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'test_helper'))
 require 'new_relic/transaction_sample/summary_segment'
-class NewRelic::TransactionSample::SummarySegmentTest < Test::Unit::TestCase
+class NewRelic::TransactionSample::SummarySegmentTest < MiniTest::Unit::TestCase
   def test_summary_segment_creation
     fake_segment = mock_segment
     NewRelic::TransactionSample::SummarySegment.new(fake_segment)

data/test/new_relic/transaction_sample_subtest_test.rb

@@ -2,7 +2,7 @@
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
-class NewRelic::TransactionSample::SubTest < Test::Unit::TestCase
+class NewRelic::TransactionSample::SubTest < MiniTest::Unit::TestCase
   def setup
     @t = NewRelic::TransactionSample.new
 

data/test/new_relic/transaction_sample_test.rb

@@ -4,7 +4,7 @@
 
 require File.expand_path('../../test_helper.rb', __FILE__)
 
-class NewRelic::TransactionSampleTest < Test::Unit::TestCase
+class NewRelic::TransactionSampleTest < MiniTest::Unit::TestCase
   include TransactionSampleTestHelper
   ::SQL_STATEMENT = "SELECT * from sandwiches WHERE meat='bacon'"
   ::OBFUSCATED_SQL_STATEMENT = "SELECT * from sandwiches WHERE meat=?"
@@ -30,7 +30,7 @@ class NewRelic::TransactionSampleTest < Test::Unit::TestCase
   end
 
   def test_be_recorded
-    assert_not_nil @t
+    refute_nil @t
   end
 
   def test_prepare_to_send_strips_sql_if_record_sql_is_off_or_none_or_false
@@ -104,9 +104,7 @@ class NewRelic::TransactionSampleTest < Test::Unit::TestCase
 
     @connection_stub.expects(:execute).raises
     with_config(config) do
-      assert_nothing_raised do
-        @t.prepare_to_send!
-      end
+      @t.prepare_to_send!
     end
   end
 
@@ -162,7 +160,7 @@ class NewRelic::TransactionSampleTest < Test::Unit::TestCase
   def test_to_s_with_bad_object
     @t.prepare_to_send!
     @t.params[:fake] = Hat.new
-    assert_raise(RuntimeError) do
+    assert_raises(RuntimeError) do
       @t.to_s
     end
   end

data/test/new_relic/version_number_test.rb

@@ -3,7 +3,7 @@
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
 require File.expand_path(File.join(File.dirname(__FILE__),'..', 'test_helper'))
-class NewRelic::VersionNumberTest < Test::Unit::TestCase
+class NewRelic::VersionNumberTest < MiniTest::Unit::TestCase
 
   def test_comparison__first
     versions = %w[1.0.0 0.1.0 0.0.1 10.0.1 1.10.0].map {|s| NewRelic::VersionNumber.new s }

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

@@ -50,4 +50,4 @@ module Performance
       end
     end
   end
-end
+end

data/test/performance/lib/performance/json_reporter.rb

@@ -12,4 +12,4 @@ module Performance
       puts JSON.dump(@results.map { |result| result.to_h })
     end
   end
-end
+end

data/test/performance/suites/marshalling.rb

@@ -20,6 +20,42 @@ class Marshalling < Performance::TestCase
     end
   end
 
+  def test_json_marshalling_binary_strings(timer)
+    marshaller = NewRelic::Agent::NewRelicService::JsonMarshaller.new
+    convert_strings_to_binary(@payload)
+    convert_strings_to_binary(@tt_payload)
+    timer.measure do
+      (iterations / 100).times do
+        marshaller.dump(@payload)
+        marshaller.dump(@tt_payload)
+      end
+    end
+  end
+
+  def test_json_marshalling_utf16_strings(timer)
+    marshaller = NewRelic::Agent::NewRelicService::JsonMarshaller.new
+    convert_strings_to_utf16(@payload)
+    convert_strings_to_utf16(@tt_payload)
+    timer.measure do
+      (iterations / 100).times do
+        marshaller.dump(@payload)
+        marshaller.dump(@tt_payload)
+      end
+    end
+  end
+
+  def test_json_marshalling_latin1_strings(timer)
+    marshaller = NewRelic::Agent::NewRelicService::JsonMarshaller.new
+    convert_strings_to_latin1(@payload)
+    convert_strings_to_latin1(@tt_payload)
+    timer.measure do
+      (iterations / 100).times do
+        marshaller.dump(@payload)
+        marshaller.dump(@tt_payload)
+      end
+    end
+  end
+
   def test_basic_marshalling_pruby(timer)
     marshaller = NewRelic::Agent::NewRelicService::PrubyMarshaller.new
     timer.measure do
@@ -30,6 +66,46 @@ class Marshalling < Performance::TestCase
     end
   end
 
+  # Skips Strings used as Hash keys, since they are frozen
+  def each_string(object, &blk)
+    case object
+    when String
+      blk.call(object)
+    when Array
+      object.map! { |x| each_string(x, &blk) }
+    when Hash
+      object.values.each do |v|
+        each_string(v, &blk)
+      end
+    end
+  end
+
+  BYTE_ALPHABET = (0..255).to_a.freeze
+
+  def generate_random_string(length)
+    bytes = []
+    length.times { bytes << BYTE_ALPHABET.sample }
+    bytes.pack("C*")
+  end
+
+  def convert_strings_to_binary(object)
+    each_string(object) do |s|
+      s.replace(generate_random_string(s.bytesize))
+    end
+  end
+
+  def convert_strings_to_utf16(object)
+    each_string(object) do |s|
+      s.encode!('UTF-16')
+    end
+  end
+
+  def convert_strings_to_latin1(object)
+    each_string(object) do |s|
+      s.replace(generate_random_string(s.bytesize)).force_encoding('ISO-8859-1')
+    end
+  end
+
   # Build an object graph that approximates a transaction trace in structure
   def build_transaction_trace_payload(depth=6)
     root = []