newrelic_rpm 3.3.5 → 3.4.0.beta1

data/test/new_relic/agent/transaction_sample_builder_test.rb

@@ -183,7 +183,6 @@ class NewRelic::Agent::TransationSampleBuilderTest < Test::Unit::TestCase
     8.times {|i| build_segment i.to_s }
   end
   
-  
   def validate_builder(check_names = true)
     validate_segment @builder.sample.root_segment, check_names
   end

data/test/new_relic/agent/transaction_sampler_test.rb

@@ -754,19 +754,19 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
     run_sample_trace
 
     slowest = @sampler.harvest(nil, 0)[0]
-    assert((slowest.duration >= 0.09), "expected sample duration >= 0.09, but was: #{slowest.duration.inspect}")
-    # this assert is here to make sure the test remains valid
-    assert((slowest.duration <= 0.15), "expected sample duration <= 0.15, but was: #{slowest.duration.inspect}")
-
+    first_duration = slowest.duration
+    assert((first_duration >= 0.1),
+           "expected sample duration >= 0.1, but was: #{slowest.duration.inspect}")
 
     run_sample_trace { sleep 0.0001 }
     not_as_slow = @sampler.harvest(slowest, 0)[0]
     assert((not_as_slow == slowest), "Should re-harvest the same transaction since it should be slower than the new transaction - expected #{slowest.inspect} but got #{not_as_slow.inspect}")
 
-    run_sample_trace { sleep 0.16 }
+    run_sample_trace { sleep(first_duration + 0.1) }
+
     new_slowest = @sampler.harvest(slowest, 0)[0]
     assert((new_slowest != slowest), "Should not harvest the same trace since the new one should be slower")
-    assert((new_slowest.duration >= 0.15), "Slowest duration must be >= 0.15, but was: #{new_slowest.duration.inspect}")
+    assert((new_slowest.duration >= first_duration + 0.1), "Slowest duration must be >= #{first_duration + 0.1}, but was: #{new_slowest.duration.inspect}")
   end
 
   def test_prepare_to_send

data/test/new_relic/agent/worker_loop_test.rb

@@ -23,7 +23,7 @@ class NewRelic::Agent::WorkerLoopTest < Test::Unit::TestCase
     # This shows how the tasks stay aligned with the period and don't drift.
     count = 0
     start = Time.now
-    @worker_loop.run(0.01) do
+    @worker_loop.run(0.03) do
       count +=1
       if count == 3
         @worker_loop.stop
@@ -31,7 +31,7 @@ class NewRelic::Agent::WorkerLoopTest < Test::Unit::TestCase
       end
     end
     elapsed = Time.now - start
-    assert_in_delta 0.03, elapsed, 0.02
+    assert_in_delta 0.09, elapsed, 0.03
   end
   def test_task_error__standard
     @logger.expects(:debug)

data/test/new_relic/agent_test.rb

@@ -1,4 +1,6 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..','test_helper'))
+require 'ostruct'
+
 module NewRelic
   class MainAgentTest < Test::Unit::TestCase
     
@@ -22,6 +24,46 @@ module NewRelic
       mock_agent.expects(:after_fork).with({})
       NewRelic::Agent.after_fork
     end
+
+    def test_after_fork_sets_forked_flag
+      agent = NewRelic::Agent::Agent.new
+      assert !agent.forked?
+      agent.after_fork
+
+      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)
+        
+        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
+    end
     
     def test_reset_stats
       mock_agent = mocked_agent
@@ -41,6 +83,15 @@ module NewRelic
       NewRelic::Agent.manual_start(:sync_startup => false)
     end
 
+    def test_manual_start_starts_channel_listener
+      NewRelic::Agent::PipeChannelManager.listener.stop
+      NewRelic::Agent.agent.service = NewRelic::FakeService.new
+      NewRelic::Agent.manual_start(:start_channel_listener => true)
+      assert NewRelic::Agent::PipeChannelManager.listener.started?
+      NewRelic::Agent::PipeChannelManager.listener.stop
+      NewRelic::Agent.shutdown
+    end
+
     def test_logger
       control = mocked_control
       control.expects(:log)
@@ -169,7 +220,14 @@ module NewRelic
       NewRelic::Agent.load_data
       NewRelic::Control.instance['disable_serialization'] = false
     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
@@ -177,9 +235,21 @@ module NewRelic
       NewRelic::Agent.stubs(:agent).returns(agent)
       agent
     end
-
+    
     def mocked_control
-      control = mock('control')
+      server = NewRelic::Control::Server.new('localhost', 3000)
+      control = OpenStruct.new(:license_key => 'abcdef',
+                               :server => server)
+      control.instance_eval do
+        def [](key)
+          nil
+        end
+        
+        def fetch(k,d)
+          nil
+        end
+      end
+
       NewRelic::Control.stubs(:instance).returns(control)
       control
     end

data/test/new_relic/control/configuration_test.rb

@@ -74,11 +74,4 @@ class NewRelic::Control::ConfigurationTest < Test::Unit::TestCase
     DependencyDetection.send(:class_variable_set, '@@items', [])
     assert NewRelic::Control.instance.disable_serialization?
   end
-
-  def test_data_serialization_default_on_when_using_resque
-    DependencyDetection.defer { @name = :resque }
-    DependencyDetection.dependency_by_name(:resque).executed!
-    assert !NewRelic::Control.instance.disable_serialization?
-    DependencyDetection.send(:class_variable_set, '@@items', [])
-  end
 end

data/test/new_relic/control_test.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'/../test_helper'))
-class NewRelic::ControlTest < Test::Unit::TestCase
 
+class NewRelic::ControlTest < Test::Unit::TestCase
   attr_reader :control
 
   def setup
@@ -244,10 +244,10 @@ class NewRelic::ControlTest < Test::Unit::TestCase
     assert_equal 2.0, NewRelic::Control.instance['transaction_tracer']['explain_threshold']
     assert_equal 'raw', NewRelic::Control.instance['transaction_tracer']['record_sql']
   end
-
+    
   private
 
-  def forced_start overrides = {}
+  def forced_start(overrides={})
     NewRelic::Agent.manual_start overrides
     # This is to force the agent to start again.
     NewRelic::Agent.instance.stubs(:started?).returns(nil)

data/test/new_relic/delayed_job_injection_test.rb

@@ -5,8 +5,13 @@ class NewRelic::DelayedJobInstrumentationTest < Test::Unit::TestCase
     Object.const_set('Delayed', Module.new) unless defined?(Delayed)
     ::Delayed.const_set('Worker', Class.new) unless defined?(::Delayed::Worker)
     
+    # on JRuby we need to make sure the worker isn't running, it might
+    # try to log
+    worker = NewRelic::Agent.agent.instance_variable_get(:@worker_loop)
+    worker.stop if worker
+    
     NewRelic::Agent.stubs(:logger).raises(NoMethodError,
-                                            'tempoarily not allowed')
+                                          'temporarily not allowed')
     NewRelic::Agent.stubs(:respond_to?).with(:logger).returns(false)
     
     assert DependencyDetection.detect!

data/test/new_relic/fake_collector.rb

@@ -0,0 +1,210 @@
+require 'rubygems'
+require 'rack'
+require 'uri'
+require 'socket'
+require 'timeout'
+require 'ostruct'
+
+module NewRelic
+  class FakeCollector
+    attr_accessor :agent_data, :mock
+    
+    def initialize
+      @id_counter = 0
+      @base_expectations = {
+        'get_redirect_host'       => 'localhost',
+        'connect'                 => { 'agent_run_id' => agent_run_id },
+        'metric_data'             => { 'Some/Metric/Spec' => 1 },
+        'sql_trace_data'          => nil,
+        'transaction_sample_data' => nil,
+        'error_data'              => nil,
+        'shutdown'                => nil,
+      }
+      reset
+    end
+
+    def agent_run_id
+      @id_counter += 1
+    end
+    
+    def call(env)
+      req = ::Rack::Request.new(env)
+      res = ::Rack::Response.new
+      uri = URI.parse(req.url)
+      if uri.path =~ /agent_listener\/\d+\/.+\/(\w+)/
+        method = $1
+        if @mock.keys.include? method
+          res.write Marshal.dump(@mock[method])
+        else
+          res.status = 500
+          res.write "Method not found"
+        end
+        run_id = uri.query =~ /run_id=(\d+)/ ? $1 : nil
+        req.body.rewind
+        @agent_data << OpenStruct.new(:action => method,
+                                      :body   => Marshal.load(req.body.read),
+                                      :run_id => run_id)
+      end
+      res.finish
+    end
+
+    def run(port=30303)
+      if is_port_available?('127.0.0.1', port)
+        @thread = Thread.new do
+          ::Rack::Handler::WEBrick.run(self, :Port => port)
+        end
+        loop do
+          break if !is_port_available?('127.0.0.1', port)
+          sleep 0.01
+        end
+      end
+    end
+
+    def stop
+      ::Rack::Handler::WEBrick.shutdown
+      @thread.join
+    end
+
+    def reset
+      @mock = @base_expectations.dup
+      @id_counter = 0
+      @agent_data = []
+    end
+    
+    def is_port_available?(ip, port)
+      begin
+        Timeout::timeout(1) do
+          begin
+            s = TCPSocket.new(ip, port)
+            s.close
+            return false
+          rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH
+            return true
+          end
+        end
+      rescue Timeout::Error
+      end
+      
+      return true
+    end
+  end
+end
+
+if $0 == __FILE__
+  require 'test/unit'
+  require 'net/http'
+  
+  class FakeCollectorTest < Test::Unit::TestCase
+    def setup
+      @collector = NewRelic::FakeCollector.new
+      @collector.run
+    end
+
+    def teardown
+      @collector.stop
+    end
+    
+    def test_get_redirect
+      @collector.mock['get_redirect_host'] = 'test.example.com'
+      response = invoke('get_redirect_host')
+      
+      assert_equal 'test.example.com', response
+      assert_equal 'get_redirect_host', @collector.agent_data[0].action
+    end
+    
+    def test_connect
+      response = invoke('connect')
+      
+      assert_equal 1, response['agent_run_id']
+      assert_equal 'connect', @collector.agent_data[0].action
+    end
+
+    def test_metric_data
+      response = invoke('metric_data?run_id=1',
+                        {'Foo/Bar' => [1,2,3], 'Baz/Cux' => [4,5,6]})
+      
+      assert_equal 1, response['Some/Metric/Spec']
+      post = @collector.agent_data[0]
+      assert_equal 'metric_data', post.action
+      assert_equal({'Foo/Bar' => [1,2,3], 'Baz/Cux' => [4,5,6]}, post.body)
+      assert_equal 1, post.run_id.to_i
+    end
+
+    def test_sql_trace_data
+      response = invoke('sql_trace_data?run_id=2',
+                        ['trace', 'trace', 'trace'])
+
+      assert_nil response
+      post = @collector.agent_data[0]
+      assert_equal 'sql_trace_data', post.action
+      assert_equal ['trace', 'trace', 'trace'], post.body
+      assert_equal 2, post.run_id.to_i
+    end
+
+    def test_transaction_sample_data
+      response = invoke('transaction_sample_data?run_id=3',
+                        ['node', ['node', 'node'], 'node'])
+
+      assert_nil response
+      post = @collector.agent_data[0]
+      assert_equal 'transaction_sample_data', post.action
+      assert_equal ['node', ['node', 'node'], 'node'], post.body
+      assert_equal 3, post.run_id.to_i
+    end
+    
+    def test_error_data
+      response = invoke('error_data?run_id=4', ['error'])
+      
+      assert_nil response
+      post = @collector.agent_data[0]
+      assert_equal 'error_data', post.action
+      assert_equal ['error'], post.body
+    end
+    
+    def test_shutdown
+      response = invoke('shutdown?run_id=1')
+
+      assert_nil response
+      assert_equal 'shutdown', @collector.agent_data[0].action
+    end
+
+    def test_multiple_invokations
+      pid = Process.fork do
+        invoke('get_redirect_host')
+        invoke('connect')
+        invoke('metric_data?run_id=1')
+        invoke('transaction_sample_data?run_id=1')
+        invoke('shutdown?run_id=1')
+      end
+      invoke('get_redirect_host')
+      invoke('connect')
+      invoke('metric_data?run_id=2')
+      invoke('transaction_sample_data?run_id=2')
+      invoke('shutdown?run_id=2')
+
+      Process.wait(pid)
+      
+      expected = ['get_redirect_host', 'connect', 'metric_data',
+                  'transaction_sample_data', 'shutdown',
+                  'get_redirect_host', 'connect', 'metric_data',
+                  'transaction_sample_data', 'shutdown']
+      assert_equal expected.sort, @collector.agent_data.map(&:action).sort
+    end
+
+    def test_reset
+      @collector.mock['get_redirect_host'] = 'never!'
+      @collector.reset
+      assert_equal 'localhost', @collector.mock['get_redirect_host']
+    end
+   
+    def invoke(method, post={}, code=200)
+      uri = URI.parse("http://127.0.0.1:30303/agent_listener/8/12345/#{method}")
+      request = Net::HTTP::Post.new("#{uri.path}?#{uri.query}")
+      request.body = Marshal.dump(post)
+      response = Net::HTTP.start(uri.host, uri.port) do |http|
+        http.request(request)
+      end
+      Marshal.load(response.body)
+    end
+  end
+end

data/test/new_relic/fake_service.rb

@@ -0,0 +1,44 @@
+require 'ostruct'
+
+module NewRelic
+  class FakeService
+    attr_accessor :request_timeout, :agent_id, :agent_data, :collector, :mock
+    
+    def initialize
+      @agent_data = []
+      @supported_methods = [ :connect, :metric_data, :transaction_sample_data,
+                             :error_data, :sql_trace_data, :shutdown ]
+      @collector = NewRelic::Control::Server.new(:name => 'fakehost', :port => 0)
+      @id_counter = 0
+      @base_expectations = {
+        'get_redirect_host'       => 'localhost',
+        'connect'                 => { 'agent_run_id' => agent_run_id },
+        'metric_data'             => { 'Some/Metric/Spec' => 1 },
+        'sql_trace_data'          => nil,
+        'transaction_sample_data' => nil,
+        'error_data'              => nil,
+        'shutdown'                => nil,
+      }
+      reset
+    end
+
+    def agent_run_id
+      @id_counter += 1
+    end
+
+    def reset
+      @mock = @base_expectations.dup
+      @id_counter = 0
+      @agent_data = []
+    end
+    
+    def method_missing(method, *args)
+      if @supported_methods.include?(method)
+        @agent_data << OpenStruct.new(:method => method, :params => args)
+        @mock[method.to_s]
+      else
+        super
+      end
+    end  
+  end
+end