newrelic_rpm 3.3.2.beta1 → 3.3.2.beta2

data/CHANGELOG

@@ -3,6 +3,7 @@ v3.3.2
   * Fixes for obfuscation of PostgreSQL and SQLite queries
   * Fix for lost database connections when using a forking framework
   * Workaround for RedHat kernel bug which prevented blocking reads of /proc fs
+  * Do not trap signals when handling exceptions
   
 v3.3.1
   * improved Ruby 1.8.6 support

data/lib/new_relic/agent/agent.rb

@@ -129,9 +129,9 @@ module NewRelic
             if options['exception']
               e = options['exception']
             elsif options['error_message']
-              e = Exception.new options['error_message']
+              e = StandardError.new options['error_message']
             else
-              e = Exception.new 'Unknown Error'
+              e = StandardError.new 'Unknown Error'
             end
             error_collector.notice_error e, :uri => options['uri'], :metric => metric
           end
@@ -538,7 +538,7 @@ module NewRelic
             handle_force_disconnect(e)
           rescue NewRelic::Agent::ServerConnectionException => e
             handle_server_connection_problem(e)
-          rescue Exception => e
+          rescue => e
             handle_other_error(e)
           end
 
@@ -1281,7 +1281,7 @@ module NewRelic
             log.debug "Serializing agent data to disk"
             NewRelic::Agent.save_data
           end
-        rescue Exception => e
+        rescue => e
           NewRelic::Control.instance.disable_serialization = true
           NewRelic::Control.instance.log.warn("Disabling serialization: #{e.message}")
           retry_count ||= 0

data/lib/new_relic/agent/database.rb

@@ -95,12 +95,12 @@ module NewRelic
 
       def handle_exception_in_explain
         yield
-      rescue Exception => e
+      rescue => e
         begin
           # guarantees no throw from explain_sql
           NewRelic::Control.instance.log.error("Error getting query plan: #{e.message}")
           NewRelic::Control.instance.log.debug(e.backtrace.join("\n"))
-        rescue Exception
+        rescue
           # double exception. throw up your hands
         end
       end

data/lib/new_relic/agent/error_collector.rb

@@ -223,7 +223,7 @@ module NewRelic
         exception_options = error_params_from_options(options).merge(exception_info(exception))
         add_to_error_queue(NewRelic::NoticedError.new(action_path, exception_options, exception))
         exception
-      rescue Exception => e
+      rescue => e
         log.error("Error capturing an error, yodawg. #{e}")
       end
 

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

@@ -256,7 +256,7 @@ module NewRelic
                 else
                   perform_action_without_newrelic_trace(*args)
                 end
-              rescue Exception => e
+              rescue => e
                 frame_data.notice_error(e)
                 raise
               end
@@ -379,7 +379,7 @@ module NewRelic
                      end
           unless path = options[:path]
             action = options[:name] || args.first
-            metric_class = options[:class_name] || (self.is_a?(Class) ? self.name : self.class.name)
+            metric_class = options[:class_name] || ((self.is_a?(Class)||self.is_a?(Module)) ? self.name : self.class.name)
             path = metric_class
             path += ('/' + action) if action
           end
@@ -425,7 +425,7 @@ module NewRelic
             queue_start = parse_frontend_headers(newrelic_request_headers)
           end
           queue_start || now
-        rescue Exception => e
+        rescue => e
           NewRelic::Control.instance.log.error("Error detecting upstream wait time: #{e}")
           NewRelic::Control.instance.log.debug("#{e.backtrace[0..20]}")
           now

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

@@ -67,7 +67,7 @@ module NewRelic
             include_class 'java.lang.management.ManagementFactory'
             include_class 'com.sun.management.OperatingSystemMXBean'
             @@java_classes_loaded = true
-          rescue Exception => e
+          rescue => e
           end
         end
 

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

@@ -74,7 +74,7 @@ module Agent
           begin
             sampled_item.poll
             false # it's okay.  don't delete it.
-          rescue Exception => e
+          rescue => e
             log.error "Removing #{sampled_item} from list"
             log.error e
             log.debug e.backtrace.to_s

data/lib/new_relic/agent/worker_loop.rb

@@ -74,7 +74,7 @@ module NewRelic
           # Want to ignore these because they are handled already
         rescue SystemExit, NoMemoryError, SignalException
           raise
-        rescue Exception => e
+        rescue => e
           # Don't blow out the stack for anything that hasn't already propagated
           log.error "Error running task in Agent Worker Loop '#{e}': #{e.backtrace.first}"
           log.debug e.backtrace.join("\n")

data/lib/new_relic/commands/deployments.rb

@@ -72,7 +72,7 @@ class NewRelic::Command::Deployments < NewRelic::Command
       raise NewRelic::Command::CommandFailure.new(err_string)
     rescue NewRelic::Command::CommandFailure
       raise
-    rescue Exception => e
+    rescue => e
       err "Unexpected error attempting to connect to #{config.api_server}"
       info "#{e}: #{e.backtrace.join("\n   ")}"
       raise NewRelic::Command::CommandFailure.new(e.to_s)

data/lib/new_relic/control/configuration.rb

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

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

@@ -13,7 +13,7 @@ module NewRelic
 
         def to_stdout(msg)
           Merb.logger.info("NewRelic ~ " + msg)
-        rescue Exception => e
+        rescue => e
           STDOUT.puts "NewRelic ~ " + msg
         end
 

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

@@ -57,7 +57,7 @@ module NewRelic
             require 'new_relic/rack/browser_monitoring'
             config.middleware.use NewRelic::Rack::BrowserMonitoring
             log!("Installed New Relic Browser Monitoring middleware", :info)
-          rescue Exception => e
+          rescue => e
             log!("Error installing New Relic Browser Monitoring middleware: #{e.inspect}", :error)
           end
         end
@@ -77,7 +77,7 @@ module NewRelic
                 log!("NewRelic Agent Developer Mode enabled.")
                 log!("To view performance information, go to http://localhost#{port}/newrelic")
               end
-            rescue Exception => e
+            rescue => e
               log!("Error installing New Relic Developer Mode: #{e.inspect}", :error)
             end
           elsif rails_config
@@ -92,14 +92,14 @@ module NewRelic
           else
             super
           end
-        rescue Exception => e
+        rescue => e
           super
         end
 
         def to_stdout(message)
           logger = ::Rails.respond_to?(:logger) ? ::Rails.logger : ::RAILS_DEFAULT_LOGGER
           logger.info(message)
-        rescue Exception => e
+        rescue => e
           super
         end
 

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

@@ -37,7 +37,7 @@ module NewRelic
           else
             super
           end
-        rescue Exception => e
+        rescue => e
           super
         end
 

data/lib/new_relic/control/instrumentation.rb

@@ -17,7 +17,7 @@ module NewRelic
           begin
             log.debug "Processing instrumentation file '#{file}'"
             require file.to_s
-          rescue Exception => e
+          rescue => e
             log.error "Error loading instrumentation file '#{file}': #{e}"
             log.debug e.backtrace.join("\n")
           end

data/lib/new_relic/control/server_methods.rb

@@ -63,13 +63,13 @@ module NewRelic
       # address and don't have a good default.
       def resolve_ip_address(host)
         Resolv.getaddress(host)
-      rescue Exception => e
+      rescue => e
         log.warn("DNS Error caching IP address: #{e}")
         log.debug(e.backtrace.join("\n   "))
         begin
           log.info("Trying native DNS lookup since Resolv failed")
           IPSocket.getaddress(host)
-        rescue Exception => e
+        rescue => e
           log.error("Could not look up server address: #{e}")
           nil
         end

data/lib/new_relic/data_serialization.rb

@@ -16,7 +16,7 @@ module NewRelic
         NewRelic::Control.instance.disable_serialization? || store_too_large? ||
           store_too_old? || pid_too_old? ||
           NewRelic::LanguageSupport.using_version?('1.8.6')
-      rescue Exception => e
+      rescue => e
         NewRelic::Control.instance.disable_serialization = true
         NewRelic::Control.instance.log.warn("Disabling serialization: #{e.message}")
         true
@@ -81,7 +81,7 @@ module NewRelic
             f.flock(File::LOCK_UN)
           end
         end
-      rescue Exception => e
+      rescue => e
         NewRelic::Control.instance.log.error("Error serializing data to disk: #{e.inspect}")
         NewRelic::Control.instance.log.debug(e.backtrace.split("\n"))
         # re-raise so that serialization will be disabled higher up the stack

data/lib/new_relic/local_environment.rb

@@ -49,7 +49,7 @@ module NewRelic
     def append_environment_value(name, value = nil)
       value = yield if block_given?
       @config[name] = value if value
-    rescue Exception
+    rescue
       # puts "#{e}\n  #{e.backtrace.join("\n  ")}"
       raise if @framework == :test
     end
@@ -58,7 +58,7 @@ module NewRelic
     # of gems - this catches errors that might be raised in the block
     def append_gem_list
       @gems += yield
-    rescue Exception => e
+    rescue => e
       # puts "#{e}\n  #{e.backtrace.join("\n  ")}"
       raise if @framework == :test
     end
@@ -67,7 +67,7 @@ module NewRelic
     # of plugins - this catches errors that might be raised in the block
     def append_plugin_list
       @plugins += yield
-    rescue Exception
+    rescue
       # puts "#{e}\n  #{e.backtrace.join("\n  ")}"
       raise if @framework == :test
     end
@@ -103,13 +103,28 @@ module NewRelic
     end
 
     # See what the number of cpus is, works only on some linux variants
-    def gather_cpu_info
-      return unless File.readable? '/proc/cpuinfo'
+    def gather_cpu_info(proc_file='/proc/cpuinfo')
+      return unless File.readable? proc_file
       @processors = append_environment_value('Processors') do
-        cpuinfo = File.open("/proc/cpuinfo") {|f| f.read_nonblock(4096).strip }
+        cpuinfo = ''
+        File.open(proc_file) do |f|
+          loop do
+            begin
+              cpuinfo << f.read_nonblock(4096).strip
+            rescue EOFError
+              break
+            rescue Errno::EWOULDBLOCK, Errno::EAGAIN
+              cpuinfo = ''
+              break # don't select file handle, just give up
+            end
+          end
+        end
         processors = cpuinfo.split("\n").select {|line| line =~ /^processor\s*:/ }.size
-        
-        raise "Cannot determine the number of processors in /proc/cpuinfo" unless processors > 0
+
+        if processors == 0
+          processors = 1 # assume there is at least one processor
+          NewRelic::Agent.logger.warn("Cannot determine the number of processors in #{proc_file}")
+        end
         processors
       end
     end

data/lib/new_relic/recipes.rb

@@ -54,7 +54,7 @@ make_notify_task = Proc.new do
         logger.info e.message
       rescue Capistrano::CommandError
         logger.info "Unable to notify New Relic of the deployment... skipping"
-      rescue Exception => e
+      rescue => e
         logger.info "Error creating New Relic deployment (#{e})\n#{e.backtrace.join("\n")}"
       end
       # WIP: For rollbacks, let's update the deployment we created with an indication of the failure:

data/lib/new_relic/version.rb

@@ -4,7 +4,7 @@ module NewRelic
     MAJOR = 3
     MINOR = 3
     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.3.2.beta1"
+  s.version = "3.3.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{2012-01-20}
+  s.date = %q{2012-02-10}
   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
@@ -140,6 +140,7 @@ http://github.com/newrelic/rpm/
     "test/active_record_fixtures.rb",
     "test/config/newrelic.yml",
     "test/config/test_control.rb",
+    "test/fixtures/proc_cpuinfo.txt",
     "test/new_relic/agent/agent/connect_test.rb",
     "test/new_relic/agent/agent/start_test.rb",
     "test/new_relic/agent/agent/start_worker_thread_test.rb",
@@ -285,9 +286,28 @@ http://github.com/newrelic/rpm/
     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/web_service.rb",
     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/web_transaction.rb"
   ]
-  s.rubygems_version = %q{1.3.6}
-  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.homepage = %q{http://www.github.com/newrelic/rpm}
+  s.post_install_message = %q{
+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.3 of the Ruby Agent.
+  
+}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "New Relic Ruby Agent"]
   s.require_paths = ["lib"]
   s.summary = "New Relic Ruby Agent"

data/test/active_record_fixtures.rb

@@ -12,7 +12,7 @@ module ActiveRecordFixtures
     ActiveRecordFixtures::Order.teardown
     begin
       super
-    rescue Exception => e
+    rescue => e
     end
   end
   class Order < ActiveRecord::Base
@@ -30,7 +30,7 @@ module ActiveRecordFixtures
 
     def self.check_for_table
       connection.table_exists?(self.table_name)
-    rescue Exception => e
+    rescue => e
       false
     end
     
@@ -66,7 +66,7 @@ module ActiveRecordFixtures
     end
     def self.check_for_table
       connection.table_exists?(self.table_name) && connection.table_exists?('orders_shipments')
-    rescue Exception => e
+    rescue => e
       false
     end
 

data/test/fixtures/proc_cpuinfo.txt

@@ -0,0 +1,575 @@
+processor	: 0
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 44
+model name	: Intel(R) Xeon(R) CPU           X5650  @ 2.67GHz
+stepping	: 2
+cpu MHz		: 2660.090
+cache size	: 12288 KB
+physical id	: 1
+siblings	: 12
+core id		: 0
+cpu cores	: 6
+apicid		: 32
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 11
+wp		: yes
+flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm syscall nx pdpe1gb rdtscp lm constant_tsc ida nonstop_tsc arat pni monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr sse4_1 sse4_2 popcnt lahf_lm
+bogomips	: 5320.18
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 40 bits physical, 48 bits virtual
+power management: [8]
+
+processor	: 1
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 44
+model name	: Intel(R) Xeon(R) CPU           X5650  @ 2.67GHz
+stepping	: 2
+cpu MHz		: 2660.090
+cache size	: 12288 KB
+physical id	: 0
+siblings	: 12
+core id		: 0
+cpu cores	: 6
+apicid		: 0
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 11
+wp		: yes
+flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm syscall nx pdpe1gb rdtscp lm constant_tsc ida nonstop_tsc arat pni monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr sse4_1 sse4_2 popcnt lahf_lm
+bogomips	: 5320.05
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 40 bits physical, 48 bits virtual
+power management: [8]
+
+processor	: 2
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 44
+model name	: Intel(R) Xeon(R) CPU           X5650  @ 2.67GHz
+stepping	: 2
+cpu MHz		: 2660.090
+cache size	: 12288 KB
+physical id	: 1
+siblings	: 12
+core id		: 1
+cpu cores	: 6
+apicid		: 34
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 11
+wp		: yes
+flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm syscall nx pdpe1gb rdtscp lm constant_tsc ida nonstop_tsc arat pni monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr sse4_1 sse4_2 popcnt lahf_lm
+bogomips	: 5320.02
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 40 bits physical, 48 bits virtual
+power management: [8]
+
+processor	: 3
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 44
+model name	: Intel(R) Xeon(R) CPU           X5650  @ 2.67GHz
+stepping	: 2
+cpu MHz		: 2660.090
+cache size	: 12288 KB
+physical id	: 0
+siblings	: 12
+core id		: 1
+cpu cores	: 6
+apicid		: 2
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 11
+wp		: yes
+flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm syscall nx pdpe1gb rdtscp lm constant_tsc ida nonstop_tsc arat pni monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr sse4_1 sse4_2 popcnt lahf_lm
+bogomips	: 5320.05
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 40 bits physical, 48 bits virtual
+power management: [8]
+
+processor	: 4
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 44
+model name	: Intel(R) Xeon(R) CPU           X5650  @ 2.67GHz
+stepping	: 2
+cpu MHz		: 2660.090
+cache size	: 12288 KB
+physical id	: 1
+siblings	: 12
+core id		: 2
+cpu cores	: 6
+apicid		: 36
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 11
+wp		: yes
+flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm syscall nx pdpe1gb rdtscp lm constant_tsc ida nonstop_tsc arat pni monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr sse4_1 sse4_2 popcnt lahf_lm
+bogomips	: 5319.95
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 40 bits physical, 48 bits virtual
+power management: [8]
+
+processor	: 5
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 44
+model name	: Intel(R) Xeon(R) CPU           X5650  @ 2.67GHz
+stepping	: 2
+cpu MHz		: 2660.090
+cache size	: 12288 KB
+physical id	: 0
+siblings	: 12
+core id		: 2
+cpu cores	: 6
+apicid		: 4
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 11
+wp		: yes
+flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm syscall nx pdpe1gb rdtscp lm constant_tsc ida nonstop_tsc arat pni monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr sse4_1 sse4_2 popcnt lahf_lm
+bogomips	: 5320.06
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 40 bits physical, 48 bits virtual
+power management: [8]
+
+processor	: 6
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 44
+model name	: Intel(R) Xeon(R) CPU           X5650  @ 2.67GHz
+stepping	: 2
+cpu MHz		: 2660.090
+cache size	: 12288 KB
+physical id	: 1
+siblings	: 12
+core id		: 8
+cpu cores	: 6
+apicid		: 48
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 11
+wp		: yes
+flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm syscall nx pdpe1gb rdtscp lm constant_tsc ida nonstop_tsc arat pni monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr sse4_1 sse4_2 popcnt lahf_lm
+bogomips	: 5320.02
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 40 bits physical, 48 bits virtual
+power management: [8]
+
+processor	: 7
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 44
+model name	: Intel(R) Xeon(R) CPU           X5650  @ 2.67GHz
+stepping	: 2
+cpu MHz		: 2660.090
+cache size	: 12288 KB
+physical id	: 0
+siblings	: 12
+core id		: 8
+cpu cores	: 6
+apicid		: 16
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 11
+wp		: yes
+flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm syscall nx pdpe1gb rdtscp lm constant_tsc ida nonstop_tsc arat pni monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr sse4_1 sse4_2 popcnt lahf_lm
+bogomips	: 5319.98
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 40 bits physical, 48 bits virtual
+power management: [8]
+
+processor	: 8
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 44
+model name	: Intel(R) Xeon(R) CPU           X5650  @ 2.67GHz
+stepping	: 2
+cpu MHz		: 2660.090
+cache size	: 12288 KB
+physical id	: 1
+siblings	: 12
+core id		: 9
+cpu cores	: 6
+apicid		: 50
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 11
+wp		: yes
+flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm syscall nx pdpe1gb rdtscp lm constant_tsc ida nonstop_tsc arat pni monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr sse4_1 sse4_2 popcnt lahf_lm
+bogomips	: 5320.02
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 40 bits physical, 48 bits virtual
+power management: [8]
+
+processor	: 9
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 44
+model name	: Intel(R) Xeon(R) CPU           X5650  @ 2.67GHz
+stepping	: 2
+cpu MHz		: 2660.090
+cache size	: 12288 KB
+physical id	: 0
+siblings	: 12
+core id		: 9
+cpu cores	: 6
+apicid		: 18
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 11
+wp		: yes
+flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm syscall nx pdpe1gb rdtscp lm constant_tsc ida nonstop_tsc arat pni monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr sse4_1 sse4_2 popcnt lahf_lm
+bogomips	: 5319.99
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 40 bits physical, 48 bits virtual
+power management: [8]
+
+processor	: 10
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 44
+model name	: Intel(R) Xeon(R) CPU           X5650  @ 2.67GHz
+stepping	: 2
+cpu MHz		: 2660.090
+cache size	: 12288 KB
+physical id	: 1
+siblings	: 12
+core id		: 10
+cpu cores	: 6
+apicid		: 52
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 11
+wp		: yes
+flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm syscall nx pdpe1gb rdtscp lm constant_tsc ida nonstop_tsc arat pni monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr sse4_1 sse4_2 popcnt lahf_lm
+bogomips	: 5320.02
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 40 bits physical, 48 bits virtual
+power management: [8]
+
+processor	: 11
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 44
+model name	: Intel(R) Xeon(R) CPU           X5650  @ 2.67GHz
+stepping	: 2
+cpu MHz		: 2660.090
+cache size	: 12288 KB
+physical id	: 0
+siblings	: 12
+core id		: 10
+cpu cores	: 6
+apicid		: 20
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 11
+wp		: yes
+flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm syscall nx pdpe1gb rdtscp lm constant_tsc ida nonstop_tsc arat pni monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr sse4_1 sse4_2 popcnt lahf_lm
+bogomips	: 5320.02
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 40 bits physical, 48 bits virtual
+power management: [8]
+
+processor	: 12
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 44
+model name	: Intel(R) Xeon(R) CPU           X5650  @ 2.67GHz
+stepping	: 2
+cpu MHz		: 2660.090
+cache size	: 12288 KB
+physical id	: 1
+siblings	: 12
+core id		: 0
+cpu cores	: 6
+apicid		: 33
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 11
+wp		: yes
+flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm syscall nx pdpe1gb rdtscp lm constant_tsc ida nonstop_tsc arat pni monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr sse4_1 sse4_2 popcnt lahf_lm
+bogomips	: 5319.94
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 40 bits physical, 48 bits virtual
+power management: [8]
+
+processor	: 13
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 44
+model name	: Intel(R) Xeon(R) CPU           X5650  @ 2.67GHz
+stepping	: 2
+cpu MHz		: 2660.090
+cache size	: 12288 KB
+physical id	: 0
+siblings	: 12
+core id		: 0
+cpu cores	: 6
+apicid		: 1
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 11
+wp		: yes
+flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm syscall nx pdpe1gb rdtscp lm constant_tsc ida nonstop_tsc arat pni monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr sse4_1 sse4_2 popcnt lahf_lm
+bogomips	: 5320.05
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 40 bits physical, 48 bits virtual
+power management: [8]
+
+processor	: 14
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 44
+model name	: Intel(R) Xeon(R) CPU           X5650  @ 2.67GHz
+stepping	: 2
+cpu MHz		: 2660.090
+cache size	: 12288 KB
+physical id	: 1
+siblings	: 12
+core id		: 1
+cpu cores	: 6
+apicid		: 35
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 11
+wp		: yes
+flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm syscall nx pdpe1gb rdtscp lm constant_tsc ida nonstop_tsc arat pni monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr sse4_1 sse4_2 popcnt lahf_lm
+bogomips	: 5320.02
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 40 bits physical, 48 bits virtual
+power management: [8]
+
+processor	: 15
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 44
+model name	: Intel(R) Xeon(R) CPU           X5650  @ 2.67GHz
+stepping	: 2
+cpu MHz		: 2660.090
+cache size	: 12288 KB
+physical id	: 0
+siblings	: 12
+core id		: 1
+cpu cores	: 6
+apicid		: 3
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 11
+wp		: yes
+flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm syscall nx pdpe1gb rdtscp lm constant_tsc ida nonstop_tsc arat pni monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr sse4_1 sse4_2 popcnt lahf_lm
+bogomips	: 5320.05
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 40 bits physical, 48 bits virtual
+power management: [8]
+
+processor	: 16
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 44
+model name	: Intel(R) Xeon(R) CPU           X5650  @ 2.67GHz
+stepping	: 2
+cpu MHz		: 2660.090
+cache size	: 12288 KB
+physical id	: 1
+siblings	: 12
+core id		: 2
+cpu cores	: 6
+apicid		: 37
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 11
+wp		: yes
+flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm syscall nx pdpe1gb rdtscp lm constant_tsc ida nonstop_tsc arat pni monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr sse4_1 sse4_2 popcnt lahf_lm
+bogomips	: 5320.02
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 40 bits physical, 48 bits virtual
+power management: [8]
+
+processor	: 17
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 44
+model name	: Intel(R) Xeon(R) CPU           X5650  @ 2.67GHz
+stepping	: 2
+cpu MHz		: 2660.090
+cache size	: 12288 KB
+physical id	: 0
+siblings	: 12
+core id		: 2
+cpu cores	: 6
+apicid		: 5
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 11
+wp		: yes
+flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm syscall nx pdpe1gb rdtscp lm constant_tsc ida nonstop_tsc arat pni monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr sse4_1 sse4_2 popcnt lahf_lm
+bogomips	: 5320.05
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 40 bits physical, 48 bits virtual
+power management: [8]
+
+processor	: 18
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 44
+model name	: Intel(R) Xeon(R) CPU           X5650  @ 2.67GHz
+stepping	: 2
+cpu MHz		: 2660.090
+cache size	: 12288 KB
+physical id	: 1
+siblings	: 12
+core id		: 8
+cpu cores	: 6
+apicid		: 49
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 11
+wp		: yes
+flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm syscall nx pdpe1gb rdtscp lm constant_tsc ida nonstop_tsc arat pni monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr sse4_1 sse4_2 popcnt lahf_lm
+bogomips	: 5330.86
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 40 bits physical, 48 bits virtual
+power management: [8]
+
+processor	: 19
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 44
+model name	: Intel(R) Xeon(R) CPU           X5650  @ 2.67GHz
+stepping	: 2
+cpu MHz		: 2660.090
+cache size	: 12288 KB
+physical id	: 0
+siblings	: 12
+core id		: 8
+cpu cores	: 6
+apicid		: 17
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 11
+wp		: yes
+flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm syscall nx pdpe1gb rdtscp lm constant_tsc ida nonstop_tsc arat pni monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr sse4_1 sse4_2 popcnt lahf_lm
+bogomips	: 5320.05
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 40 bits physical, 48 bits virtual
+power management: [8]
+
+processor	: 20
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 44
+model name	: Intel(R) Xeon(R) CPU           X5650  @ 2.67GHz
+stepping	: 2
+cpu MHz		: 2660.090
+cache size	: 12288 KB
+physical id	: 1
+siblings	: 12
+core id		: 9
+cpu cores	: 6
+apicid		: 51
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 11
+wp		: yes
+flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm syscall nx pdpe1gb rdtscp lm constant_tsc ida nonstop_tsc arat pni monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr sse4_1 sse4_2 popcnt lahf_lm
+bogomips	: 5320.02
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 40 bits physical, 48 bits virtual
+power management: [8]
+
+processor	: 21
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 44
+model name	: Intel(R) Xeon(R) CPU           X5650  @ 2.67GHz
+stepping	: 2
+cpu MHz		: 2660.090
+cache size	: 12288 KB
+physical id	: 0
+siblings	: 12
+core id		: 9
+cpu cores	: 6
+apicid		: 19
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 11
+wp		: yes
+flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm syscall nx pdpe1gb rdtscp lm constant_tsc ida nonstop_tsc arat pni monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr sse4_1 sse4_2 popcnt lahf_lm
+bogomips	: 5320.01
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 40 bits physical, 48 bits virtual
+power management: [8]
+
+processor	: 22
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 44
+model name	: Intel(R) Xeon(R) CPU           X5650  @ 2.67GHz
+stepping	: 2
+cpu MHz		: 2660.090
+cache size	: 12288 KB
+physical id	: 1
+siblings	: 12
+core id		: 10
+cpu cores	: 6
+apicid		: 53
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 11
+wp		: yes
+flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm syscall nx pdpe1gb rdtscp lm constant_tsc ida nonstop_tsc arat pni monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr sse4_1 sse4_2 popcnt lahf_lm
+bogomips	: 5320.05
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 40 bits physical, 48 bits virtual
+power management: [8]
+
+processor	: 23
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 44
+model name	: Intel(R) Xeon(R) CPU           X5650  @ 2.67GHz
+stepping	: 2
+cpu MHz		: 2660.090
+cache size	: 12288 KB
+physical id	: 0
+siblings	: 12
+core id		: 10
+cpu cores	: 6
+apicid		: 21
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 11
+wp		: yes
+flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm syscall nx pdpe1gb rdtscp lm constant_tsc ida nonstop_tsc arat pni monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr sse4_1 sse4_2 popcnt lahf_lm
+bogomips	: 5320.02
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 40 bits physical, 48 bits virtual
+power management: [8]

data/test/new_relic/agent/database_test.rb

@@ -74,7 +74,7 @@ class NewRelic::Agent::DatabaseTest < Test::Unit::TestCase
   end  
   
   def test_handle_exception_in_explain
-    fake_error = Exception.new('a message')
+    fake_error = StandardError.new('a message')
     NewRelic::Control.instance.log.expects(:error).with('Error getting query plan: a message')
     # backtrace can be basically any string, just should get logged
     NewRelic::Control.instance.log.expects(:debug).with(instance_of(String))

data/test/new_relic/agent/error_collector_test.rb

@@ -29,7 +29,7 @@ class NewRelic::Agent::ErrorCollectorTest < Test::Unit::TestCase
   end
   
   def test_simple
-    @error_collector.notice_error(Exception.new("message"), :uri => '/myurl/', :metric => 'path', :referer => 'test_referer', :request_params => {:x => 'y'})
+    @error_collector.notice_error(StandardError.new("message"), :uri => '/myurl/', :metric => 'path', :referer => 'test_referer', :request_params => {:x => 'y'})
 
     old_errors = []
     errors = @error_collector.harvest_errors(old_errors)
@@ -42,7 +42,7 @@ class NewRelic::Agent::ErrorCollectorTest < Test::Unit::TestCase
     assert err.params[:request_uri] == '/myurl/'
     assert err.params[:request_referer] == "test_referer"
     assert err.path == 'path'
-    assert err.exception_class == 'Exception'
+    assert err.exception_class == 'StandardError'
 
     # the collector should now return an empty array since nothing
     # has been added since its last harvest
@@ -53,7 +53,7 @@ class NewRelic::Agent::ErrorCollectorTest < Test::Unit::TestCase
   def test_long_message
     #yes, times 500. it's a 5000 byte string. Assuming strings are
     #still 1 byte / char.
-    @error_collector.notice_error(Exception.new("1234567890" * 500), :uri => '/myurl/', :metric => 'path', :request_params => {:x => 'y'})
+    @error_collector.notice_error(StandardError.new("1234567890" * 500), :uri => '/myurl/', :metric => 'path', :request_params => {:x => 'y'})
 
     old_errors = []
     errors = @error_collector.harvest_errors(old_errors)
@@ -66,13 +66,13 @@ class NewRelic::Agent::ErrorCollectorTest < Test::Unit::TestCase
   end
 
   def test_collect_failover
-    @error_collector.notice_error(Exception.new("message"), :metric => 'first', :request_params => {:x => 'y'})
+    @error_collector.notice_error(StandardError.new("message"), :metric => 'first', :request_params => {:x => 'y'})
 
     errors = @error_collector.harvest_errors([])
 
-    @error_collector.notice_error(Exception.new("message"), :metric => 'second', :request_params => {:x => 'y'})
-    @error_collector.notice_error(Exception.new("message"), :metric => 'path', :request_params => {:x => 'y'})
-    @error_collector.notice_error(Exception.new("message"), :metric => 'last', :request_params => {:x => 'y'})
+    @error_collector.notice_error(StandardError.new("message"), :metric => 'second', :request_params => {:x => 'y'})
+    @error_collector.notice_error(StandardError.new("message"), :metric => 'path', :request_params => {:x => 'y'})
+    @error_collector.notice_error(StandardError.new("message"), :metric => 'last', :request_params => {:x => 'y'})
 
     errors = @error_collector.harvest_errors(errors)
 
@@ -80,8 +80,8 @@ class NewRelic::Agent::ErrorCollectorTest < Test::Unit::TestCase
     assert_equal 'first', errors.first.path
     assert_equal 'last', errors.last.path
 
-    @error_collector.notice_error(Exception.new("message"), :metric => 'first', :request_params => {:x => 'y'})
-    @error_collector.notice_error(Exception.new("message"), :metric => 'last', :request_params => {:x => 'y'})
+    @error_collector.notice_error(StandardError.new("message"), :metric => 'first', :request_params => {:x => 'y'})
+    @error_collector.notice_error(StandardError.new("message"), :metric => 'last', :request_params => {:x => 'y'})
 
     errors = @error_collector.harvest_errors(nil)
     assert_equal 2, errors.length
@@ -95,7 +95,7 @@ class NewRelic::Agent::ErrorCollectorTest < Test::Unit::TestCase
 
     silence_stream(::STDOUT) do
      (max_q_length + 5).times do |n|
-        @error_collector.notice_error(Exception.new("exception #{n}"), :metric => "path", :request_params => {:x => n})
+        @error_collector.notice_error(StandardError.new("exception #{n}"), :metric => "path", :request_params => {:x => n})
       end
     end
 
@@ -120,13 +120,13 @@ class NewRelic::Agent::ErrorCollectorTest < Test::Unit::TestCase
     [1.1, '1.1'],
     ['hi', 'hi'],
     [:hi, :hi],
-    [Exception.new("test"), "#<Exception>"],
+    [StandardError.new("test"), "#<StandardError>"],
     [TestClass.new, "#<NewRelic::Agent::ErrorCollectorTest::TestClass>"]
     ]
 
 
     types.each do |test|
-      @error_collector.notice_error(Exception.new("message"), :metric => 'path', :request_params => {:x => test[0]})
+      @error_collector.notice_error(StandardError.new("message"), :metric => 'path', :request_params => {:x => test[0]})
 
       assert_equal test[1], @error_collector.harvest_errors([])[0].params[:request_params][:x]
     end
@@ -148,7 +148,7 @@ class NewRelic::Agent::ErrorCollectorTest < Test::Unit::TestCase
     @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'})
+    @error_collector.notice_error(StandardError.new("message"), :metric => 'path', :request_params => {:x => 'y'})
     
     errors = @error_collector.harvest_errors([])
 
@@ -158,8 +158,8 @@ class NewRelic::Agent::ErrorCollectorTest < Test::Unit::TestCase
   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)"))
+    @error_collector.notice_error(StandardError.new("YO SQL BAD: serect * flom test where foo = 'bar'"))
+    @error_collector.notice_error(StandardError.new("YO SQL BAD: serect * flom test where foo in (1,2,3,4,5)"))
 
     old_errors = []
     errors = @error_collector.harvest_errors([])

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

@@ -10,7 +10,7 @@ class NewRelic::Agent::Instrumentation::ActiveRecordInstrumentationTest < Test::
     ActiveRecordFixtures.setup
     NewRelic::Agent.instance.transaction_sampler.reset!
     NewRelic::Agent.instance.stats_engine.clear_stats
-  rescue Exception => e
+  rescue => e
     puts e
     puts e.backtrace.join("\n")
   end
@@ -186,6 +186,7 @@ class NewRelic::Agent::Instrumentation::ActiveRecordInstrumentationTest < Test::
     ActiveRecord/ActiveRecordFixtures::Order/destroy
     Database/SQL/insert
     Database/SQL/delete
+    Database/SQL/show
     ActiveRecord/find
     ActiveRecord/ActiveRecordFixtures::Order/find
     ActiveRecord/ActiveRecordFixtures::Shipment/find

data/test/new_relic/agent/method_tracer_test.rb

@@ -309,11 +309,11 @@ class NewRelic::Agent::MethodTracerTest < Test::Unit::TestCase
       metric = "hey"
       self.class.trace_execution_scoped metric do
         assert @stats_engine.peek_scope.name == metric
-        throw Exception.new
+        throw StandardError.new
       end
 
       assert false # should never get here
-    rescue Exception
+    rescue StandardError
       # make sure the scope gets popped
       assert @stats_engine.peek_scope == nil
     end

data/test/new_relic/agent/stats_engine_test.rb

@@ -179,7 +179,7 @@ class NewRelic::Agent::StatsEngineTest < Test::Unit::TestCase
 
 
   def test_collect_gc_data
-    GC.disable
+    GC.disable unless NewRelic::LanguageSupport.using_engine?('jruby')
     if NewRelic::LanguageSupport.using_engine?('rbx')
       agent = ::Rubinius::Agent.loopback
       agent.stubs(:get).with('system.gc.young.total_wallclock') \
@@ -210,7 +210,7 @@ class NewRelic::Agent::StatsEngineTest < Test::Unit::TestCase
     assert_equal 2, gc_stats.call_count
     assert_equal 3.0, gc_stats.total_call_time
   ensure
-    GC.enable
+    GC.enable unless NewRelic::LanguageSupport.using_engine?('jruby')
   end
   
   private

data/test/new_relic/agent/transaction_sample_builder_test.rb

@@ -42,7 +42,7 @@ class NewRelic::Agent::TransationSampleBuilderTest < Test::Unit::TestCase
     begin
       builder.sample
       assert false
-    rescue Exception => e
+    rescue => e
       # expected
     end
 

data/test/new_relic/agent/worker_loop_test.rb

@@ -45,7 +45,7 @@ class NewRelic::Agent::WorkerLoopTest < Test::Unit::TestCase
     end
     assert done
   end
-  class BadBoy < Exception; end
+  class BadBoy < StandardError; end
 
   def test_task_error__exception
     @logger.expects(:error).once

data/test/new_relic/control/configuration_test.rb

@@ -69,4 +69,16 @@ class NewRelic::Control::ConfigurationTest < Test::Unit::TestCase
 
     NewRelic::Control.instance['browser_monitoring'] = { 'auto_instrument' => true }
   end
+
+  def test_data_serialization_default_off
+    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/local_environment_test.rb

@@ -46,6 +46,7 @@ class NewRelic::LocalEnvironmentTest < Test::Unit::TestCase
 
     ::Passenger.class_eval { remove_const :AbstractServer }
   end
+  
   def test_snapshot
     e = NewRelic::LocalEnvironment.new
     s = e.snapshot
@@ -60,6 +61,19 @@ class NewRelic::LocalEnvironmentTest < Test::Unit::TestCase
     end
   end
 
+  def test_gather_cpu_info_successful
+    e = NewRelic::LocalEnvironment.new
+    e.gather_cpu_info(File.expand_path(File.join(File.dirname(__FILE__),'..', 'fixtures', 'proc_cpuinfo.txt')))
+    s = e.snapshot
+    assert_equal 24, s.assoc('Processors').last.to_i
+  end
+
+  def test_gather_cpu_info_failure
+    e = NewRelic::LocalEnvironment.new
+    e.gather_cpu_info(File.expand_path(File.join(File.dirname(__FILE__),'..', 'test_helper.rb')))
+    s = e.snapshot
+    assert_equal 1, s.assoc('Processors').last.to_i    
+  end
 
   def test_default_port
     e = NewRelic::LocalEnvironment.new
@@ -68,5 +82,4 @@ class NewRelic::LocalEnvironmentTest < Test::Unit::TestCase
     assert_equal '3121', e.send(:default_port)
     ARGV.pop
   end
-
 end

data/vendor/gems/dependency_detection-0.0.1.build/lib/dependency_detection.rb

@@ -21,6 +21,11 @@ module DependencyDetection
     @@items.find {|i| i.name == name }
   end
 
+  def installed?(name)
+    item = dependency_by_name(name)
+    item && item.executed
+  end
+
   class Dependent
     attr_reader :executed
     attr_reader :name

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: newrelic_rpm
 version: !ruby/object:Gem::Version 
-  hash: 62196449
+  hash: 62196455
   prerelease: 6
   segments: 
   - 3
   - 3
   - 2
   - beta
-  - 1
-  version: 3.3.2.beta1
+  - 2
+  version: 3.3.2.beta2
 platform: ruby
 authors: 
 - Bill Kayser
@@ -20,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-20 00:00:00 -08:00
+date: 2012-02-10 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -200,6 +200,7 @@ files:
 - test/active_record_fixtures.rb
 - test/config/newrelic.yml
 - test/config/test_control.rb
+- test/fixtures/proc_cpuinfo.txt
 - test/new_relic/agent/agent/connect_test.rb
 - test/new_relic/agent/agent/start_test.rb
 - test/new_relic/agent/agent/start_worker_thread_test.rb