newrelic_rpm 3.2.0.beta2 → 3.2.0

data/lib/new_relic/agent/agent.rb

@@ -469,7 +469,7 @@ module NewRelic
           def check_sql_sampler_status
             # disable sql sampling if disabled by the server
             # and we're not in dev mode
-            if @sql_sampler.config.fetch('enabled', true) && ['raw', 'obfuscated'].include?(@sql_sampler.config.fetch('record_sql', 'obfuscated').to_s)
+            if @sql_sampler.config.fetch('enabled', true) && ['raw', 'obfuscated'].include?(@sql_sampler.config.fetch('record_sql', 'obfuscated').to_s) && @transaction_sampler.config.fetch('enabled', true)
               @sql_sampler.enable
             else
               @sql_sampler.disable
@@ -758,13 +758,13 @@ module NewRelic
             # Reconfigure the transaction tracer
             @transaction_sampler.configure!
             @sql_sampler.configure!
-            @should_send_samples = @config_should_send_samples = sampler_config.fetch('enabled', true)
-            @should_send_random_samples = sampler_config.fetch('random_sample', false)
+            @should_send_samples = @config_should_send_samples = @transaction_sampler.config.fetch('enabled', true)
+            @should_send_random_samples = @transaction_sampler.config.fetch('random_sample', false)
             set_sql_recording!
 
             # default to 2.0, string 'apdex_f' will turn into your
             # apdex * 4
-            @slowest_transaction_threshold = sampler_config.fetch('transaction_threshold', 2.0).to_f
+            @slowest_transaction_threshold = @transaction_sampler.config.fetch('transaction_threshold', 2.0).to_f
             @slowest_transaction_threshold = apdex_f if apdex_f_threshold?
           end
 
@@ -774,6 +774,9 @@ module NewRelic
           def configure_transaction_tracer!(server_enabled, sample_rate)
             # Ask the server for permission to send transaction samples.
             # determined by subscription license.
+            @transaction_sampler.config['enabled'] = server_enabled
+            @sql_sampler.disable unless @transaction_sampler.config['enabled']
+            
             @should_send_samples = @config_should_send_samples && server_enabled
 
             if @should_send_samples
@@ -795,7 +798,7 @@ module NewRelic
           # transactions. This gears well with using apdex since you
           # will attempt to send any transactions that register as 'failing'
           def apdex_f_threshold?
-            sampler_config.fetch('transaction_threshold', '') =~ /apdex_f/i
+            @transaction_sampler.config.fetch('transaction_threshold', '') =~ /apdex_f/i
           end
 
           # Sets the sql recording configuration by trying to detect
@@ -803,7 +806,7 @@ module NewRelic
           # 'false', 'none', and friends. Otherwise, we accept 'raw',
           # and unrecognized values default to 'obfuscated'
           def set_sql_recording!
-            record_sql_config = sampler_config.fetch('record_sql', :obfuscated)
+            record_sql_config = @transaction_sampler.config.fetch('record_sql', :obfuscated)
             case record_sql_config.to_s
             when 'off'
               @record_sql = :off
@@ -826,11 +829,6 @@ module NewRelic
             log.warn("Agent is configured to send raw SQL to the service") if @record_sql == :raw
           end
 
-          # gets the sampler configuration from the control object's settings
-          def sampler_config
-            NewRelic::Control.instance.fetch('transaction_tracer', {})
-          end
-
           # Asks the collector to tell us which sub-collector we
           # should be reporting to, and then does the name resolution
           # on that host so we don't block on DNS during the normal

data/lib/new_relic/agent/sql_sampler.rb

@@ -33,7 +33,6 @@ module NewRelic
         @explain_enabled = config.fetch('explain_enabled', true)
         @stack_trace_threshold = config.fetch('stack_trace_threshold',
                                               0.5).to_f
-        # config.fetch('enabled', true) ? self.enable : self.disable
       end
 
       def config

data/lib/new_relic/agent/transaction_sampler.rb

@@ -45,16 +45,18 @@ module NewRelic
         # @segment_limit and @stack_trace_threshold come from the
         # configuration file, with built-in defaults that should
         # suffice for most customers
-        config = NewRelic::Control.instance
-        sampler_config = config.fetch('transaction_tracer', {})
         
-        # enable if sampler_config.fetch('enabled', true)
+        # enable if config.fetch('enabled', true)
         
-        @segment_limit = sampler_config.fetch('limit_segments', 4000)
-        @stack_trace_threshold = sampler_config.fetch('stack_trace_threshold', 0.500).to_f
-        @explain_threshold = sampler_config.fetch('explain_threshold', 0.5).to_f
-        @explain_enabled = sampler_config.fetch('explain_enabled', true)
-        @transaction_threshold = sampler_config.fetch('transation_threshold', 2.0)
+        @segment_limit = config.fetch('limit_segments', 4000)
+        @stack_trace_threshold = config.fetch('stack_trace_threshold', 0.500).to_f
+        @explain_threshold = config.fetch('explain_threshold', 0.5).to_f
+        @explain_enabled = config.fetch('explain_enabled', true)
+        @transaction_threshold = config.fetch('transation_threshold', 2.0)
+      end
+
+      def config
+        NewRelic::Control.instance.fetch('transaction_tracer', {})
       end
 
       # Returns the current sample id, delegated from `builder`

data/lib/new_relic/control/configuration.rb

@@ -36,7 +36,7 @@ module NewRelic
       # Merge the given options into the config options.
       # They might be a nested hash
       def merge_options(options, hash=self)
-        options.each do |key, val |
+        options.each do |key, val|
           case
           when key == :config then next
           when val.is_a?(Hash)
@@ -66,6 +66,7 @@ module NewRelic
 
       def remove_server_controlled_configs
         settings.delete('transaction_tracer')
+        settings.delete('slow_sql')
         settings.delete('error_collector')
         settings.delete('capture_params')
       end

data/lib/new_relic/rack/developer_mode.rb

@@ -67,7 +67,7 @@ module NewRelic
 
       def reset
         NewRelic::Agent.instance.transaction_sampler.reset!
-        NewRelic::Agent.instance.sql_sampler.reset
+        NewRelic::Agent.instance.sql_sampler.reset!
         ::Rack::Response.new{|r| r.redirect('/newrelic/')}.finish
       end
 

data/lib/new_relic/version.rb

@@ -4,7 +4,7 @@ module NewRelic
     MAJOR = 3
     MINOR = 2
     TINY  = 0
-    BUILD = 'beta2' #'0' # Set to nil for a release, 'beta1', 'alpha', etc for prerelease builds
+    BUILD = nil #'0' # 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,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{newrelic_rpm}
-  s.version = "3.2.0.beta2"
+  s.version = "3.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Bill Kayser}, %q{Jon Guymon}, %q{Justin George}, %q{Darin Swanson}]

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

@@ -1,6 +1,8 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..', '..', '..','test_helper'))
 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
@@ -8,6 +10,8 @@ class NewRelic::Agent::Agent::ConnectTest < Test::Unit::TestCase
     @keep_retrying = nil
     @connect_attempts = 1
     @connect_retry_period = 0
+    @transaction_sampler = NewRelic::Agent::TransactionSampler.new
+    @sql_sampler = NewRelic::Agent::SqlSampler.new    
   end
 
   def test_tried_to_connect?
@@ -213,9 +217,6 @@ class NewRelic::Agent::Agent::ConnectTest < Test::Unit::TestCase
       'explain_threshold' => 0.75,
       'explain_enabled' => true
     }
-    
-    @transaction_sampler = NewRelic::Agent::TransactionSampler.new
-    @sql_sampler = NewRelic::Agent::SqlSampler.new
 
     config_transaction_tracer
 
@@ -263,45 +264,45 @@ class NewRelic::Agent::Agent::ConnectTest < Test::Unit::TestCase
   end
 
   def test_apdex_f_threshold_positive
-    self.expects(:sampler_config).returns({'transaction_threshold' => 'apdex_f'})
+    NewRelic::Control.instance.settings['transaction_tracer'] = { 'transaction_threshold' => 'apdex_f' }
     assert apdex_f_threshold?
   end
 
   def test_apdex_f_threshold_negative
-    self.expects(:sampler_config).returns({'transaction_threshold' => 'WHEE'})
+    NewRelic::Control.instance.settings['transaction_tracer'] = { 'transaction_threshold' => 'WHEE' }
     assert !apdex_f_threshold?
   end
 
   def test_set_sql_recording_default
-    self.expects(:sampler_config).returns({})
+    NewRelic::Control.instance.settings['transaction_tracer'] = { }
     self.expects(:log_sql_transmission_warning?)
     set_sql_recording!
     assert_equal :obfuscated, @record_sql, " should default to :obfuscated, was #{@record_sql}"
   end
 
   def test_set_sql_recording_off
-    self.expects(:sampler_config).returns({'record_sql' => 'off'})
+    NewRelic::Control.instance.settings['transaction_tracer'] = {'record_sql' => 'off'}
     self.expects(:log_sql_transmission_warning?)
     set_sql_recording!
     assert_equal :off, @record_sql, "should be set to :off, was #{@record_sql}"
   end
 
   def test_set_sql_recording_none
-    self.expects(:sampler_config).returns({'record_sql' => 'none'})
+    NewRelic::Control.instance.settings['transaction_tracer'] = {'record_sql' => 'none'}    
     self.expects(:log_sql_transmission_warning?)
     set_sql_recording!
     assert_equal :off, @record_sql, "should be set to :off, was #{@record_sql}"
   end
 
   def test_set_sql_recording_raw
-    self.expects(:sampler_config).returns({'record_sql' => 'raw'})
+    NewRelic::Control.instance.settings['transaction_tracer'] = {'record_sql' => 'raw'}        
     self.expects(:log_sql_transmission_warning?)
     set_sql_recording!
     assert_equal :raw, @record_sql, "should be set to :raw, was #{@record_sql}"
   end
 
   def test_set_sql_recording_falsy
-    self.expects(:sampler_config).returns({'record_sql' => false})
+    NewRelic::Control.instance.settings['transaction_tracer'] = {'record_sql' => false}            
     self.expects(:log_sql_transmission_warning?)
     set_sql_recording!
     assert_equal :off, @record_sql, "should be set to :off, was #{@record_sql}"
@@ -321,11 +322,6 @@ class NewRelic::Agent::Agent::ConnectTest < Test::Unit::TestCase
     log_sql_transmission_warning?
   end
 
-  def test_sampler_config
-    NewRelic::Control.instance.expects(:fetch).with('transaction_tracer', {})
-    sampler_config
-  end
-
   def test_set_collector_host_positive
     control = mocked_control
     self.expects(:invoke_remote).with(:get_redirect_host).returns('collector-deux.newrelic.com')
@@ -371,8 +367,9 @@ class NewRelic::Agent::Agent::ConnectTest < Test::Unit::TestCase
     self.expects(:log_connection!).with(config)
     self.expects(:configure_transaction_tracer!).with(true, 10)
     self.expects(:configure_error_collector!).with(true)
-    @transaction_sampler = mock('transaction sampler', :configure! => true)
-    @sql_sampler = mock('sql sampler', :configure! => true)    
+    @transaction_sampler = stub('transaction sampler', :configure! => true,
+                                :config => {})
+    @sql_sampler = stub('sql sampler', :configure! => true)    
     finish_setup(config)
     assert_equal 'fishsticks', @agent_id
     assert_equal 'pasta sauce', @report_period

data/test/new_relic/control_test.rb

@@ -13,10 +13,10 @@ class NewRelic::ControlTest < Test::Unit::TestCase
     NewRelic::Agent.shutdown
   end
 
-#   def test_cert_file_path
-#     assert @control.cert_file_path
-#     assert_equal File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'cert', 'cacert.pem')), @control.cert_file_path
-#   end
+  def test_cert_file_path
+    assert @control.cert_file_path
+    assert_equal File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'cert', 'cacert.pem')), @control.cert_file_path
+  end
   
   # This test does not actually use the ruby agent in any way - it's
   # testing that the CA file we ship actually validates our server's
@@ -190,7 +190,7 @@ class NewRelic::ControlTest < Test::Unit::TestCase
     @control['developer_mode'] = true
     @control['monitor_mode'] = false
   end
-
+  
   def test_sql_tracer_disabled
     forced_start(:slow_sql => { :enabled => false }, :monitor_mode => true)
     NewRelic::Agent::Agent.instance.check_sql_sampler_status
@@ -209,6 +209,32 @@ class NewRelic::ControlTest < Test::Unit::TestCase
            'sql tracer enabled when config calls for disabled')
   end
 
+  def test_sql_tracer_disabled_when_tt_disabled
+    forced_start(:transaction_tracer => { :enabled => false },
+                 :slow_sql => { :enabled => true },
+                 :developer_mode => false, :monitor_mode => true)
+    NewRelic::Agent::Agent.instance.check_sql_sampler_status
+    
+    assert(!NewRelic::Agent::Agent.instance.sql_sampler.enabled?,
+           'sql enabled when transaction tracer disabled')
+    
+    @control['developer_mode'] = true
+    @control['monitor_mode'] = false    
+  end
+
+  def test_sql_tracer_disabled_when_tt_disabled_by_server
+    forced_start(:slow_sql => { :enabled => true },
+                 :transaction_tracer => { :enabled => true },
+                 :monitor_mode => true)
+    NewRelic::Agent::Agent.instance.check_sql_sampler_status
+    NewRelic::Agent::Agent.instance.finish_setup('collect_traces' => false)    
+    
+    assert(!NewRelic::Agent::Agent.instance.sql_sampler.enabled?,
+           'sql enabled when tracing disabled by server')
+    
+    @control['monitor_mode'] = false        
+  end
+
   def test_merging_options
     NewRelic::Control.send :public, :merge_options
     @control.merge_options :api_port => 66, :transaction_tracer => { :explain_threshold => 2.0 }

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 3.2.0.beta2
-  prerelease: 6
+  version: 3.2.0
+  prerelease: 
 platform: ruby
 authors:
 - Bill Kayser
@@ -16,7 +16,7 @@ date: 2011-10-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2153262420 !ruby/object:Gem::Requirement
+  requirement: &2155893600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153262420
+  version_requirements: *2155893600
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2153261700 !ruby/object:Gem::Requirement
+  requirement: &2155892300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153261700
+  version_requirements: *2155892300
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2153261000 !ruby/object:Gem::Requirement
+  requirement: &2155890120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,7 +46,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153261000
+  version_requirements: *2155890120
 description: ! 'New Relic is a performance management system, developed by New Relic,
 
   Inc (http://www.newrelic.com).  New Relic provides you with deep