newrelic_rpm 3.7.1.188 → 3.7.2.190.beta

data/test/new_relic/agent/instrumentation/active_record_subscriber_test.rb

@@ -9,7 +9,7 @@ if defined?(::Rails) && ::Rails::VERSION::MAJOR.to_i >= MIN_RAILS_VERSION && !Ne
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','test_helper'))
 require 'new_relic/agent/instrumentation/active_record_subscriber'
 
-class NewRelic::Agent::Instrumentation::ActiveRecordSubscriberTest < Test::Unit::TestCase
+class NewRelic::Agent::Instrumentation::ActiveRecordSubscriberTest < MiniTest::Unit::TestCase
   class Order; end
 
   def setup
@@ -124,7 +124,7 @@ class NewRelic::Agent::Instrumentation::ActiveRecordSubscriberTest < Test::Unit:
 
   def test_should_not_raise_due_to_an_exception_during_instrumentation_callback
     @subscriber.stubs(:record_metrics).raises(StandardError)
-    assert_nothing_raised { simulate_query }
+    simulate_query
   end
 
   def simulate_query(duration=nil)

data/test/new_relic/agent/instrumentation/controller_instrumentation_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::Agent::Instrumentation::ControllerInstrumentationTest < Test::Unit::TestCase
+class NewRelic::Agent::Instrumentation::ControllerInstrumentationTest < MiniTest::Unit::TestCase
   require 'new_relic/agent/instrumentation/controller_instrumentation'
   class TestObject
     include NewRelic::Agent::Instrumentation::ControllerInstrumentation

data/test/new_relic/agent/instrumentation/instrumentation_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::Agent::Instrumentation::InstrumentationTest < Test::Unit::TestCase
+class NewRelic::Agent::Instrumentation::InstrumentationTest < MiniTest::Unit::TestCase
   def test_load_all_instrumentation_files
     # just checking for syntax errors and unguarded code
     Dir.glob('new_relic/agent/instrumentation/**/*.rb') do |f|

data/test/new_relic/agent/instrumentation/metric_frame_test.rb

@@ -4,7 +4,7 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','test_helper'))
 
-class NewRelic::Agent::Instrumentation::MetricFrameTest < Test::Unit::TestCase
+class NewRelic::Agent::Instrumentation::MetricFrameTest < MiniTest::Unit::TestCase
 
   # These tests are just here to make sure that we're maintaining the required
   # old interface for folks. Real testing of the underlying functionality

data/test/new_relic/agent/instrumentation/net_instrumentation_test.rb

@@ -7,7 +7,7 @@ require 'net/http'
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','test_helper'))
 require 'new_relic/agent/cross_app_tracing'
 
-class NewRelic::Agent::Instrumentation::NetInstrumentationTest < Test::Unit::TestCase
+class NewRelic::Agent::Instrumentation::NetInstrumentationTest < MiniTest::Unit::TestCase
   def setup
     NewRelic::Agent.manual_start(
       :"cross_application_tracer.enabled" => false,
@@ -25,11 +25,9 @@ class NewRelic::Agent::Instrumentation::NetInstrumentationTest < Test::Unit::Tes
   def test_scope_stack_integrity_maintained_on_request_failure
     @socket.stubs(:write).raises('fake network error')
     with_config(:"cross_application_tracer.enabled" => true) do
-      assert_nothing_raised do
-        expected = @engine.push_scope('dummy')
-        Net::HTTP.get(URI.parse('http://www.google.com/index.html')) rescue nil
-        @engine.pop_scope(expected, 42)
-      end
+      expected = @engine.push_scope('dummy')
+      Net::HTTP.get(URI.parse('http://www.google.com/index.html')) rescue nil
+      @engine.pop_scope(expected, 42)
     end
   end
 

data/test/new_relic/agent/instrumentation/queue_time_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::Agent::Instrumentation::QueueTimeTest < Test::Unit::TestCase
+class NewRelic::Agent::Instrumentation::QueueTimeTest < MiniTest::Unit::TestCase
   include NewRelic::Agent::Instrumentation
 
   def setup

data/test/new_relic/agent/instrumentation/rack_test.rb

@@ -17,7 +17,7 @@ class MinimalRackApp
   include NewRelic::Agent::Instrumentation::Rack
 end
 
-class NewRelic::Agent::Instrumentation::RackTest < Test::Unit::TestCase
+class NewRelic::Agent::Instrumentation::RackTest < MiniTest::Unit::TestCase
 
   def test_basic_rack_app
     # should return what we send in, even when instrumented

data/test/new_relic/agent/instrumentation/sinatra/transaction_namer_test.rb

@@ -10,7 +10,7 @@ module NewRelic
     module Instrumentation
       module Sinatra
 
-        class TransactionNamerTest < Test::Unit::TestCase
+        class TransactionNamerTest < MiniTest::Unit::TestCase
 
           def test_transaction_name_for_route
             env = { "newrelic.last_route" => /^\/the_route$/}

data/test/new_relic/agent/instrumentation/sinatra_test.rb

@@ -5,7 +5,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper'))
 require 'new_relic/agent/instrumentation/sinatra'
 
-class NewRelic::Agent::Instrumentation::SinatraTest < Test::Unit::TestCase
+class NewRelic::Agent::Instrumentation::SinatraTest < MiniTest::Unit::TestCase
 
   # This fake app is not an actual Sinatra app to avoid having our unit tests
   # take a dependency directly on it. If you need actual Sinatra classes, go

data/test/new_relic/agent/instrumentation/task_instrumentation_test.rb

@@ -4,7 +4,7 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper'))
 
-class NewRelic::Agent::Instrumentation::TaskInstrumentationTest < Test::Unit::TestCase
+class NewRelic::Agent::Instrumentation::TaskInstrumentationTest < MiniTest::Unit::TestCase
   include NewRelic::Agent::Instrumentation::ControllerInstrumentation
 
   def run_task_inner(n)
@@ -112,8 +112,8 @@ class NewRelic::Agent::Instrumentation::TaskInstrumentationTest < Test::Unit::Te
     assert_metrics_not_recorded(['Controller'])
 
     sample = @agent.transaction_sampler.last_sample
-    assert_not_nil(sample)
-    assert_not_nil(sample.params[:custom_params][:cpu_time], "cpu time nil: \n#{sample}")
+    refute_nil(sample)
+    refute_nil(sample.params[:custom_params][:cpu_time], "cpu time nil: \n#{sample}")
     assert((sample.params[:custom_params][:cpu_time] >= 0), "cpu time: #{sample.params[:cpu_time]},\n#{sample}")
     assert_equal('10', sample.params[:request_params][:level])
   end
@@ -137,13 +137,13 @@ class NewRelic::Agent::Instrumentation::TaskInstrumentationTest < Test::Unit::Te
 
     assert_metrics_recorded(['Controller/NewRelic::Agent::Instrumentation::TaskInstrumentationTest/hello'])
     sample = @agent.transaction_sampler.last_sample
-    assert_not_nil(sample)
+    refute_nil(sample)
     assert_equal(account, sample.params[:request_params][:account])
   end
 
   def test_errors_are_noticed_and_not_swallowed
     @agent.error_collector.expects(:notice_error).once
-    assert_raise(RuntimeError) { run_task_exception }
+    assert_raises(RuntimeError) { run_task_exception }
   end
 
   def test_error_collector_captures_custom_params
@@ -154,8 +154,8 @@ class NewRelic::Agent::Instrumentation::TaskInstrumentationTest < Test::Unit::Te
     assert_equal(1, errors.size)
     error = errors.first
     assert_equal("Controller/NewRelic::Agent::Instrumentation::TaskInstrumentationTest/run_task_exception", error.path)
-    assert_not_nil(error.params[:stack_trace])
-    assert_not_nil(error.params[:custom_params])
+    refute_nil(error.params[:stack_trace])
+    refute_nil(error.params[:custom_params])
   end
 
   def test_instrument_background_job

data/test/new_relic/agent/javascript_instrumentor_test.rb

@@ -6,7 +6,7 @@ require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper
 require "new_relic/agent/javascript_instrumentor"
 require "base64"
 
-class NewRelic::Agent::JavascriptInstrumentorTest < Test::Unit::TestCase
+class NewRelic::Agent::JavascriptInstrumentorTest < MiniTest::Unit::TestCase
   attr_reader :instrumentor
 
   def setup
@@ -142,53 +142,34 @@ class NewRelic::Agent::JavascriptInstrumentorTest < Test::Unit::TestCase
     end
   end
 
-  def test_data_for_js_agent_extra_parameter
+  def test_browser_timing_header_safe_when_insert_js_fails
     in_transaction do
-      with_config(CAPTURE_ATTRIBUTES_PAGE_EVENTS => true) do
-        NewRelic::Agent.add_custom_parameters({:boo => "hoo"})
-        assert_equal({:boo => "hoo"}, instrumentor.data_for_js_agent_extra_parameter)
-      end
+      NewRelic::Agent.stubs(:config).raises("Hahahaha")
+      assert_equal "", instrumentor.browser_timing_header
     end
+  ensure
+    # Teardown touches config, so make sure we're clean before we bail here
+    NewRelic::Agent.unstub(:config)
   end
 
-  def test_data_for_js_agent_extra_parameter_outside_transaction
-    with_config(CAPTURE_ATTRIBUTES_PAGE_EVENTS => true) do
-      NewRelic::Agent.add_custom_parameters({:boo => "hoo"})
-      assert_empty instrumentor.data_for_js_agent_extra_parameter
+  def test_browser_timing_header_safe_when_loader_generation_fails
+    in_transaction do
+      instrumentor.stubs(:html_safe_if_needed).raises("Hahahaha")
+      assert_equal "", instrumentor.browser_timing_header
     end
   end
 
-  def test_format
-    assert_formatted({:a => "1", "b" => 2}, "a=1", "b=#2")
-  end
-
-  def test_format_extra_data_escaping
-    assert_formatted({"semi;colon" => "gets;escaped"}, "semi:colon=gets:escaped")
-    assert_formatted({"equal=key" => "equal=value"}, "equal-key=equal-value")
-    assert_formatted({'"quoted"' => '"marks"'}, %Q['quoted'='marks'])
-  end
-
-  def test_format_extra_data_disallowed_types
-    assert_formatted_empty({"nested" => { "hashes?" => "nope" }})
-    assert_formatted_empty({"lists" => ["are", "they", "allowed?", "nope"]})
-  end
-
-  def assert_formatted(data, *expected)
-    result = instrumentor.format_extra_data(data).split(";")
-    expected.each do |expect|
-      assert_includes(result, expect)
+  def test_browser_timing_header_safe_when_json_dump_fails
+    in_transaction do
+      NewRelic::JSONWrapper.stubs(:dump).raises("Serialize? Hahahaha")
+      assert_equal "", instrumentor.browser_timing_header
     end
   end
 
-  def assert_formatted_empty(data)
-    result = instrumentor.format_extra_data(data)
-    assert_equal("", result)
-  end
-
   def test_config_data_for_js_agent
     freeze_time
     in_transaction do
-      with_config(CAPTURE_ATTRIBUTES_PAGE_EVENTS => true) do
+      with_config(CAPTURE_ATTRIBUTES => true) do
         NewRelic::Agent.set_user_attributes(:user => "user")
 
         txn = NewRelic::Agent::Transaction.current
@@ -212,7 +193,7 @@ class NewRelic::Agent::JavascriptInstrumentorTest < Test::Unit::TestCase
           "ttGuid"          => "ABC",
           "agentToken"      => "0123456789ABCDEF",
           "agent"           => "",
-          "extra"           => pack("user=user")
+          "userAttributes"  => pack('{"user":"user"}')
         }
 
         assert_equal(expected, data)
@@ -227,7 +208,7 @@ class NewRelic::Agent::JavascriptInstrumentorTest < Test::Unit::TestCase
 
   def test_ssl_for_http_not_included_by_default
     data = instrumentor.data_for_js_agent
-    assert_false data.include?("sslForHttp")
+    assert_not_includes data, "sslForHttp"
   end
 
   def test_ssl_for_http_enabled
@@ -244,42 +225,48 @@ class NewRelic::Agent::JavascriptInstrumentorTest < Test::Unit::TestCase
     end
   end
 
-  ANALYTICS_ENABLED = :'analytics_events.enabled'
-  CAPTURE_ATTRIBUTES_PAGE_EVENTS = :'capture_attributes.page_view_events'
+  CAPTURE_ATTRIBUTES = :'browser_monitoring.capture_attributes'
+  CAPTURE_ATTRIBUTES_DEPRECATED = :'capture_attributes.page_view_events'
 
-  def test_data_for_js_agent_doesnt_pick_up_extras_by_default
+  def test_data_for_js_agent_doesnt_get_custom_parameters_by_default
     in_transaction do
       NewRelic::Agent.add_custom_parameters({:boo => "hoo"})
-      assert_extra_data_is("")
+      assert_user_attributes_missing
+    end
+  end
+
+  def test_data_for_js_agent_doesnt_get_custom_parameters_outside_transaction
+    with_config(CAPTURE_ATTRIBUTES => true) do
+      NewRelic::Agent.add_custom_parameters({:boo => "hoo"})
+      assert_user_attributes_missing
     end
   end
 
-  def test_data_for_js_agent_picks_up_extras_when_configured
+
+  def test_data_for_js_agent_gets_custom_parameters_when_configured
     in_transaction do
-      with_config(ANALYTICS_ENABLED => true,
-                  CAPTURE_ATTRIBUTES_PAGE_EVENTS => true) do
+      with_config(CAPTURE_ATTRIBUTES => true) do
         NewRelic::Agent.add_custom_parameters({:boo => "hoo"})
-        assert_extra_data_is("boo=hoo")
+        assert_user_attributes_are('{"boo":"hoo"}')
       end
     end
   end
 
-  def test_data_for_js_agent_ignores_extras_if_no_analytics
+  def test_data_for_js_agent_ignores_custom_parameters_by_config
     in_transaction do
-      with_config(ANALYTICS_ENABLED => false,
-                  CAPTURE_ATTRIBUTES_PAGE_EVENTS => true) do
+      with_config(CAPTURE_ATTRIBUTES => false) do
         NewRelic::Agent.add_custom_parameters({:boo => "hoo"})
-        assert_extra_data_is("")
+        assert_user_attributes_missing
       end
     end
   end
 
-  def test_data_for_js_agent_ignores_extras_if_not_allowed_in_page
+  def test_data_for_js_agent_gets_custom_parameters_with_deprecated_key
     in_transaction do
-      with_config(ANALYTICS_ENABLED => true,
-                  CAPTURE_ATTRIBUTES_PAGE_EVENTS => false) do
+      with_config(CAPTURE_ATTRIBUTES => false,
+                  CAPTURE_ATTRIBUTES_DEPRECATED => true) do
         NewRelic::Agent.add_custom_parameters({:boo => "hoo"})
-        assert_extra_data_is("")
+        assert_user_attributes_are('{"boo":"hoo"}')
       end
     end
   end
@@ -318,9 +305,14 @@ class NewRelic::Agent::JavascriptInstrumentorTest < Test::Unit::TestCase
     assert(footer.include?(snippet), "Expected footer to include snippet: #{snippet}, but instead was #{footer}")
   end
 
-  def assert_extra_data_is(expected)
+  def assert_user_attributes_are(expected)
+    data = instrumentor.data_for_js_agent
+    assert_equal pack(expected), data["userAttributes"]
+  end
+
+  def assert_user_attributes_missing
     data = instrumentor.data_for_js_agent
-    assert_equal pack(expected), data["extra"]
+    assert_not_includes data, "userAttributes"
   end
 
   def pack(text)

data/test/new_relic/agent/memcache_instrumentation_test.rb

@@ -28,7 +28,7 @@ rescue Errno::ETIMEDOUT
 end
 
 if memcached_ready
-  class NewRelic::Agent::MemcacheInstrumentationTest < Test::Unit::TestCase
+  class NewRelic::Agent::MemcacheInstrumentationTest < MiniTest::Unit::TestCase
     include NewRelic::Agent::Instrumentation::ControllerInstrumentation
 
     def setup

data/test/new_relic/agent/memory_logger_test.rb

@@ -5,7 +5,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
 require 'new_relic/agent/memory_logger'
 
-class MemoryLoggerTest < Test::Unit::TestCase
+class MemoryLoggerTest < MiniTest::Unit::TestCase
   LEVELS = [:fatal, :error, :warn, :info, :debug]
 
   def setup

data/test/new_relic/agent/method_interrobang_test.rb

@@ -2,11 +2,10 @@
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
-require 'test/unit'
-require 'newrelic_rpm'
+require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
 require 'new_relic/agent/method_tracer'
 
-class MethodInterrobangTest < Test::Unit::TestCase
+class MethodInterrobangTest < MiniTest::Unit::TestCase
 	include NewRelic::Agent::MethodTracer
 
 	def interrogate?

data/test/new_relic/agent/method_tracer/class_methods/add_method_tracer_test.rb

@@ -10,12 +10,12 @@ module NewRelic
     class Agent
       module MethodTracer
         module ClassMethods
-          class AddMethodTracerTest < Test::Unit::TestCase
+          class AddMethodTracerTest < MiniTest::Unit::TestCase
             #  require 'new_relic/agent/method_tracer'
             include NewRelic::Agent::MethodTracer::ClassMethods::AddMethodTracer
 
             def test_validate_options_nonhash
-              assert_raise(TypeError) do
+              assert_raises(TypeError) do
                 validate_options([])
               end
             end
@@ -99,7 +99,7 @@ module NewRelic
             end
 
             def test_check_for_illegal_keys_positive
-              assert_raise(RuntimeError) do
+              assert_raises(RuntimeError) do
                 check_for_illegal_keys!({:unknown_key => nil})
               end
             end
@@ -138,7 +138,7 @@ module NewRelic
             end
 
             def test_check_for_push_scope_and_metric_negative
-              assert_raise(RuntimeError) do
+              assert_raises(RuntimeError) do
                 check_for_push_scope_and_metric({:push_scope => false, :metric => false})
               end
             end

data/test/new_relic/agent/method_tracer/instance_methods/trace_execution_scoped_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::Agent::MethodTracer::TraceExecutionScopedTest < Test::Unit::TestCase
+class NewRelic::Agent::MethodTracer::TraceExecutionScopedTest < MiniTest::Unit::TestCase
   require 'new_relic/agent/method_tracer'
   include NewRelic::Agent::MethodTracer
 

data/test/new_relic/agent/method_tracer_test.rb

@@ -58,7 +58,7 @@ module TestModuleWithLog
   add_method_tracer :other_method, 'Custom/foo/bar'
 end
 
-class NewRelic::Agent::MethodTracerTest < Test::Unit::TestCase
+class NewRelic::Agent::MethodTracerTest < MiniTest::Unit::TestCase
   attr_reader :stats_engine
 
   def setup
@@ -93,9 +93,8 @@ class NewRelic::Agent::MethodTracerTest < Test::Unit::TestCase
   end
 
   def test_record_metrics_does_not_raise_outside_transaction
-    assert_nothing_raised do
-      NewRelic::Agent::MethodTracer::TraceExecutionScoped.record_metrics('a', ['b'], 12, 10, :metric => true)
-    end
+    NewRelic::Agent::MethodTracer::TraceExecutionScoped.record_metrics('a', ['b'], 12, 10, :metric => true)
+
     expected = { :call_count => 1, :total_call_time => 12, :total_exclusive_time => 10 }
     assert_metrics_recorded('a' => expected, 'b' => expected)
   end
@@ -190,9 +189,9 @@ class NewRelic::Agent::MethodTracerTest < Test::Unit::TestCase
 
     method_c1
 
-    assert_not_nil @stats_engine.lookup_stats("c1")
+    refute_nil @stats_engine.lookup_stats("c1")
     assert_nil @stats_engine.lookup_stats("c2")
-    assert_not_nil @stats_engine.lookup_stats("c3")
+    refute_nil @stats_engine.lookup_stats("c3")
 
     assert_equal ['c2', 'c1'], @scope_listener.scopes
   end
@@ -213,7 +212,7 @@ class NewRelic::Agent::MethodTracerTest < Test::Unit::TestCase
     stats = @stats_engine.get_stats("thrower")
     assert_equal 6, stats.call_count
     sample = @old_sampler.harvest!
-    assert_not_nil sample
+    refute_nil sample
   end
 
   def test_add_same_tracer_twice