newrelic_rpm 3.7.0.174.beta → 3.7.0.177

data/test/new_relic/agent/transaction_test.rb

@@ -11,7 +11,7 @@ class NewRelic::Agent::TransactionTest < Test::Unit::TestCase
   def setup
     @txn = NewRelic::Agent::Transaction.new
     @stats_engine = NewRelic::Agent.instance.stats_engine
-    @stats_engine.reset_stats
+    @stats_engine.reset!
   end
 
   def teardown

data/test/new_relic/agent/transaction_timings_test.rb

@@ -13,6 +13,21 @@ module NewRelic::Agent
       @name = "Name"
     end
 
+    def test_transaction_name
+      t = TransactionTimings.new(nil, nil, @name)
+      assert_equal "Name", t.transaction_name
+    end
+
+    def test_transaction_name_or_unknown
+      t = TransactionTimings.new(nil, nil, @name)
+      assert_equal "Name", t.transaction_name_or_unknown
+    end
+
+    def test_transaction_name_or_unknown_when_nil
+      t = TransactionTimings.new(nil, nil, nil)
+      assert_equal "(unknown)", t.transaction_name_or_unknown
+    end
+
     def test_queue_time_nil
       t = TransactionTimings.new(nil, @start_time, @name)
       assert_equal 0.0, t.queue_time_in_millis
@@ -65,11 +80,6 @@ module NewRelic::Agent
       assert_equal original, later
     end
 
-    def test_transaction_name
-      t = TransactionTimings.new(nil, nil, @name)
-      assert_equal "Name", t.transaction_name
-    end
-
     def test_clamp_to_positive
       t = TransactionTimings.new(nil, nil, nil)
       assert_equal(0.0, t.clamp_to_positive(-1), "should clamp a negative value to zero")

data/test/new_relic/agent/worker_loop_test.rb

@@ -71,15 +71,6 @@ class NewRelic::Agent::WorkerLoopTest < Test::Unit::TestCase
     end
   end
 
-  def test_task_error__server
-    expects_no_logging(:error)
-    expects_logging(:debug, any_parameters)
-    @worker_loop.run(0) do
-      @worker_loop.stop
-      raise NewRelic::Agent::ServerError, "Runtime Error Test"
-    end
-  end
-
   def test_worker_loop_propagates_errors_given_the_option
     @worker_loop = NewRelic::Agent::WorkerLoop.new(
       :limit => 2,

data/test/new_relic/agent_test.rb

@@ -66,7 +66,7 @@ module NewRelic
 
     def test_reset_stats
       mock_agent = mocked_agent
-      mock_agent.expects(:reset_stats)
+      mock_agent.expects(:drop_buffered_data)
       NewRelic::Agent.reset_stats
     end
 
@@ -88,18 +88,6 @@ module NewRelic
       NewRelic::Agent.shutdown
     end
 
-    def test_browser_timing_header
-      agent = mocked_agent
-      agent.expects(:browser_timing_header)
-      NewRelic::Agent.browser_timing_header
-    end
-
-    def test_browser_timing_footer
-      agent = mocked_agent
-      agent.expects(:browser_timing_footer)
-      NewRelic::Agent.browser_timing_footer
-    end
-
     def test_get_stats
       agent = mocked_agent
       mock_stats_engine = mock('stats_engine')
@@ -268,7 +256,7 @@ module NewRelic
 
     def test_set_transaction_name
       engine = NewRelic::Agent.instance.stats_engine
-      engine.reset_stats
+      engine.reset!
       Transactor.new.txn do
         NewRelic::Agent.set_transaction_name('new_name')
       end
@@ -281,7 +269,7 @@ module NewRelic
 
     def test_get_transaction_name_returns_the_default_txn_name
       engine = NewRelic::Agent.instance.stats_engine
-      engine.reset_stats
+      engine.reset!
       Transactor.new.txn do
         assert_equal 'NewRelic::MainAgentTest::Transactor/txn', NewRelic::Agent.get_transaction_name
       end
@@ -289,7 +277,7 @@ module NewRelic
 
     def test_get_transaction_name_returns_what_I_set
       engine = NewRelic::Agent.instance.stats_engine
-      engine.reset_stats
+      engine.reset!
       Transactor.new.txn do
         NewRelic::Agent.set_transaction_name('a_new_name')
         assert_equal 'a_new_name', NewRelic::Agent.get_transaction_name
@@ -298,7 +286,7 @@ module NewRelic
 
     def test_get_txn_name_and_set_txn_name_preserves_category
       engine = NewRelic::Agent.instance.stats_engine
-      engine.reset_stats
+      engine.reset!
       Transactor.new.txn do
         NewRelic::Agent.set_transaction_name('a_new_name', :category => :task)
         new_name = NewRelic::Agent.get_transaction_name + "2"
@@ -309,7 +297,7 @@ module NewRelic
 
     def test_set_transaction_name_applies_proper_scopes
       engine = NewRelic::Agent.instance.stats_engine
-      engine.reset_stats
+      engine.reset!
       Transactor.new.txn do
         trace_execution_scoped('Custom/something') {}
         NewRelic::Agent.set_transaction_name('new_name')
@@ -327,7 +315,7 @@ module NewRelic
 
     def test_set_transaction_name_gracefully_fails_when_frozen
       engine = NewRelic::Agent.instance.stats_engine
-      engine.reset_stats
+      engine.reset!
       Transactor.new.txn do
         NewRelic::Agent::Transaction.current.freeze_name
         NewRelic::Agent.set_transaction_name('new_name')
@@ -337,7 +325,7 @@ module NewRelic
 
     def test_set_transaction_name_applies_category
       engine = NewRelic::Agent.instance.stats_engine
-      engine.reset_stats
+      engine.reset!
       Transactor.new.txn do
         NewRelic::Agent.set_transaction_name('new_name', :category => :task)
       end
@@ -354,7 +342,7 @@ module NewRelic
 
     def test_set_transaction_name_uses_current_txn_category_default
       engine = NewRelic::Agent.instance.stats_engine
-      engine.reset_stats
+      engine.reset!
       Transactor.new.task_txn do
         NewRelic::Agent.set_transaction_name('new_name')
       end

data/test/new_relic/data_container_tests.rb

@@ -0,0 +1,72 @@
+# 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.
+
+# To use this module to test your new data container, implement the following
+# methods before including it:
+#
+# create_container -> create an instance of your data container class
+# populate_container(container, n) -> populate the container with n items
+#
+# If your container can only hold a fixed number of data items, you can also
+# implement #max_data_items to return the number of data items that it should be
+# populated with for the purposes of testing.
+
+module NewRelic
+  module BasicDataContainerTests
+    def num_data_items
+      self.respond_to?(:max_data_items) ? max_data_items : 5
+    end
+
+    def test_harvest_should_return_all_data_items
+      c = create_container
+      populate_container(c, num_data_items)
+      results = c.harvest!
+      assert_equal(num_data_items, results.size)
+    end
+
+    def test_calling_harvest_again_should_not_return_items_again
+      c = create_container
+      populate_container(c, num_data_items)
+
+      c.harvest! # clears container
+      results = c.harvest!
+      assert_equal(0, results.size)
+    end
+
+    def test_calling_harvest_after_re_populating_works
+      c = create_container
+      populate_container(c, num_data_items)
+      assert_equal(num_data_items, c.harvest!.size)
+
+      populate_container(c, num_data_items)
+      assert_equal(num_data_items, c.harvest!.size)
+    end
+
+    def test_should_respond_to_required_methods
+      c = create_container
+      assert c.respond_to?(:harvest!)
+      assert c.respond_to?(:reset!)
+      assert c.respond_to?(:merge!)
+    end
+  end
+
+  module DataContainerTests
+    include BasicDataContainerTests
+
+    def test_reset_should_clear_stored_items
+      c = create_container
+      populate_container(c, 5)
+      c.reset!
+      assert_equal(0, c.harvest!.size)
+    end
+
+    def test_merge_should_re_integrate_items
+      c = create_container
+      populate_container(c, 5)
+      c.merge!(c.harvest!)
+      results = c.harvest!
+      assert_equal(5, results.size)
+    end
+  end
+end

data/test/new_relic/fake_collector.rb

@@ -14,23 +14,61 @@ require 'json' if RUBY_VERSION >= '1.9'
 
 module NewRelic
   class FakeCollector < FakeServer
+    class Response
+      attr_reader :status, :body
+
+      def initialize(status, body)
+        @default_status = status
+        @default_body = body
+        @remaining = nil
+        revert
+      end
+
+      def override(status, body)
+        @status = status
+        @body = body
+        self
+      end
+
+      def revert
+        @status = @default_status
+        @body = @default_body
+        @remaining = nil
+      end
+
+      def once
+        @remaining = 1
+        self
+      end
+
+      def evaluate
+        if @remaining == 0
+          revert
+        elsif @remaining
+          @remaining -= 1
+        end
+        resolved_body = @body.respond_to?(:call) ? @body.call : @body
+        [@status, resolved_body]
+      end
+    end
+
     attr_accessor :agent_data, :mock
 
     def initialize
       super
       @id_counter = 0
-      @base_expectations = {
-        'get_redirect_host'       => [200, {'return_value' => 'localhost'}],
-        'connect'                 => [200, {'return_value' => {"agent_run_id" => agent_run_id}}],
-        'get_agent_commands'      => [200, {'return_value' => []}],
-        'agent_command_results'   => [200, {'return_value' => []}],
-        'metric_data'             => [200, {'return_value' => [[{'name' => 'Some/Metric/Spec'}, 1]]}],
-        'sql_trace_data'          => [200, {'return_value' => nil}],
-        'transaction_sample_data' => [200, {'return_value' => nil}],
-        'error_data'              => [200, {'return_value' => nil}],
-        'profile_data'            => [200, {'return_value' => nil}],
-        'shutdown'                => [200, {'return_value' => nil}],
-        'analytic_event_data'     => [200, {'return_value' => nil}]
+      @mock = {
+        'get_redirect_host'       => Response.new(200, {'return_value' => 'localhost'}),
+        'connect'                 => Response.new(200, Proc.new { {'return_value' => {"agent_run_id" => agent_run_id}} }),
+        'get_agent_commands'      => Response.new(200, {'return_value' => []}),
+        'agent_command_results'   => Response.new(200, {'return_value' => []}),
+        'metric_data'             => Response.new(200, {'return_value' => [[{'name' => 'Some/Metric/Spec'}, 1]]}),
+        'sql_trace_data'          => Response.new(200, {'return_value' => nil}),
+        'transaction_sample_data' => Response.new(200, {'return_value' => nil}),
+        'error_data'              => Response.new(200, {'return_value' => nil}),
+        'profile_data'            => Response.new(200, {'return_value' => nil}),
+        'shutdown'                => Response.new(200, {'return_value' => nil}),
+        'analytic_event_data'     => Response.new(200, {'return_value' => nil}),
       }
       reset
     end
@@ -40,13 +78,23 @@ module NewRelic
     end
 
     def reset
-      @mock = @base_expectations.dup
+      @mock.each_value(&:revert)
       @id_counter = 0
       @agent_data = []
     end
 
+    def default_response
+      Response.new(200, {'return_value' => nil})
+    end
+
     def stub(method, return_value, status=200)
-      self.mock[method] = [status, {'return_value' => return_value}]
+      self.mock[method] ||= default_response
+      self.mock[method].override(status, {'return_value' => return_value})
+    end
+
+    def stub_exception(method, exception, status=200)
+      self.mock[method] ||= default_response
+      self.mock[method].override(status, {'exception' => exception})
     end
 
     def call(env)
@@ -58,11 +106,12 @@ module NewRelic
         method = $1
         format = json_format?(uri) && RUBY_VERSION >= '1.9' ? :json : :pruby
         if @mock.keys.include? method
-          res.status = @mock[method][0]
+          status, body = @mock[method].evaluate
+          res.status = status
           if format == :json
-            res.write JSON.dump(@mock[method][1])
+            res.write JSON.dump(body)
           else
-            res.write Marshal.dump(@mock[method][1])
+            res.write Marshal.dump(body)
           end
         else
           res.status = 500
@@ -285,7 +334,7 @@ if $0 == __FILE__
     end
 
     def test_get_redirect
-      @collector.mock['get_redirect_host'] = [200, 'test.example.com']
+      @collector.mock['get_redirect_host'].evaluate = [200, 'test.example.com']
       response = invoke('get_redirect_host')
 
       assert_equal 'test.example.com', response
@@ -401,9 +450,9 @@ if $0 == __FILE__
     end
 
     def test_reset
-      @collector.mock['get_redirect_host'] = [200, 'never!']
+      @collector.mock['get_redirect_host'].evaluate = [200, 'never!']
       @collector.reset
-      assert_equal [200, 'localhost'], @collector.mock['get_redirect_host']
+      assert_equal [200, 'localhost'], @collector.mock['get_redirect_host'].evaluate
     end
 
     def invoke(method, post={}, code=200)

data/test/new_relic/http_client_test_cases.rb

@@ -10,7 +10,6 @@ require 'multiverse_helpers'
 
 module HttpClientTestCases
   include NewRelic::Agent::Instrumentation::ControllerInstrumentation,
-          NewRelic::Agent::CrossAppMonitor::EncodingFunctions,
           NewRelic::Agent::CrossAppTracing,
           MultiverseHelpers
 
@@ -305,6 +304,21 @@ module HttpClientTestCases
     assert_equal false, server.requests.last.keys.any? {|k| k =~ /NEWRELIC_ID/}
   end
 
+  def test_agent_doesnt_add_a_request_header_if_empty_cross_process_id
+    with_config(:'cross_application_tracer.enabled' => true,
+                :cross_process_id => "") do
+      get_response
+      assert_equal false, server.requests.last.keys.any? {|k| k =~ /NEWRELIC_ID/}
+    end
+  end
+
+  def test_agent_doesnt_add_a_request_header_if_empty_encoding_key
+    with_config(:'cross_application_tracer.enabled' => true,
+                :encoding_key => "") do
+      get_response
+      assert_equal false, server.requests.last.keys.any? {|k| k =~ /NEWRELIC_ID/}
+    end
+  end
 
   def test_instrumentation_with_crossapp_enabled_records_normal_metrics_if_no_header_present
     @nr_header = ""
@@ -491,7 +505,8 @@ module HttpClientTestCases
   end
 
   def make_app_data_payload( *args )
-    return obfuscate_with_key( 'gringletoes', args.to_json ).gsub( /\n/, '' ) + "\n"
+    obfuscator = NewRelic::Agent::Obfuscator.new('gringletoes')
+    return obfuscator.obfuscate( args.to_json ) + "\n"
   end
 
 end

data/test/new_relic/license_test.rb

@@ -7,6 +7,7 @@ require File.expand_path(File.join(File.dirname(__FILE__),'..','test_helper'))
 # look through the source code to enforce some simple rules that help us keep
 # our license data up to date.
 class LicenseTest < Test::Unit::TestCase
+  include NewRelic::TestHelpers::FileSearching
 
   # A list of regexs that will likely match license info
   LICENSE_TERMS = {
@@ -45,20 +46,6 @@ class LicenseTest < Test::Unit::TestCase
     ['/vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/solr_request_handler.rb', 'Apache'] => 1, # parse apache solr metrics
   }
 
-  def all_rb_and_js_files
-    pattern = File.expand_path(gem_root + "/**/*.{rb,js}")
-    Dir[pattern]
-  end
-
-  def all_files
-    pattern = File.expand_path(gem_root + "/**/*")
-    Dir[pattern]
-  end
-
-  def gem_root
-    File.expand_path(File.dirname(__FILE__) + "/../../")
-  end
-
   def shebang
     /^#!/
   end
@@ -92,7 +79,11 @@ class LicenseTest < Test::Unit::TestCase
     all_rb_and_js_files.each do |filename|
       next if should_skip?(filename)
 
-      first_four_lines = File.read(filename, 1000).split("\n")[0...4]
+      first_thousand_bytes = File.read(filename, 1000)
+      assert_not_nil first_thousand_bytes, "#{filename} is shorter than 1000 bytes."
+
+      first_four_lines = first_thousand_bytes.split("\n")[0...4]
+
       if first_four_lines.first =~ shebang
         first_four_lines.shift # discard it
       end

data/test/new_relic/multiverse_helpers.rb

@@ -56,10 +56,9 @@ module MultiverseHelpers
     NewRelic::Agent.instance.stats_engine.metric_rules.rules.clear
 
     # Clear out lingering stats we didn't transmit
-    NewRelic::Agent.instance.reset_stats
+    NewRelic::Agent.drop_buffered_data
 
-    # Clear out lingering errors in the collector
-    NewRelic::Agent.instance.error_collector.harvest_errors
+    # Clear the error collector's ignore_filter
     NewRelic::Agent.instance.error_collector.instance_variable_set(:@ignore_filter, nil)
 
     # Clean up any thread-local variables starting with 'newrelic'