newrelic_rpm 3.1.2.beta1 → 3.1.2.beta2

data/CHANGELOG

@@ -3,6 +3,7 @@ v3.1.2
   * Work around for Ruby 1.8.7 Marshal crash bug
   * Numerous community patches (Gabriel Horner, Bradley Harris, Diego Garcia, 
     Tommy Sullivan, Greg Hazel, John Thomas Marino, Paul Elliott, Pan Thomakos)
+  * Fixed RUM instrumentation bug
 
 v3.1.1
   * Support for Rails 3.1 (thanks to Ben Hoskings via github)

data/lib/new_relic/agent/beacon_configuration.rb

@@ -30,7 +30,7 @@ module NewRelic
       
       # A static javascript header that is identical for every account
       # and application
-      JS_HEADER = "<script type=\"text/javascript\">var NREUMQ=[];NREUMQ.push([\"mark\",\"firstbyte\",new Date().getTime()]);</script>"
+      JS_HEADER = "<script type=\"text/javascript\">var NREUMQ=NREUMQ||[];NREUMQ.push([\"mark\",\"firstbyte\",new Date().getTime()]);</script>"
       
       # Creates a new browser configuration data. Argument is a hash
       # of configuration values from the server
@@ -63,7 +63,7 @@ module NewRelic
       # includes it themselves)
       def build_load_file_js(connect_data)
         js = <<-EOS
-if (!NREUMQ.f) NREUMQ.f=function() {
+if (!NREUMQ.f) { NREUMQ.f=function() {
 NREUMQ.push(["load",new Date().getTime()]);
 EOS
     
@@ -79,7 +79,8 @@ EOS
         js << <<-EOS
 if(NREUMQ.a)NREUMQ.a();
 };
-if(window.onload!==NREUMQ.f){NREUMQ.a=window.onload;window.onload=NREUMQ.f;};
+NREUMQ.a=window.onload;window.onload=NREUMQ.f;
+};
 EOS
         js
       end

data/lib/new_relic/agent/error_collector.rb

@@ -24,7 +24,6 @@ module NewRelic
         @errors = []
         # lookup of exception class names to ignore.  Hash for fast access
         @ignore = {}
-        @ignore_filter = nil
 
         config = NewRelic::Control.instance.fetch('error_collector', {})
 
@@ -45,10 +44,13 @@ module NewRelic
       
       # Returns the error filter proc that is used to check if an
       # error should be reported. When given a block, resets the
-      # filter to the provided block
+      # filter to the provided block.  The define_method() is used to
+      # wrap the block in a lambda so return statements don't result in a
+      # LocalJump exception.
       def ignore_error_filter(&block)
         if block
-          @ignore_filter = block
+          self.class.class_eval { define_method(:ignore_filter_proc, &block) }
+          @ignore_filter = method(:ignore_filter_proc)
         else
           @ignore_filter
         end

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

@@ -6,8 +6,9 @@ DependencyDetection.defer do
   end
 
   depends_on do
+    # double check because of old JRuby bug 
     defined?(::Delayed) && defined?(::Delayed::Job) &&
-      Delayed::Job.respond_to?(:invoke_job)
+      Delayed::Job.method_defined?(:invoke_job)
   end
   
   executes do

data/lib/new_relic/control/configuration.rb

@@ -67,7 +67,8 @@ module NewRelic
       end
 
       def license_key
-        fetch('license_key', ENV['NEWRELIC_LICENSE_KEY'])
+        env_setting = ENV['NEW_RELIC_LICENSE_KEY'] || ENV['NEWRELIC_LICENSE_KEY']
+        fetch('license_key', env_setting)
       end
       
       def capture_params

data/lib/new_relic/control/instance_methods.rb

@@ -45,6 +45,7 @@ module NewRelic
       #
       def init_plugin(options={})
         options['app_name'] = ENV['NEWRELIC_APP_NAME'] if ENV['NEWRELIC_APP_NAME']
+        options['app_name'] ||= ENV['NEW_RELIC_APP_NAME'] if ENV['NEW_RELIC_APP_NAME']
 
         # Merge the stringified options into the config as overrides:
         logger_override = options.delete(:log)

data/lib/new_relic/transaction_sample/segment.rb

@@ -189,8 +189,8 @@ module NewRelic
         sql = params[:sql]
         return nil unless sql && params[:connection_config]
         statement = sql.split(";\n")[0] # only explain the first
-        @explain_sql = explain_statement(statement, params[:connection_config]) || []
-        @explain_sql
+        @explain_sql = explain_statement(statement, params[:connection_config])
+        return @explain_sql || []
       end
 
       def explain_statement(statement, config)
@@ -218,19 +218,20 @@ module NewRelic
         # that it implements each.  Also: can't use select_rows because the native postgres
         # driver doesn't know that method.
         
-        headers = values = []
+        headers = []
+        values = []
         if items.respond_to?(:each_hash)
           items.each_hash do |row|
             headers = row.keys
-            values = headers.map{|h| row[h] }
+            values << headers.map{|h| row[h] }
           end
         elsif items.respond_to?(:each)
           items.each do |row|
             if row.kind_of?(Hash)
               headers = row.keys
-              values = headers.map{|h| row[h] }
+              values << headers.map{|h| row[h] }
             else
-              values = row
+              values << row
             end
           end
         else

data/lib/new_relic/version.rb

@@ -4,7 +4,7 @@ module NewRelic
     MAJOR = 3
     MINOR = 1
     TINY  = 2
-    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 = %q{newrelic_rpm}
-  s.version = "3.1.2.beta1"
+  s.version = "3.1.2.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 = %q{2011-08-18}
+  s.date = %q{2011-08-26}
   s.description = %q{New Relic is a performance management system, developed by New Relic,
 Inc (http://www.newrelic.com).  New Relic provides you with deep
 information about the performance of your web application as it runs
@@ -18,7 +18,7 @@ Gem or plugin, hosted on
 http://github.com/newrelic/rpm/
 }
   s.email = %q{support@newrelic.com}
-  s.executables = ["mongrel_rpm", "newrelic", "newrelic_cmd"]
+  s.executables = ["newrelic_cmd", "newrelic", "mongrel_rpm"]
   s.extra_rdoc_files = [
     "CHANGELOG",
     "LICENSE",

data/test/new_relic/agent/beacon_configuration_test.rb

@@ -19,7 +19,7 @@ class NewRelic::Agent::BeaconConfigurationTest < Test::Unit::TestCase
     assert_equal('a browser monitoring key', bc.browser_monitoring_key)
     assert_equal('an application id', bc.application_id)
     assert_equal('a beacon', bc.beacon)
-    assert_equal(109, bc.browser_timing_header.size, "should output the javascript with all the data available")
+    assert_equal(117, bc.browser_timing_header.size, "should output the javascript with all the data available")
   end
 
   def test_license_bytes_nil
@@ -81,21 +81,21 @@ class NewRelic::Agent::BeaconConfigurationTest < Test::Unit::TestCase
   def test_build_load_file_js_load_episodes_file_false
     connect_data = {'rum.load_episodes_file' => false}
     bc = NewRelic::Agent::BeaconConfiguration.new(connect_data)
-    assert_equal(186, bc.build_load_file_js(connect_data).size,
+    assert_equal(160, bc.build_load_file_js(connect_data).size,
                  "should include timing footer but not rum.js load")
   end
   
   def test_build_load_file_js_load_episodes_file_missing
     connect_data = {}
     bc = NewRelic::Agent::BeaconConfiguration.new(connect_data)
-    assert_equal(304, bc.build_load_file_js(connect_data).size,
+    assert_equal(278, bc.build_load_file_js(connect_data).size,
                  "should output the javascript when there is no configuration")
   end
 
   def test_build_load_file_js_load_episodes_file_present
     connect_data = {'rum.load_episodes_file' => true}
     bc = NewRelic::Agent::BeaconConfiguration.new(connect_data)
-    assert_equal(304, bc.build_load_file_js(connect_data).size,
+    assert_equal(278, bc.build_load_file_js(connect_data).size,
             "should output the javascript when rum.load_episodes_file is true")
   end
   

data/test/new_relic/agent/browser_monitoring_test.rb

@@ -30,13 +30,13 @@ class NewRelic::Agent::BrowserMonitoringTest < Test::Unit::TestCase
 
   def test_browser_timing_header
     header = browser_timing_header
-    assert_equal "<script type=\"text/javascript\">var NREUMQ=[];NREUMQ.push([\"mark\",\"firstbyte\",new Date().getTime()]);</script>", header
+    assert_equal "<script type=\"text/javascript\">var NREUMQ=NREUMQ||[];NREUMQ.push([\"mark\",\"firstbyte\",new Date().getTime()]);</script>", header
   end
 
   def test_browser_timing_header_with_rum_enabled_not_specified
     NewRelic::Agent.instance.expects(:beacon_configuration).at_least_once.returns( NewRelic::Agent::BeaconConfiguration.new({"browser_key" => "browserKey", "application_id" => "apId", "beacon"=>"beacon", "episodes_url"=>"this_is_my_file"}))
     header = browser_timing_header
-    assert_equal "<script type=\"text/javascript\">var NREUMQ=[];NREUMQ.push([\"mark\",\"firstbyte\",new Date().getTime()]);</script>", header
+    assert_equal "<script type=\"text/javascript\">var NREUMQ=NREUMQ||[];NREUMQ.push([\"mark\",\"firstbyte\",new Date().getTime()]);</script>", header
   end
 
   def test_browser_timing_header_with_rum_enabled_false
@@ -68,7 +68,7 @@ class NewRelic::Agent::BrowserMonitoringTest < Test::Unit::TestCase
     Thread.current[:newrelic_start_time] = Time.now
 
     footer = browser_timing_footer
-    snippet = '<script type="text/javascript">if (!NREUMQ.f) NREUMQ.f=function() {
+    snippet = '<script type="text/javascript">if (!NREUMQ.f) { NREUMQ.f=function() {
 NREUMQ.push(["load",new Date().getTime()]);
 var e=document.createElement("script");'
     assert footer.include?(snippet), "Expected footer to include snippet: #{snippet}, but instead was #{footer}"
@@ -103,7 +103,7 @@ var e=document.createElement("script");'
     config.expects(:license_bytes).returns(license_bytes)
     NewRelic::Agent.instance.expects(:beacon_configuration).returns(config).at_least_once
     footer = browser_timing_footer
-    beginning_snippet = '<script type="text/javascript">if (!NREUMQ.f) NREUMQ.f=function() {
+    beginning_snippet = '<script type="text/javascript">if (!NREUMQ.f) { NREUMQ.f=function() {
 NREUMQ.push(["load",new Date().getTime()]);
 var e=document.createElement("script");'
     ending_snippet = "])</script>"
@@ -238,7 +238,7 @@ var e=document.createElement("script");'
     self.expects(:obfuscate).with('most recent transaction').returns('most recent transaction')
 
     value = footer_js_string(beacon, license_key, application_id)
-    assert_equal("<script type=\"text/javascript\">if (!NREUMQ.f) NREUMQ.f=function() {\nNREUMQ.push([\"load\",new Date().getTime()]);\nvar e=document.createElement(\"script\");\ne.type=\"text/javascript\";e.async=true;e.src=\"this_is_my_file\";\ndocument.body.appendChild(e);\nif(NREUMQ.a)NREUMQ.a();\n};\nif(window.onload!==NREUMQ.f){NREUMQ.a=window.onload;window.onload=NREUMQ.f;};\nNREUMQ.push([\"nrf2\",\"\",\"\",1,\"most recent transaction\",0,0,new Date().getTime()])</script>", value, "should return the javascript given some default values")
+    assert_equal("<script type=\"text/javascript\">if (!NREUMQ.f) { NREUMQ.f=function() {\nNREUMQ.push([\"load\",new Date().getTime()]);\nvar e=document.createElement(\"script\");\ne.type=\"text/javascript\";e.async=true;e.src=\"this_is_my_file\";\ndocument.body.appendChild(e);\nif(NREUMQ.a)NREUMQ.a();\n};\nNREUMQ.a=window.onload;window.onload=NREUMQ.f;\n};\nNREUMQ.push([\"nrf2\",\"\",\"\",1,\"most recent transaction\",0,0,new Date().getTime()])</script>", value, "should return the javascript given some default values")
   end
 
   def test_html_safe_if_needed_unsafed

data/test/new_relic/agent/error_collector_test.rb

@@ -144,22 +144,29 @@ class NewRelic::Agent::ErrorCollectorTest < Test::Unit::TestCase
   end
 
   def test_exclude_block
-    @error_collector.ignore_error_filter do |e|
-      if e.is_a? IOError
-        nil
-      else
-        e
-      end
-    end
-
+    NewRelic::Agent.logger.expects(:error).never
+    @error_collector.ignore_error_filter &wrapped_filter_proc
+        
     @error_collector.notice_error(IOError.new("message"), :metric => 'path', :request_params => {:x => 'y'})
-
+    @error_collector.notice_error(Exception.new("message"), :metric => 'path', :request_params => {:x => 'y'})
+    
     errors = @error_collector.harvest_errors([])
 
-    assert_equal 0, errors.length
+    assert_equal 1, errors.length
   end
 
   private
+  
+  def wrapped_filter_proc
+    Proc.new do |e|
+      if e.is_a? IOError
+        return nil
+      else
+        return e
+      end
+    end
+  end
+  
   def silence_stream(*args)
     super
   rescue NoMethodError

data/test/new_relic/agent/instrumentation/active_record_instrumentation_test.rb

@@ -399,7 +399,7 @@ class NewRelic::Agent::Instrumentation::ActiveRecordInstrumentationTest < Test::
       assert explanation[0].include?(c)
     end
     ['1', 'SIMPLE', ActiveRecordFixtures::Order.table_name].each do |c|
-      assert explanation[1].include?(c)
+      assert explanation[1][0].include?(c)
     end
 
     s = NewRelic::Agent.get_stats("ActiveRecord/ActiveRecordFixtures::Order/find")

data/test/new_relic/data_serialization_test.rb

@@ -161,6 +161,7 @@ class NewRelic::DataSerializationTest < Test::Unit::TestCase
       snd.write(data[0,data.size/2])
       sleep(0.1)
       snd.write(data[(data.size/2)..-1])
+      snd.close
     end
     
     read = Thread.new do
@@ -176,15 +177,10 @@ class NewRelic::DataSerializationTest < Test::Unit::TestCase
       end
     end
 
-    begin
-      Timeout::timeout(1) do
-        write.join
-        read.join
-        gc.join
-      end
-    rescue Timeout::Error
-      # rubinius deadlocks which seems to be a rubinius bug
-      raise unless NewRelic::LanguageSupport.using_rubinius?
+    Timeout::timeout(5) do
+      write.join
+      read.join
+      gc.join
     end
     # should not seg fault
   end

data/test/new_relic/transaction_sample/segment_test.rb

@@ -391,28 +391,30 @@ class NewRelic::TransactionSample::SegmentTest < Test::Unit::TestCase
     NewRelic::TransactionSample.expects(:get_connection).with(config).returns(connection)
     
     assert_equal(plan.keys.sort, s.explain_sql[0].sort)
-    assert_equal(plan.values.compact.sort, s.explain_sql[1].compact.sort)    
+    assert_equal(plan.values.compact.sort, s.explain_sql[1][0].compact.sort)    
   end
 
-  # this basically casts the resultset to an array of rows, which are
-  # arrays of columns
   def test_process_resultset
     s = NewRelic::TransactionSample::Segment.new(Time.now, 'Custom/test/metric', nil)
-    items = [["column"]]
-    assert_equal([nil, ["column"]], s.process_resultset(items))
+    resultset = [["column"]]
+    assert_equal([nil, [["column"]]], s.process_resultset(resultset))
   end
 
   def test_explain_sql_one_select_with_pg_connection
     s = NewRelic::TransactionSample::Segment.new(Time.now, 'Custom/test/metric', nil)
     config = {:adapter => 'postgresql'}
     config.default('val')
-    s.params = {:sql => "SELECT true()", :connection_config => config}
+    s.params = {:sql => "select count(id) from blogs limit 1;", :connection_config => config}
     connection = mock('connection')
-    # two rows, two columns
-    connection.expects(:execute).returns([{"QUERY PLAN"=>"Seq Scan on foo (cost=0.00..11.40 rows=140 width=540)"}])
+    plan = [{"QUERY PLAN"=>"Limit  (cost=11.75..11.76 rows=1 width=4)"},
+            {"QUERY PLAN"=>"  ->  Aggregate  (cost=11.75..11.76 rows=1 width=4)"},
+            {"QUERY PLAN"=>"        ->  Seq Scan on blogs  (cost=0.00..11.40 rows=140 width=4)"}]
+    connection.expects(:execute).returns(plan)
     NewRelic::TransactionSample.expects(:get_connection).with(config).returns(connection)
     assert_equal([['QUERY PLAN'],
-                   ['Seq Scan on foo (cost=0.00..11.40 rows=140 width=540)']],
+                  [["Limit  (cost=11.75..11.76 rows=1 width=4)"],
+                   ["  ->  Aggregate  (cost=11.75..11.76 rows=1 width=4)"],
+                   ["        ->  Seq Scan on blogs  (cost=0.00..11.40 rows=140 width=4)"]]],
                  s.explain_sql)
   end
 

data/test/new_relic/transaction_sample_test.rb

@@ -84,7 +84,7 @@ class NewRelic::TransactionSampleTest < Test::Unit::TestCase
         explanation = segment.params[:explain_plan]
 
         assert_kind_of Array, explanation
-        assert_equal([nil, ["QUERY RESULT"]], explanation)
+        assert_equal([nil, [["QUERY RESULT"]]], explanation)
       end
     end
   end

metadata

@@ -1,10 +1,17 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: newrelic_rpm
-version: !ruby/object:Gem::Version
-  version: 3.1.2.beta1
+version: !ruby/object:Gem::Version 
+  hash: 62196423
   prerelease: 6
+  segments: 
+  - 3
+  - 1
+  - 2
+  - beta
+  - 2
+  version: 3.1.2.beta2
 platform: ruby
-authors:
+authors: 
 - Bill Kayser
 - Jon Guymon
 - Justin George
@@ -12,67 +19,73 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-18 00:00:00.000000000 -07:00
+
+date: 2011-08-26 00:00:00 -07:00
 default_executable: 
-dependencies:
-- !ruby/object:Gem::Dependency
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &2164283560 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *2164283560
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: mocha
-  requirement: &2155997140 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *2155997140
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: shoulda
-  requirement: &2155996160 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *2155996160
-description: ! 'New Relic is a performance management system, developed by New Relic,
-
+  version_requirements: *id003
+description: |
+  New Relic is a performance management system, developed by New Relic,
   Inc (http://www.newrelic.com).  New Relic provides you with deep
-
   information about the performance of your web application as it runs
-
   in production. The New Relic Ruby Agent is dual-purposed as a either a
-
   Gem or plugin, hosted on
-
   http://github.com/newrelic/rpm/
 
-'
 email: support@newrelic.com
-executables:
-- mongrel_rpm
-- newrelic
+executables: 
 - newrelic_cmd
+- newrelic
+- mongrel_rpm
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - CHANGELOG
 - LICENSE
 - README.rdoc
 - newrelic.yml
-files:
+files: 
 - CHANGELOG
 - LICENSE
 - README.rdoc
@@ -327,38 +340,60 @@ files:
 has_rdoc: true
 homepage: http://www.github.com/newrelic/rpm
 licenses: []
-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.1
-  of the Ruby Agent.\n  \n"
-rdoc_options:
+
+post_install_message: |
+  
+  PLEASE NOTE:
+  
+  Developer Mode is now a Rack middleware.
+  
+  Developer Mode is no longer available in Rails 2.1 and earlier.
+  However, starting in version 2.12 you can use Developer Mode in any
+  Rack based framework, in addition to Rails.  To install developer mode
+  in a non-Rails application, just add NewRelic::Rack::DeveloperMode to
+  your middleware stack.
+  
+  If you are using JRuby, we recommend using at least version 1.4 or 
+  later because of issues with the implementation of the timeout library.
+  
+  Refer to the README.md file for more information.
+  
+  Please see http://github.com/newrelic/rpm/blob/master/CHANGELOG
+  for a complete description of the features and enhancements available
+  in version 3.1 of the Ruby Agent.
+    
+
+rdoc_options: 
 - --line-numbers
 - --inline-source
 - --title
 - New Relic Ruby Agent
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: New Relic Ruby Agent
 test_files: []
+