newrelic_rpm 3.3.5 → 3.4.0.beta1

data/lib/new_relic/agent/pipe_service.rb

@@ -0,0 +1,57 @@
+module NewRelic
+  module Agent
+    class PipeService
+      attr_reader :channel_id, :buffer, :stats_engine
+      attr_accessor :request_timeout, :agent_id, :collector
+      
+      def initialize(channel_id)
+        @channel_id = channel_id
+        @collector = NewRelic::Control::Server.new(:name => 'parent',
+                                                   :port => 0)
+        @stats_engine = NewRelic::Agent::StatsEngine.new
+      end
+      
+      def connect(config)
+        nil
+      end
+      
+      def metric_data(last_harvest_time, now, unsent_timeslice_data)
+        @stats_engine.merge_data(hash_from_metric_data(unsent_timeslice_data))
+        stats = @stats_engine.harvest_timeslice_data({}, {})
+        write_to_pipe(:stats => stats) if stats
+        {}
+      end
+
+      def transaction_sample_data(transactions)
+        write_to_pipe(:transaction_traces => transactions) if transactions
+      end
+
+      def error_data(errors)
+        write_to_pipe(:error_traces => errors) if errors
+      end
+
+      def sql_trace_data(sql)
+        write_to_pipe(:sql_traces => sql) if sql
+      end
+      
+      def shutdown(time)
+        write_to_pipe('EOF')
+        NewRelic::Agent::PipeChannelManager.channels[@channel_id].close
+      end
+      
+      private
+
+      def hash_from_metric_data(metric_data)
+        metric_hash = {}
+        metric_data.each do |metric_entry|
+          metric_hash[metric_entry.metric_spec] = metric_entry
+        end
+        metric_hash
+      end
+
+      def write_to_pipe(data)
+        NewRelic::Agent::PipeChannelManager.channels[@channel_id].write(data)
+      end
+    end
+  end
+end

data/lib/new_relic/agent/samplers/delayed_job_sampler.rb

@@ -4,13 +4,6 @@ require 'new_relic/delayed_job_injection'
 module NewRelic
   module Agent
     module Samplers
-      # This sampler records the status of your delayed job table once a minute.
-      # It assumes jobs are cleared after being run, and failed jobs are not (otherwise
-      # the failed job metric is useless).
-      #
-      # In earlier versions it will break out the queue length by priority.  In later
-      # versions of DJ where distinct queues are supported, it breaks it out by queue name.
-      #
       class DelayedJobSampler < NewRelic::Agent::Sampler
         def initialize
           super :delayed_job_queue
@@ -18,6 +11,9 @@ module NewRelic
           raise Unsupported, "No DJ worker present" unless NewRelic::DelayedJobInjection.worker_name
         end
 
+        def queue_stats
+          stats_engine.get_stats("Workers/DelayedJob/queue_length", false)
+        end
         def error_stats
           stats_engine.get_stats("Workers/DelayedJob/failed_jobs", false)
         end
@@ -48,38 +44,12 @@ module NewRelic
         end
 
         def poll
+          record queue_stats, queued_jobs
           record error_stats, failed_jobs
           record locked_job_stats, locked_jobs
-
-          if @queue
-            record_queue_length_across_dimension('queue')
-          else
-            record_queue_length_across_dimension('priority')
-          end
         end
 
         private
-
-        def record_queue_length_across_dimension(column)
-          all_count = 0
-          Delayed::Job.count(:group => column).each do | column_val, count |
-            all_count += count
-            record stats_engine.get_stats("Workers/DelayedJob/queue_length/#{column == 'queue' ? 'name' : column}/#{column_val}", false), count
-          end
-          record(stats_engine.get_stats("Workers/DelayedJob/queue_length/all", false), all_count)
-        end
-
-        # Figure out if we get the queues.
-        def setup
-          return unless @queue.nil?
-          @setup = true
-          columns = Delayed::Job.columns
-          columns.each do | c |
-            @queue = true if c.name.to_s == 'priority'
-          end
-          @queue ||= false
-        end
-
         def record(stat, size)
           stat.record_data_point size
         end

data/lib/new_relic/agent/sql_sampler.rb

@@ -245,11 +245,7 @@ module NewRelic
       end
       
       def prepare_to_send
-        begin
-          params[:explain_plan] = @slow_sql.explain if need_to_explain?
-        ensure
-          NewRelic::Agent::Database.close_connections
-        end
+        params[:explain_plan] = @slow_sql.explain if need_to_explain?
         @sql = @slow_sql.obfuscate if need_to_obfuscate?
       end
       

data/lib/new_relic/agent/stats_engine/transactions.rb

@@ -46,7 +46,6 @@ module Agent
       # TransactionSample::Segment at the end of transaction execution
       def push_scope(metric, time = Time.now.to_f, deduct_call_time_from_parent = true)
         stack = scope_stack
-        stack.empty? ? GCProfiler.init : GCProfiler.capture
         @transaction_sampler.notice_push_scope metric, time if @transaction_sampler
         scope = ScopeStackElement.new(metric, deduct_call_time_from_parent)
         stack.push scope
@@ -56,7 +55,6 @@ module Agent
       # Pops a scope off the transaction stack - this updates the
       # transaction sampler that we've finished execution of a traced method
       def pop_scope(expected_scope, duration, time=Time.now.to_f)
-        GCProfiler.capture
         stack = scope_stack
         scope = stack.pop
         fail "unbalanced pop from blame stack, got #{scope ? scope.name : 'nil'}, expected #{expected_scope ? expected_scope.name : 'nil'}" if scope != expected_scope
@@ -98,6 +96,7 @@ module Agent
       def start_transaction(name = nil)
         Thread::current[:newrelic_scope_stack] ||= []
         self.scope_name = name if name
+        GCProfiler.init
       end
 
       # Try to clean up gracefully, otherwise we leave things hanging around on thread locals.
@@ -105,6 +104,7 @@ module Agent
       # and is ignored.
       #
       def end_transaction
+        GCProfiler.capture
         stack = scope_stack
 
         if stack && stack.empty?

data/lib/new_relic/agent/transaction_sampler.rb

@@ -166,7 +166,6 @@ module NewRelic
       # It sets various instance variables to the finished sample,
       # depending on which settings are active. See `store_sample`
       def notice_scope_empty(time=Time.now)
-
         last_builder = builder
         return unless last_builder
 
@@ -363,7 +362,6 @@ module NewRelic
       # sample returned will be the slowest sample among those
       # available during this harvest
       def add_samples_to(result, slow_threshold)
-
         # pull out force persist
         force_persist = result.select {|sample| sample.force_persist} || []
         result.reject! {|sample| sample.force_persist}

data/lib/new_relic/control/configuration.rb

@@ -119,7 +119,7 @@ module NewRelic
       end
 
       def disable_serialization?
-        fetch('disable_serialization', !DependencyDetection.installed?(:resque))
+        fetch('disable_serialization', true)
       end
       def disable_serialization=(b)
         self['disable_serialization'] = b

data/lib/new_relic/control/instance_methods.rb

@@ -52,7 +52,8 @@ module NewRelic
         environment_name = options.delete(:env) and self.env = environment_name
         dispatcher = options.delete(:dispatcher) and @local_env.dispatcher = dispatcher
         dispatcher_instance_id = options.delete(:dispatcher_instance_id) and @local_env.dispatcher_instance_id = dispatcher_instance_id
-
+        
+        NewRelic::Agent::PipeChannelManager.listener.start if options.delete(:start_channel_listener)
 
         # Clear out the settings, if they've already been loaded.  It may be that
         # between calling init_plugin the first time and the second time, the env

data/lib/new_relic/language_support.rb

@@ -58,6 +58,22 @@ module NewRelic::LanguageSupport
     end
   end
   
+  @@forkable = nil
+  
+  def can_fork?
+    # this is expensive to check, so we should only check once
+    return @@forkable if @@forkable != nil
+
+    if Process.respond_to?(:fork)
+      # if this is not 1.9.2 or higher, we have to make sure
+      @@forkable = ::RUBY_VERSION < '1.9.2' ? test_forkability : true
+    else
+      @@forkable = false
+    end
+
+    @@forkable
+  end
+  
   def using_engine?(engine)
     if defined?(::RUBY_ENGINE)
       ::RUBY_ENGINE == engine
@@ -70,4 +86,14 @@ module NewRelic::LanguageSupport
     numbers = version.split('.')
     numbers == ::RUBY_VERSION.split('.')[0, numbers.size]
   end
+
+  def test_forkability
+    child = Process.fork { exit! }
+    # calling wait here doesn't seem like it should necessary, but it seems to
+    # resolve some weird edge cases with resque forking.
+    Process.wait child
+    true
+  rescue NotImplementedError
+    false
+  end
 end

data/lib/new_relic/transaction_sample.rb

@@ -159,12 +159,8 @@ module NewRelic
       sample.guid = self.guid
       sample.force_persist = self.force_persist if self.force_persist
 
-      begin
-        build_segment_for_transfer(sample, @root_segment, sample.root_segment, options)
-      ensure
-        NewRelic::Agent::Database.close_connections
-      end
-
+      build_segment_for_transfer(sample, @root_segment, sample.root_segment, options)
+      
       sample.root_segment.end_trace(@root_segment.exit_timestamp)
       sample
     end

data/lib/new_relic/version.rb

@@ -2,9 +2,9 @@
 module NewRelic
   module VERSION #:nodoc:
     MAJOR = 3
-    MINOR = 3
-    TINY  = 5
-    BUILD = nil # Set to nil for a release, 'beta1', 'alpha', etc for prerelease builds
+    MINOR = 4
+    TINY  = 0
+    BUILD = 'beta1' # Set to nil for a release, 'beta1', 'alpha', etc for prerelease builds
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
   end
 

data/newrelic_rpm.gemspec

@@ -5,14 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = "newrelic_rpm"
-  s.version = "3.3.5"
+  s.version = "3.4.0.beta1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bill Kayser", "Jon Guymon", "Justin George", "Darin Swanson"]
-  s.date = "2012-05-31"
+  s.date = "2012-05-25"
   s.description = "New Relic is a performance management system, developed by New Relic,\nInc (http://www.newrelic.com).  New Relic provides you with deep\ninformation about the performance of your web application as it runs\nin production. The New Relic Ruby Agent is dual-purposed as a either a\nGem or plugin, hosted on\nhttp://github.com/newrelic/rpm/\n"
   s.email = "support@newrelic.com"
-  s.executables = ["mongrel_rpm", "newrelic", "newrelic_cmd"]
+  s.executables = ["newrelic", "mongrel_rpm", "newrelic_cmd"]
   s.extra_rdoc_files = [
     "CHANGELOG",
     "LICENSE",
@@ -62,10 +62,14 @@ Gem::Specification.new do |s|
     "lib/new_relic/agent/instrumentation/rails/errors.rb",
     "lib/new_relic/agent/instrumentation/rails3/action_controller.rb",
     "lib/new_relic/agent/instrumentation/rails3/errors.rb",
+    "lib/new_relic/agent/instrumentation/resque.rb",
     "lib/new_relic/agent/instrumentation/sinatra.rb",
     "lib/new_relic/agent/instrumentation/sunspot.rb",
     "lib/new_relic/agent/instrumentation/unicorn_instrumentation.rb",
     "lib/new_relic/agent/method_tracer.rb",
+    "lib/new_relic/agent/new_relic_service.rb",
+    "lib/new_relic/agent/pipe_channel_manager.rb",
+    "lib/new_relic/agent/pipe_service.rb",
     "lib/new_relic/agent/sampler.rb",
     "lib/new_relic/agent/samplers/cpu_sampler.rb",
     "lib/new_relic/agent/samplers/delayed_job_sampler.rb",
@@ -163,6 +167,9 @@ Gem::Specification.new do |s|
     "test/new_relic/agent/method_tracer/instance_methods/trace_execution_scoped_test.rb",
     "test/new_relic/agent/method_tracer_test.rb",
     "test/new_relic/agent/mock_scope_listener.rb",
+    "test/new_relic/agent/new_relic_service_test.rb",
+    "test/new_relic/agent/pipe_channel_manager_test.rb",
+    "test/new_relic/agent/pipe_service_test.rb",
     "test/new_relic/agent/rpm_agent_test.rb",
     "test/new_relic/agent/sampler_test.rb",
     "test/new_relic/agent/shim_agent_test.rb",
@@ -184,6 +191,8 @@ Gem::Specification.new do |s|
     "test/new_relic/control_test.rb",
     "test/new_relic/data_serialization_test.rb",
     "test/new_relic/delayed_job_injection_test.rb",
+    "test/new_relic/fake_collector.rb",
+    "test/new_relic/fake_service.rb",
     "test/new_relic/local_environment_test.rb",
     "test/new_relic/metric_data_test.rb",
     "test/new_relic/metric_parser/metric_parser_test.rb",
@@ -204,7 +213,9 @@ Gem::Specification.new do |s|
     "test/new_relic/version_number_test.rb",
     "test/script/build_test_gem.sh",
     "test/script/ci.sh",
+    "test/script/ci_agent-tests_runner.sh",
     "test/script/ci_bench.sh",
+    "test/script/ci_multiverse_runner.sh",
     "test/test_contexts.rb",
     "test/test_helper.rb",
     "ui/helpers/developer_mode_helper.rb",
@@ -286,7 +297,7 @@ Gem::Specification.new do |s|
     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/web_transaction.rb"
   ]
   s.homepage = "http://www.github.com/newrelic/rpm"
-  s.post_install_message = "\nPLEASE NOTE:\n\nDeveloper Mode is now a Rack middleware.\n\nDeveloper Mode is no longer available in Rails 2.1 and earlier.\nHowever, starting in version 2.12 you can use Developer Mode in any\nRack based framework, in addition to Rails.  To install developer mode\nin a non-Rails application, just add NewRelic::Rack::DeveloperMode to\nyour middleware stack.\n\nIf you are using JRuby, we recommend using at least version 1.4 or \nlater because of issues with the implementation of the timeout library.\n\nRefer to the README.md file for more information.\n\nPlease see http://github.com/newrelic/rpm/blob/master/CHANGELOG\nfor a complete description of the features and enhancements available\nin version 3.3 of the Ruby Agent.\n  \n"
+  s.post_install_message = "\nPLEASE NOTE:\n\nDeveloper Mode is now a Rack middleware.\n\nDeveloper Mode is no longer available in Rails 2.1 and earlier.\nHowever, starting in version 2.12 you can use Developer Mode in any\nRack based framework, in addition to Rails.  To install developer mode\nin a non-Rails application, just add NewRelic::Rack::DeveloperMode to\nyour middleware stack.\n\nIf you are using JRuby, we recommend using at least version 1.4 or \nlater because of issues with the implementation of the timeout library.\n\nRefer to the README.md file for more information.\n\nPlease see http://github.com/newrelic/rpm/blob/master/CHANGELOG\nfor a complete description of the features and enhancements available\nin version 3.4 of the Ruby Agent.\n  \n"
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "New Relic Ruby Agent"]
   s.require_paths = ["lib"]
   s.summary = "New Relic Ruby Agent"

data/test/new_relic/agent/agent/connect_test.rb

@@ -1,17 +1,30 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..', '..', '..','test_helper'))
+require 'new_relic/agent/agent'
+require 'ostruct'
+
 class NewRelic::Agent::Agent::ConnectTest < Test::Unit::TestCase
-  require 'new_relic/agent/agent'
-  
-  # I don't like this, we should be testing a third party, not ourselves -Jon
   include NewRelic::Agent::Agent::Connect
-
+  
   def setup
     @connected = nil
     @keep_retrying = nil
     @connect_attempts = 1
     @connect_retry_period = 0
     @transaction_sampler = NewRelic::Agent::TransactionSampler.new
-    @sql_sampler = NewRelic::Agent::SqlSampler.new    
+    @sql_sampler = NewRelic::Agent::SqlSampler.new
+    server = NewRelic::Control::Server.new('localhost', 30303)
+    @service = NewRelic::Agent::NewRelicService.new('abcdef', server)
+  end
+
+  def control
+    fake_control = OpenStruct.new('validate_seed' => false,
+                                  'local_env' => OpenStruct.new('snapshot' => []))
+    fake_control.instance_eval do
+      def [](key)
+        return nil
+      end
+    end
+    fake_control
   end
 
   def test_tried_to_connect?
@@ -324,29 +337,26 @@ class NewRelic::Agent::Agent::ConnectTest < Test::Unit::TestCase
     log_sql_transmission_warning?
   end
 
-  def test_set_collector_host_positive
-    control = mocked_control
-    self.expects(:invoke_remote).with(:get_redirect_host).returns('collector-deux.newrelic.com')
-    control.expects(:server_from_host).with('collector-deux.newrelic.com').returns('correct')
-    set_collector_host!
-    assert_equal 'correct', @collector
-  end
-
-  def test_set_collector_host_negative
-    @collector = 'initial value'
-    control = mocked_control
-    self.expects(:invoke_remote).with(:get_redirect_host).returns(nil)
-    set_collector_host!
-    assert_equal 'initial value', @collector, "should not modify collector value"
-  end
-
   def test_query_server_for_configuration
-    self.expects(:set_collector_host!)
     self.expects(:connect_to_server).returns("so happy")
     self.expects(:finish_setup).with("so happy")
     query_server_for_configuration
   end
 
+  def test_connect_to_server_gets_config_from_collector
+    service = NewRelic::FakeService.new
+    NewRelic::Agent::Agent.instance.service = service
+    NewRelic::Agent.manual_start
+    service.mock['connect'] = {'agent_run_id' => 23, 'config' => 'a lot'}
+
+    response = NewRelic::Agent.agent.connect_to_server
+
+    assert_equal 23, response['agent_run_id']
+    assert_equal 'a lot', response['config']
+
+    NewRelic::Agent.shutdown
+  end
+
   def test_finish_setup
     config = {
       'agent_run_id' => 'fishsticks',
@@ -364,11 +374,17 @@ class NewRelic::Agent::Agent::ConnectTest < Test::Unit::TestCase
                                 :config => {})
     @sql_sampler = stub('sql sampler', :configure! => true)    
     finish_setup(config)
-    assert_equal 'fishsticks', @agent_id
+    assert_equal 'fishsticks', @service.agent_id
     assert_equal 'pasta sauce', @report_period
     assert_equal 'tamales', @url_rules
   end
 
+  def test_finish_setup_without_config
+    @service.agent_id = 'blah'
+    finish_setup(nil)
+    assert_equal 'blah', @service.agent_id
+  end
+
   private
 
   def mocked_control

data/test/new_relic/agent/agent_test.rb

@@ -2,12 +2,18 @@ require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper
 module NewRelic
   module Agent
     class AgentTest < Test::Unit::TestCase
-
       def setup
         super
         @agent = NewRelic::Agent::Agent.new
       end
 
+      def test_after_fork_reporting_to_channel
+        @agent.after_fork(:report_to_channel => 123)
+        assert(@agent.service.kind_of?(NewRelic::Agent::PipeService),
+               'Agent should use PipeService when directed to report to pipe channel')
+        assert_equal 123, @agent.service.channel_id
+      end
+
       def test_save_or_transmit_data_should_save
         NewRelic::Agent.expects(:save_data).once
         @agent.expects(:harvest_and_send_timeslice_data).never
@@ -24,7 +30,22 @@ module NewRelic
         NewRelic::DataSerialization.expects(:should_send_data?).returns(true)
         @agent.instance_eval { save_or_transmit_data }
       end
+
+      def test_save_or_transmit_data_should_close_explain_db_connections
+        NewRelic::Agent.stubs(:save_data)
+        NewRelic::DataSerialization.expects(:should_send_data?).returns(false)
+        NewRelic::Agent::Database.expects(:close_connections)
+        @agent.instance_eval { save_or_transmit_data }
+      end
       
+      def test_save_or_transmit_data_should_not_close_db_connections_if_forked
+        NewRelic::Agent.stubs(:save_data)
+        NewRelic::DataSerialization.expects(:should_send_data?).returns(false)
+        NewRelic::Agent::Database.expects(:close_connections).never
+        @agent.after_fork
+        @agent.instance_eval { save_or_transmit_data }
+      end
+
       def test_serialize
         assert_equal([{}, [], []], @agent.send(:serialize), "should return nil when shut down")
       end
@@ -125,9 +146,9 @@ module NewRelic
           @unsent_timeslice_data = unsent_timeslice_data
           @traces = unsent_traces
         }
-        unsent_errors.expects(:+).with([])
-        unsent_traces.expects(:+).with([])
-        @agent.merge_data_from([{}, [], []])
+        unsent_traces.expects(:+).with([1,2,3])
+        unsent_errors.expects(:+).with([4,5,6])
+        @agent.merge_data_from([{}, [1,2,3], [4,5,6]])
       end
 
       def test_should_not_log_log_file_location_if_no_log_file