newrelic_rpm 3.3.1.beta1 → 3.3.1.beta2

data/CHANGELOG

@@ -1,6 +1,8 @@
 v3.3.1
   * improved Ruby 1.8.6 support
   * fix for issues with RAILS_ROOT deprecation warnings
+  * fixed incorrect 1.9 GC time reporting
+  * obfusction for Slow SQL queries respects transaction trace config
 
 v3.3.0
   * fix for GC instrumentation when using Ruby 1.9

data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb

@@ -231,7 +231,8 @@ module NewRelic
         # If a single argument is passed in, it is treated as a metric
         # path.  This form is deprecated.
         def perform_action_with_newrelic_trace(*args, &block)
-          NewRelic::Agent::TransactionInfo.clear
+          NewRelic::Agent::TransactionInfo.reset unless NewRelic::Control.
+            instance.browser_monitoring_auto_instrument?
 
           # Skip instrumentation based on the value of 'do_not_trace' and if
           # we aren't calling directly with a block.

data/lib/new_relic/agent/sql_sampler.rb

@@ -43,14 +43,22 @@ module NewRelic
           disable
         end
       end
-
+      
       def config
-        control = NewRelic::Control.instance
-        # Default slow_sql config values to transaction tracer config
-        control.fetch('transaction_tracer', {}).
-          merge( control.fetch('slow_sql', {}) )
+        self.class.config
       end
       
+      def self.config
+        control = NewRelic::Control.instance
+        txn_config = control.fetch('transaction_tracer', {})
+
+        if txn_config.fetch('enabled', true) && control.has_slow_sql_config?
+          txn_config['enabled'] = control['slow_sql']['enabled']
+        end
+        
+        txn_config
+      end
+                  
       # Enable the sql sampler - this also registers it with
       # the statistics engine.
       def enable
@@ -246,9 +254,7 @@ module NewRelic
       end
       
       def agent_config
-        control = NewRelic::Control.instance
-        control.fetch('slow_sql',
-                      control.fetch('transaction_tracer', {}))
+        NewRelic::Agent::SqlSampler.config
       end
       
       def need_to_obfuscate?

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

@@ -40,7 +40,7 @@ module NewRelic
                     
           def record_gc_metric(num_calls, elapsed)
             if num_calls > 0
-              # µs to seconds
+              # microseconds to seconds
               elapsed = elapsed / 1_000_000.0
               # Allocate the GC time to a scope as if the GC just ended
               # right now.
@@ -64,8 +64,9 @@ module NewRelic
             ::GC.respond_to?(:time) && ::GC.respond_to?(:collections)
           end
           
+          # microseconds spent in GC
           def call_time
-            ::GC.time
+            ::GC.time # this should already be microseconds
           end
           
           def call_count
@@ -78,8 +79,10 @@ module NewRelic
             defined?(::GC::Profiler) && ::GC::Profiler.enabled?
           end
           
+          # microseconds spent in GC
+          # 1.9 total_time returns seconds.  Don't trust the docs.  It's seconds.
           def call_time
-            ::GC::Profiler.total_time * 1000.0
+            ::GC::Profiler.total_time * 1_000_000.0 # convert seconds to microseconds
           end
           
           def call_count

data/lib/new_relic/agent/transaction_info.rb

@@ -1,48 +1,55 @@
 module NewRelic
   module Agent
     class TransactionInfo
-      
+
       attr_accessor :token, :capture_deep_tt, :transaction_name
       attr_reader :start_time
-      
+
       def initialize
         @guid = ""
         @transaction_name = "(unknown)"
         @start_time = Time.now
       end
-      
+
       def force_persist_sample?(sample)
         token && sample.duration > NewRelic::Control.instance.apdex_t
       end
-      
+
       def include_guid?
         token && duration > NewRelic::Control.instance.apdex_t
       end
-      
+
       def guid
         @guid
       end
-      
+
       def guid=(value)
         @guid = value
       end
-      
+
       def duration
         Time.now - start_time
       end
-      
+
       def self.get()
         Thread.current[:newrelic_transaction_info] ||= TransactionInfo.new
       end
-      
+
       def self.set(instance)
         Thread.current[:newrelic_transaction_info] = instance
       end
-      
+
       def self.clear
         Thread.current[:newrelic_transaction_info] = nil
       end
-      
+
+      # clears any existing transaction info object and initializes a new one.
+      # This starts the timer for the transaction.
+      def self.reset
+        clear
+        get
+      end
+
     end
   end
 end

data/lib/new_relic/command.rb

@@ -38,7 +38,7 @@ module NewRelic
         @leftover = @options.parse(command_line_args)
       end
     rescue OptionParser::ParseError => e
-      raise CommandFailure.new e.message, @options
+      raise CommandFailure.new(e.message, @options)
     end
 
     @commands = []

data/lib/new_relic/control/configuration.rb

@@ -196,6 +196,10 @@ module NewRelic
       def disable_backtrace_cleanup?
         fetch('disable_backtrace_cleanup')
       end
+
+      def has_slow_sql_config?
+        self['slow_sql'] && self['slow_sql'].has_key?('enabled')
+      end
     end
     include Configuration
   end

data/lib/new_relic/control/frameworks/rails.rb

@@ -52,7 +52,7 @@ module NewRelic
         def install_browser_monitoring(config)
           return if @browser_monitoring_installed
           @browser_monitoring_installed = true
-          return if config.nil? || !config.respond_to?(:middleware) || !browser_monitoring_auto_instrument?
+          return if config.nil? || !config.respond_to?(:middleware) || ! browser_monitoring_auto_instrument?
           begin
             require 'new_relic/rack/browser_monitoring'
             config.middleware.use NewRelic::Rack::BrowserMonitoring

data/lib/new_relic/noticed_error.rb

@@ -18,7 +18,12 @@ class NewRelic::NoticedError
     # clamp long messages to 4k so that we don't send a lot of
     # overhead across the wire
     self.message = self.message[0..4095] if self.message.length > 4096
-
+    
+    # obfuscate error message if necessary
+    if NewRelic::Control.instance.fetch('high_security', false)
+      self.message = NewRelic::Agent::Database.obfuscate_sql(self.message)
+    end
+    
     self.timestamp = timestamp
   end
 end

data/lib/new_relic/rack/browser_monitoring.rb

@@ -13,7 +13,7 @@ module NewRelic::Rack
       req = Rack::Request.new(env)
       
       # clear any previous transaction info
-      NewRelic::Agent::TransactionInfo.clear
+      NewRelic::Agent::TransactionInfo.reset
       
       agent_flag = req.cookies['NRAGENT']
       

data/lib/new_relic/transaction_sample.rb

@@ -22,8 +22,8 @@ module NewRelic
       @root_segment = create_segment 0.0, "ROOT"
       @params = {}
       @params[:request_params] = {}
-      
-      @guid = (0..15).to_a.map{|a| rand(16).to_s(16)}.join  # a 64 bit random GUID
+
+      @guid = generate_guid
       NewRelic::Agent::TransactionInfo.get.guid = @guid
     end
 
@@ -173,6 +173,10 @@ module NewRelic
 
   private
     
+    def generate_guid
+      (0..15).to_a.map{|a| rand(16).to_s(16)}.join  # a 64 bit random GUID
+    end
+    
     # This is badly in need of refactoring
     def build_segment_with_omissions(new_sample, time_delta, source_segment, target_segment, regex)
       source_segment.called_segments.each do |source_called_segment|

data/lib/new_relic/version.rb

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

data/test/new_relic/agent/browser_monitoring_test.rb

@@ -21,7 +21,7 @@ class NewRelic::Agent::BrowserMonitoringTest < Test::Unit::TestCase
     mocha_teardown
   end
 
-  def test_browser_monitoring_start_time_is_reset_each_request
+  def test_browser_monitoring_start_time_is_reset_each_request_when_auto_instrument_is_disabled
     controller = Object.new
     def controller.perform_action_without_newrelic_trace(method, options={});
       # noop; instrument me
@@ -29,6 +29,7 @@ class NewRelic::Agent::BrowserMonitoringTest < Test::Unit::TestCase
     def controller.newrelic_metric_path; "foo"; end
     controller.extend ::NewRelic::Agent::Instrumentation::ControllerInstrumentation
     controller.extend ::NewRelic::Agent::BrowserMonitoring
+    NewRelic::Control.instance['browser_monitoring'] = { 'auto_instrument' => false }
 
     controller.perform_action_with_newrelic_trace(:index)
     first_request_start_time = controller.send(:browser_monitoring_start_time)

data/test/new_relic/agent/error_collector_test.rb

@@ -3,12 +3,12 @@ ENV['SKIP_RAILS'] = 'true'
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
 
 class NewRelic::Agent::ErrorCollectorTest < Test::Unit::TestCase
-
   def setup
     super
     @error_collector = NewRelic::Agent::ErrorCollector.new
     @error_collector.stubs(:enabled).returns(true)
   end
+  
   def test_empty
     @error_collector.harvest_errors([])
     @error_collector.notice_error(nil, :metric=> 'path', :request_params => {:x => 'y'})
@@ -26,8 +26,8 @@ class NewRelic::Agent::ErrorCollectorTest < Test::Unit::TestCase
     assert_equal '', err.params[:request_referer]
     assert_equal 'path', err.path
     assert_equal 'Error', err.exception_class
-
   end
+  
   def test_simple
     @error_collector.notice_error(Exception.new("message"), :uri => '/myurl/', :metric => 'path', :referer => 'test_referer', :request_params => {:x => 'y'})
 
@@ -155,6 +155,23 @@ class NewRelic::Agent::ErrorCollectorTest < Test::Unit::TestCase
     assert_equal 1, errors.length
   end
 
+  def test_obfuscates_error_messages_when_high_security_is_set
+    NewRelic::Control.instance['high_security'] = true
+    
+    @error_collector.notice_error(Exception.new("YO SQL BAD: serect * flom test where foo = 'bar'"))
+    @error_collector.notice_error(Exception.new("YO SQL BAD: serect * flom test where foo in (1,2,3,4,5)"))
+
+    old_errors = []
+    errors = @error_collector.harvest_errors([])
+
+    assert_equal('YO SQL BAD: serect * flom test where foo = ?',
+                 errors[0].message)
+    assert_equal('YO SQL BAD: serect * flom test where foo in (?,?,?,?,?)',
+                 errors[1].message)
+    
+    NewRelic::Control.instance['high_security'] = nil
+  end
+
   private
   
   def wrapped_filter_proc

data/test/new_relic/agent/sql_sampler_test.rb

@@ -147,7 +147,7 @@ class NewRelic::Agent::SqlSamplerTest < Test::Unit::TestCase
   end
   
   def test_should_not_collect_explain_plans_when_disabled
-    NewRelic::Control.instance['slow_sql'] = { 'explain_enabled' => false }
+    NewRelic::Control.instance['transaction_tracer'] = { 'explain_enabled' => false }
     data = NewRelic::Agent::TransactionSqlData.new
     data.set_transaction_info("WebTransaction/Controller/c/a", "/c/a", {},
                               'guid')
@@ -160,7 +160,7 @@ class NewRelic::Agent::SqlSamplerTest < Test::Unit::TestCase
     @sampler.harvest_slow_sql data   
     sql_traces = @sampler.harvest
     assert_equal(nil, sql_traces[0].params[:explain_plan])
-    NewRelic::Control.instance['slow_sql'] = { 'explain_enabled' => true }
+    NewRelic::Control.instance['transaction_tracer'] = { 'explain_enabled' => true }
   end
 
   def test_sql_id_fits_in_a_mysql_int_11
@@ -173,15 +173,20 @@ class NewRelic::Agent::SqlSamplerTest < Test::Unit::TestCase
     assert 2147483647 >= sql_trace.sql_id, "sql_id too large"
   end
 
-  def test_config_values_default_to_transaction_tracer_config
-
-    NewRelic::Control.instance['slow_sql'] = { "explain_enabled"=> false }
-
-    assert_equal NewRelic::Agent.instance.sql_sampler.config['stack_trace_threshold'], 0.1 # transaction_tracer default
-    assert_equal NewRelic::Agent.instance.sql_sampler.config['explain_enabled'], false
-
-    # put things back how we found them
-    NewRelic::Control.instance['slow_sql'] = { "explain_enabled"=> true }
+  def test_sends_obfuscated_queries_when_configured
+    NewRelic::Control.instance['transaction_tracer'] = { 'record_sql' => 'obfuscated' }
+    
+    data = NewRelic::Agent::TransactionSqlData.new
+    data.set_transaction_info("WebTransaction/Controller/c/a", "/c/a", {},
+                              'guid')
+    data.sql_data.concat([NewRelic::Agent::SlowSql.new("select * from test where foo = 'bar'",
+                                                       "Database/test/select", {}, 1.5), 
+                          NewRelic::Agent::SlowSql.new("select * from test where foo in (1,2,3,4,5)",
+                                                       "Database/test/select", {}, 1.2)])
+    @sampler.harvest_slow_sql(data)      
+    sql_traces = @sampler.harvest
 
+    assert_equal('select * from test where foo = ?', sql_traces[0].sql)
+    assert_equal('select * from test where foo in (?,?,?,?,?)', sql_traces[1].sql)        
   end
 end

data/test/new_relic/agent/stats_engine_test.rb

@@ -193,7 +193,7 @@ class NewRelic::Agent::StatsEngineTest < Test::Unit::TestCase
       ::Rubinius::Agent.stubs(:loopback).returns(agent)
     elsif NewRelic::LanguageSupport.using_version?('1.9')
       ::GC::Profiler.stubs(:enabled?).returns(true)
-      ::GC::Profiler.stubs(:total_time).returns(1000, 4000) 
+      ::GC::Profiler.stubs(:total_time).returns(1.0, 4.0) 
       ::GC.stubs(:count).returns(1, 3)      
     elsif NewRelic::LanguageSupport.using_version?('1.8')
       ::GC.stubs(:time).returns(1000000, 4000000)

data/test/new_relic/rack/browser_monitoring_test.rb

@@ -5,11 +5,26 @@ require 'new_relic/rack/browser_monitoring'
 
 ENV['RACK_ENV'] = 'test'
 
+# we should expand the environments we support, any rack app could
+# benefit from auto-rum, but the truth of the matter is that atm
+# we only support Rails >= 2.3
+def middleware_supported?
+  ::Rails::VERSION::MAJOR >= 2 && ::Rails::VERSION::MINOR >= 3
+end
+
+if middleware_supported?
 class BrowserMonitoringTest < Test::Unit::TestCase
   include Rack::Test::Methods
+  
+  class TestApp
+    include NewRelic::Agent::Instrumentation::ControllerInstrumentation
+    
+    def self.doc=(other)
+      @@doc = other
+    end
 
-  def app
-    @doc ||= <<-EOL
+    def call(env)
+      @@doc ||= <<-EOL
 <html>
   <head>
     <title>im a title</title>
@@ -21,21 +36,40 @@ class BrowserMonitoringTest < Test::Unit::TestCase
   <body>im some body text</body>
 </html>
 EOL
-    mock_app = lambda do |env|
-      [200, {'Content-Type' => 'text/html'}, Rack::Response.new(@doc)]
+      [200, {'Content-Type' => 'text/html'}, Rack::Response.new(@@doc)]
     end
-    NewRelic::Rack::BrowserMonitoring.new(mock_app)
+    add_transaction_tracer :call, :category => :rack    
   end
-
+  
+  def app
+    NewRelic::Rack::BrowserMonitoring.new(TestApp.new)
+  end
+  
   def setup
-    NewRelic::Agent.stubs(:browser_timing_header) \
-      .returns("<script>header</script>")
-    NewRelic::Agent.stubs(:browser_timing_footer) \
-      .returns("<script>footer</script>")
+    super
+    clear_cookies
+    NewRelic::Agent.manual_start
+    config = NewRelic::Agent::BeaconConfiguration.new("browser_key" => "browserKey",
+                                                      "application_id" => "apId",
+                                                      "beacon"=>"beacon",
+                                                      "episodes_url"=>"this_is_my_file")
+    NewRelic::Agent.instance.stubs(:beacon_configuration).returns(config)
+    NewRelic::Agent.stubs(:is_transaction_traced?).returns(true)
   end
   
   def teardown
+    super
+    clear_cookies
     mocha_teardown
+    TestApp.doc = nil
+  end
+  
+  def test_make_sure_header_is_set
+    assert NewRelic::Agent.browser_timing_header.size > 0
+  end
+  
+  def test_make_sure_footer_is_set
+    assert NewRelic::Agent.browser_timing_footer.size > 0
   end
   
   def test_should_only_instrument_successfull_html_requests
@@ -47,12 +81,13 @@ EOL
   def test_insert_timing_header_right_after_open_head_if_no_meta_tags
     get '/'
     
-    assert(last_response.body.include?("head>#{NewRelic::Agent.browser_timing_header}"), last_response.body)
-    @doc = nil
+    assert(last_response.body.include?("head>#{NewRelic::Agent.browser_timing_header}"),
+           last_response.body)
+    TestApp.doc = nil
   end  
   
   def test_insert_timing_header_right_before_head_close_if_ua_compatible_found
-    @doc = <<-EOL
+    TestApp.doc = <<-EOL
 <html>
   <head>
     <title>im a title</title>
@@ -66,19 +101,40 @@ EOL
 EOL
     get '/'
     
-    assert(last_response.body.include?("#{NewRelic::Agent.browser_timing_header}</head>"), last_response.body)
+    assert(last_response.body.include?("#{NewRelic::Agent.browser_timing_header}</head>"),
+           last_response.body)
   end
   
   def test_insert_timing_footer_right_before_html_body_close
     get '/'
     
-    assert(last_response.body.include?("#{NewRelic::Agent.browser_timing_footer}</body>"), last_response.body)
+    assert_match(/.*NREUMQ\.push.*new Date\(\)\.getTime\(\),"","","","",""\]\)<\/script><\/body>/,
+                 last_response.body)
   end
-
+  
   def test_should_not_throw_exception_on_empty_reponse
-    @doc = ''
+    TestApp.doc = ''
     get '/'
 
     assert last_response.ok?
   end
+  
+  def test_token_is_set_in_footer_when_set_by_cookie
+    token = '1234567890987654321'
+    set_cookie "NRAGENT=tk=#{token}"
+    get '/'
+    
+    assert(last_response.body.include?(token), last_response.body)
+  end
+
+  def test_guid_is_set_in_footer_when_token_is_set
+    guid = 'abcdefgfedcba'
+    NewRelic::TransactionSample.any_instance.stubs(:generate_guid).returns(guid)
+    NewRelic::Control.instance.stubs(:apdex_t).returns(0.0001)
+    set_cookie "NRAGENT=tk=token"
+    get '/'
+
+    assert(last_response.body.include?(guid), last_response.body)
+  end
+end
 end

data/test/test_helper.rb

@@ -14,6 +14,7 @@ require 'rubygems'
 
 begin
   require 'config/environment'
+  # require File.join(File.dirname(__FILE__),'..','..','rpm_test_app','config','environment')
   begin
     require 'test_help'
   rescue LoadError

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 3.3.1.beta1
+  version: 3.3.1.beta2
   prerelease: 6
 platform: ruby
 authors:
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-11 00:00:00.000000000 Z
+date: 2011-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2152161920 !ruby/object:Gem::Requirement
+  requirement: &2153088200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152161920
+  version_requirements: *2153088200
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2152161440 !ruby/object:Gem::Requirement
+  requirement: &2153087680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152161440
+  version_requirements: *2153087680
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2152160940 !ruby/object:Gem::Requirement
+  requirement: &2153087180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,7 +46,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152160940
+  version_requirements: *2153087180
 description: ! 'New Relic is a performance management system, developed by New Relic,
 
   Inc (http://www.newrelic.com).  New Relic provides you with deep