newrelic_rpm 3.4.1 → 3.4.2.beta1

data/test/new_relic/agent/transaction_info_test.rb

@@ -3,11 +3,52 @@ require 'ostruct'
 
 class NewRelic::Agent::TransactionInfoTest < Test::Unit::TestCase
   def setup
-    @request = OpenStruct.new(:cookies => {'NRAGENT' => 'tk=1234<tag>evil</tag>5678'})
+    @request = OpenStruct.new(:cookies => {'NRAGENT' => 'tk=12345678'})
+    @request_with_embedded_tag = OpenStruct.new(:cookies => {'NRAGENT' => 'tk=1234<tag>evil</tag>5678'})
+    @request_with_embedded_utf8_encoded_js = OpenStruct.new(:cookies => {'NRAGENT' => "tk=1234&#34&#93&#41&#595678"})
+    @request_with_double_quotes = OpenStruct.new(:cookies => {'NRAGENT' => 'tk="""deadbeef"""'})
+    @request_with_single_quotes = OpenStruct.new(:cookies => {'NRAGENT' => "tk='''deadbeef'''"})
+    @request_with_multi_lt = OpenStruct.new(:cookies => {'NRAGENT' => 'tk=<<<deadbeef'})
+    @request_with_multi_gt = OpenStruct.new(:cookies => {'NRAGENT' => 'tk=>>>deadbeef'}) 
+    @request_with_bare_token = OpenStruct.new(:cookies => {'NRAGENT' => 0xdeadbeef})
+    @request_with_nil_token = OpenStruct.new(:cookies => {'NRAGENT' => nil})
   end
   
-  def test_get_token_gets_sanitized_token_from_cookie
-    assert_equal('1234&lt;tag&gt;evil&lt;/tag&gt;5678',
-                 NewRelic::Agent::TransactionInfo.get_token(@request))
+  def test_get_token_safe_token_returned_untouched
+    assert_equal("12345678", NewRelic::Agent::TransactionInfo.get_token(@request))
   end
+
+  def test_get_token_with_embedded_tags_sanitized
+  	assert_equal("",NewRelic::Agent::TransactionInfo.get_token(@request_with_embedded_tag))
+  end
+
+  def test_get_token_with_embedded_utf8_js_sanitized
+  	assert_equal("1234&amp;#34&amp;#93&amp;#41&amp;#595678",
+  		NewRelic::Agent::TransactionInfo.get_token(@request_with_embedded_utf8_encoded_js))	
+  end
+
+  def test_get_token_replaces_double_quoted_token_with_empty_string
+  	assert_equal("", NewRelic::Agent::TransactionInfo.get_token(@request_with_double_quotes))
+  end
+
+  def test_get_token_replaces_single_quoted_toket_with_empty_string
+  	assert_equal("", NewRelic::Agent::TransactionInfo.get_token(@request_with_single_quotes))
+  end
+
+  def test_get_token_replaces_token_started_with_multiple_Lt_with_empty_string
+  	assert_equal("", NewRelic::Agent::TransactionInfo.get_token(@request_with_multi_lt))
+  end
+
+  def test_get_token_replaces_token_started_with_multiple_gt_with_empty_string
+  	assert_equal("", NewRelic::Agent::TransactionInfo.get_token(@request_with_multi_gt))
+  end
+
+  def test_get_token_bare_value_replaced_with_nil
+  	assert_equal(nil,NewRelic::Agent::TransactionInfo.get_token(@request_with_bare_token))
+  end
+
+  def test_get_token_nil_token_returns_nil_token
+  	assert_equal(nil,NewRelic::Agent::TransactionInfo.get_token(@request_with_ni_token))
+  end
+
 end

data/test/new_relic/agent/transaction_sampler_test.rb

@@ -27,11 +27,15 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
     agent.stubs(:stats_engine).returns(stats_engine)
     @sampler = NewRelic::Agent::TransactionSampler.new
     stats_engine.transaction_sampler = @sampler
+    @test_config = { 'developer_mode' => true }
+    NewRelic::Agent.config.apply_config(@test_config)
+    @sampler.configure!
   end
 
   def teardown
     super
     Thread.current[:transaction_sample_builder] = nil
+    NewRelic::Agent.config.remove_config(@test_config)
   end
 
   def test_initialize
@@ -58,12 +62,17 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
   end
 
   def test_configure
-    control = NewRelic::Control.instance
-    control.merge_options('transaction_tracer' => {'stack_trace_threshold' => 5.0, 'limit_segments' => 20, 'explain_threshold' => 4.0})
-    @sampler.configure!
-    assert_equal 20, @sampler.instance_variable_get('@segment_limit')
-    assert_equal 5.0, @sampler.instance_variable_get('@stack_trace_threshold')
-    assert_equal 4.0, @sampler.instance_variable_get('@explain_threshold')
+    test_config = {
+      'transaction_tracer.stack_trace_threshold' => 5.0,
+      'transaction_tracer.limit_segments'        => 20,
+      'transaction_tracer.explain_threshold'     => 4.0
+    }
+    with_config(test_config) do
+      @sampler.configure!
+      assert_equal 20, @sampler.instance_variable_get('@segment_limit')
+      assert_equal 5.0, @sampler.instance_variable_get('@stack_trace_threshold')
+      assert_equal 4.0, @sampler.instance_variable_get('@explain_threshold')
+    end
   end
 
   def test_current_sample_id_default
@@ -124,17 +133,15 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
   end
 
   def test_notice_push_scope_with_builder
-    NewRelic::Control.instance.expects(:developer_mode?).returns(false)
-    builder = mock('builder')
-    builder.expects(:trace_entry).with('a scope', 100.0)
-    @sampler.expects(:builder).returns(builder).twice
-
-    @sampler.notice_push_scope('a scope', Time.at(100))
+    with_config(:developer_mode => false) do
+      builder = mock('builder')
+      builder.expects(:trace_entry).with('a scope', 100.0)
+      @sampler.expects(:builder).returns(builder).twice
+      @sampler.notice_push_scope('a scope', Time.at(100))
+    end
   end
 
   def test_notice_push_scope_in_dev_mode
-    NewRelic::Control.instance.expects(:developer_mode?).returns(true)
-
     builder = mock('builder')
     builder.expects(:trace_entry).with('a scope', 100.0)
     @sampler.expects(:builder).returns(builder).twice
@@ -239,7 +246,6 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
   end
 
   def test_store_sample_for_developer_mode_in_dev_mode
-    NewRelic::Control.instance.expects(:developer_mode?).returns(true)
     sample = mock('sample')
     @sampler.expects(:truncate_samples)
     @sampler.store_sample_for_developer_mode(sample)
@@ -247,11 +253,12 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
   end
 
   def test_store_sample_for_developer_mode_no_dev
-    NewRelic::Control.instance.stubs(:developer_mode?).returns(false)
-    @sampler.configure!
-    sample = mock('sample')
-    @sampler.store_sample_for_developer_mode(sample)
-    assert_equal([], @sampler.instance_variable_get('@samples'))
+    with_config(:developer_mode => false) do
+      @sampler.configure!
+      sample = mock('sample')
+      @sampler.store_sample_for_developer_mode(sample)
+      assert_equal([], @sampler.instance_variable_get('@samples'))
+    end
   end
 
   def test_store_slowest_sample_new_is_slowest
@@ -917,38 +924,35 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
 
   def test_param_capture
     [true, false].each do |capture|
-      NewRelic::Control.instance.stubs(:capture_params).returns(capture)
-      @sampler.notice_first_scope_push Time.now.to_f
-      @sampler.notice_transaction('/path', nil, {:param => 'hi'})
-      @sampler.notice_scope_empty
+      with_config(:capture_params => capture) do
+        @sampler.notice_first_scope_push Time.now.to_f
+        @sampler.notice_transaction('/path', nil, {:param => 'hi'})
+        @sampler.notice_scope_empty
 
-      tt = @sampler.harvest(nil,0)[0]
+        tt = @sampler.harvest(nil,0)[0]
 
-      assert_equal (capture) ? 1 : 0, tt.params[:request_params].length
+        assert_equal (capture) ? 1 : 0, tt.params[:request_params].length
+      end
     end
   end
-  
+
   def test_should_not_collect_segments_beyond_limit
-    NewRelic::Control.instance.merge_options('transaction_tracer' => {
-                                               'limit_segments' => 3,
-                                             })
-    @sampler.configure!
-    run_sample_trace do
-      @sampler.notice_push_scope 'a1'
-      @sampler.notice_sql("SELECT * FROM sandwiches WHERE bread = 'hallah'", nil, 0)
-      @sampler.notice_push_scope 'a11'
-      @sampler.notice_sql("SELECT * FROM sandwiches WHERE bread = 'semolina'", nil, 0)
-      @sampler.notice_pop_scope "a11"
-      @sampler.notice_pop_scope "a1"
+    with_config(:'transaction_tracer.limit_segments' => 3) do
+      @sampler.configure!
+      run_sample_trace do
+        @sampler.notice_push_scope 'a1'
+        @sampler.notice_sql("SELECT * FROM sandwiches WHERE bread = 'hallah'", nil, 0)
+        @sampler.notice_push_scope 'a11'
+        @sampler.notice_sql("SELECT * FROM sandwiches WHERE bread = 'semolina'", nil, 0)
+        @sampler.notice_pop_scope "a11"
+        @sampler.notice_pop_scope "a1"
+      end
+      assert_equal 3, @sampler.samples[0].count_segments
     end
-    assert_equal 3, @sampler.samples[0].count_segments
-    NewRelic::Control.instance.merge_options('transaction_tracer' => {
-                                               'limit_segments' => 4000,
-                                             })
   end
-  
+
   private
-  
+
   def run_sample_trace
     @sampler.notice_first_scope_push Time.now.to_f
     @sampler.notice_transaction '/path', nil, {}

data/test/new_relic/agent_test.rb

@@ -3,7 +3,7 @@ require 'ostruct'
 
 module NewRelic
   class MainAgentTest < Test::Unit::TestCase
-    
+
     # mostly this module just passes through to the active agent
     # through the agent method or the control instance through
     # NewRelic::Control.instance . But it's nice to make sure.
@@ -12,13 +12,42 @@ module NewRelic
       super
       Thread.current[:newrelic_untraced] = nil
     end
-    
+
     def test_shutdown
       mock_agent = mocked_agent
       mock_agent.expects(:shutdown).with({})
       NewRelic::Agent.shutdown
     end
 
+    def test_shutdown_removes_manual_startup_config
+      NewRelic::Agent.manual_start(:some_absurd_setting => true)
+      assert NewRelic::Agent.config[:some_absurd_setting]
+      NewRelic::Agent.shutdown
+      assert !NewRelic::Agent.config[:some_absurd_setting]
+    end
+
+    def test_shutdown_removes_server_config
+      NewRelic::Agent.manual_start
+      NewRelic::Agent.instance.finish_setup('listen_to_server_config' => true,
+                                            :some_absurd_setting => true)
+      assert NewRelic::Agent.config[:some_absurd_setting]
+      NewRelic::Agent.shutdown
+      assert !NewRelic::Agent.config[:some_absurd_setting]
+    end
+
+    def test_finish_setup_applied_server_side_config
+      with_config({:'transction_tracer.enabled' => true, 'error_collector.enabled' => true,
+                    :log_level => 'info'}, 2) do
+        NewRelic::Agent.instance.finish_setup('listen_to_server_config' => true,
+                                              'transaction_tracer.enabled' => false,
+                                              'collect_errors' => false,
+                                              'log_level' => 'debug')
+        assert !NewRelic::Agent.config[:'transaction_tracer.enabled']
+        assert !NewRelic::Agent.config[:'error_collector.enabled']
+        assert_equal 'debug', NewRelic::Agent.config[:log_level]
+      end
+    end
+
     def test_after_fork
       mock_agent = mocked_agent
       mock_agent.expects(:after_fork).with({})
@@ -32,43 +61,41 @@ module NewRelic
 
       assert agent.forked?
     end
-    
 
     if NewRelic::LanguageSupport.can_fork? &&
         !NewRelic::LanguageSupport.using_version?('1.9.1')
       def test_timeslice_harvest_with_after_fork_report_to_channel
-        NewRelic::Control.instance.stubs(:agent_enabled?).returns(true)
-        NewRelic::Control.instance.stubs(:monitor_mode?).returns(true)
-        
-        NewRelic::Agent::Agent.instance.service = NewRelic::FakeService.new
-        NewRelic::Agent.shutdown # make sure the agent is not already started
-        NewRelic::Agent.manual_start(:license_key => ('1234567890' * 4),
-                                     :start_channel_listener => true)
-        
-        metric = 'Custom/test/method'
-        NewRelic::Agent.instance.stats_engine.get_stats_no_scope(metric) \
-          .record_data_point(1.0)
-        
-        # ensure that cached metric ids don't interfere with metric merging
-        NewRelic::Agent.agent.instance_variable_set(:@metric_ids,
-                                    {NewRelic::MetricSpec.new('Instance/Busy') => 1})
-        
-        NewRelic::Agent::PipeChannelManager.listener.close_all_pipes
-        NewRelic::Agent.register_report_channel(:agent_test) # before fork
-        pid = Process.fork do
-          NewRelic::Agent.after_fork(:report_to_channel => :agent_test)
-          NewRelic::Agent.agent.stats_engine.get_stats_no_scope(metric) \
-            .record_data_point(2.0)
+        with_config(:agent_enabled => true, :monitor_mode => true) do
+          NewRelic::Agent::Agent.instance.service = NewRelic::FakeService.new
+          NewRelic::Agent.shutdown # make sure the agent is not already started
+          NewRelic::Agent.manual_start(:license_key => ('1234567890' * 4),
+                                       :start_channel_listener => true)
+
+          metric = 'Custom/test/method'
+          NewRelic::Agent.instance.stats_engine.get_stats_no_scope(metric) \
+            .record_data_point(1.0)
+
+          # ensure that cached metric ids don't interfere with metric merging
+          NewRelic::Agent.agent.instance_variable_set(:@metric_ids,
+                            { NewRelic::MetricSpec.new('Instance/Busy') => 1 })
+
+          NewRelic::Agent::PipeChannelManager.listener.close_all_pipes
+          NewRelic::Agent.register_report_channel(:agent_test) # before fork
+          pid = Process.fork do
+            NewRelic::Agent.after_fork(:report_to_channel => :agent_test)
+            NewRelic::Agent.agent.stats_engine.get_stats_no_scope(metric) \
+              .record_data_point(2.0)
+          end
+          Process.wait(pid)
+          NewRelic::Agent::PipeChannelManager.listener.stop
+
+          engine = NewRelic::Agent.agent.stats_engine
+          assert_equal(3.0, engine.lookup_stats(metric).total_call_time)
+          assert_equal(2, engine.lookup_stats(metric).call_count)
         end
-        Process.wait(pid)
-        NewRelic::Agent::PipeChannelManager.listener.stop
-        
-        engine = NewRelic::Agent.agent.stats_engine
-        assert_equal(3.0, engine.lookup_stats(metric).total_call_time)
-        assert_equal(2, engine.lookup_stats(metric).call_count)
       end
     end
-    
+
     def test_reset_stats
       mock_agent = mocked_agent
       mock_agent.expects(:reset_stats)
@@ -80,7 +107,7 @@ module NewRelic
       mock_control.expects(:init_plugin).with({:agent_enabled => true, :sync_startup => true})
       NewRelic::Agent.manual_start
     end
-    
+
     def test_manual_start_with_opts
       mock_control = mocked_control
       mock_control.expects(:init_plugin).with({:agent_enabled => true, :sync_startup => false})
@@ -121,7 +148,7 @@ module NewRelic
       mock_stats_engine.expects(:get_stats).with('Custom/test/metric', false)
       NewRelic::Agent.get_stats('Custom/test/metric')
     end
-    
+
     # note that this is the same as get_stats above, they're just aliases
     def test_get_stats_no_scope
       agent = mocked_agent
@@ -166,7 +193,7 @@ module NewRelic
       Thread.current[:record_tt] = false
       assert_equal(false, NewRelic::Agent.is_transaction_traced?, 'should be false since the thread local is false')
     end
-    
+
     def test_is_sql_recorded_true
       Thread.current[:record_sql] = true
       assert_equal(true, NewRelic::Agent.is_sql_recorded?, 'should be true since the thread local is set')
@@ -181,7 +208,7 @@ module NewRelic
       Thread.current[:record_sql] = false
       assert_equal(false, NewRelic::Agent.is_sql_recorded?, 'should be false since the thread local is false')
     end
-    
+
     def test_is_execution_traced_true
       Thread.current[:newrelic_untraced] = [true, true]
       assert_equal(true, NewRelic::Agent.is_execution_traced?, 'should be true since the thread local is set')
@@ -201,18 +228,18 @@ module NewRelic
       Thread.current[:newrelic_untraced] = [true, false]
       assert_equal(false, NewRelic::Agent.is_execution_traced?, 'should be false since the thread local stack has the last element false')
     end
-    
+
     def test_instance
       assert_equal(NewRelic::Agent.agent, NewRelic::Agent.instance, "should return the same agent for both identical methods")
     end
-    
+
     def test_register_report_channel
       NewRelic::Agent.register_report_channel(:channel_id)
       assert NewRelic::Agent::PipeChannelManager.channels[:channel_id] \
         .kind_of?(NewRelic::Agent::PipeChannelManager::Pipe)
       NewRelic::Agent::PipeChannelManager.listener.close_all_pipes
     end
-    
+
     private
 
     def mocked_agent
@@ -220,7 +247,7 @@ module NewRelic
       NewRelic::Agent.stubs(:agent).returns(agent)
       agent
     end
-    
+
     def mocked_control
       server = NewRelic::Control::Server.new('localhost', 3000)
       control = OpenStruct.new(:license_key => 'abcdef',
@@ -229,7 +256,7 @@ module NewRelic
         def [](key)
           nil
         end
-        
+
         def fetch(k,d)
           nil
         end

data/test/new_relic/collection_helper_test.rb

@@ -24,7 +24,7 @@ class NewRelic::CollectionHelperTest < Test::Unit::TestCase
     assert_equal '1000', new_array[0]
   end
   def test_boolean
-    np = normalize_params(NewRelic::Control.instance.settings)
+    np = normalize_params('monitor_mode' => false)
     assert_equal false, np['monitor_mode']
   end
   def test_string__singleton
@@ -118,14 +118,13 @@ class NewRelic::CollectionHelperTest < Test::Unit::TestCase
   end
 
   def test_disabled_strip_backtrace
-    NewRelic::Control.instance['disable_backtrace_cleanup'] = true
-    clean_trace = strip_nr_from_backtrace(mock_backtrace)
-    assert_equal(1, clean_trace.grep(/new_relic/).size,
-            "should not remove instances of new relic from backtrace but got: #{clean_trace.join("\n")}")
-    assert_equal(1, clean_trace.grep(/_trace/).size, 
+    with_config(:disable_backtrace_cleanup => true) do
+      clean_trace = strip_nr_from_backtrace(mock_backtrace)
+      assert_equal(1, clean_trace.grep(/new_relic/).size,
+                   "should not remove instances of new relic from backtrace but got: #{clean_trace.join("\n")}")
+      assert_equal(1, clean_trace.grep(/_trace/).size,
                    "should not remove trace method tags from method names but got: #{clean_trace.join("\n")}")
-    #       assert (clean_trace.grep(/find/).size >= 3), "should see at least three frames with 'find' in them (#{e}): \n#{clean_trace.join("\n")}"
-    NewRelic::Control.instance['disable_backtrace_cleanup'] = false
+    end
   end
   
   private 

data/test/new_relic/command/deployments_test.rb

@@ -56,7 +56,19 @@ class NewRelic::Command::DeploymentsTest < Test::Unit::TestCase
 
     @deployment = nil
   end
+
+  def test_error_if_no_license_key
+    config = { 'license_key' => nil }
+    NewRelic::Agent.config.apply_config(config)
+      assert_raise NewRelic::Command::CommandFailure do
+        deployment = NewRelic::Command::Deployments.new(%w[-a APP -r 3838 --user=Bill] << "Some lengthy description")
+        deployment.run
+      end
+    NewRelic::Agent.config.remove_config(config)
+  end
+
   private
+
   def mock_the_connection
     mock_connection = mock()
     @mock_response = mock()
@@ -64,5 +76,4 @@ class NewRelic::Command::DeploymentsTest < Test::Unit::TestCase
     mock_connection.expects(:request).returns(@mock_response)
     NewRelic::Control.instance.stubs(:http_connection).returns(mock_connection)
   end
-
 end