newrelic_rpm 2.9.3 → 2.9.4

data/CHANGELOG

@@ -1,7 +1,12 @@
+v2.9.4
+  * Clamp size of data sent to server
+  * Reset statistics for passenger when forking to avoid erroneous data
+  * Fix problem deserializing errors from the server
+  * Fix incompatibility with postgres introduced in 2.9.
+
 v2.9.3.
   * Fix startup failure in Windows due to memory sampler
   * Add JRuby environment information 
-
 v2.9.2.
   * change default apdex_t to 0.5 seconds 
   * fix bug in deployments introduced by multi_homed setting

data/init.rb

@@ -21,7 +21,7 @@ begin
   if ! defined?(::NEWRELIC_STARTED)
     ::NEWRELIC_STARTED = "#{caller.join("\n")}"
 
-    NewRelic::Control.instance.init_plugin (defined?(config) ? {:config => config} : {})
+    NewRelic::Control.instance.init_plugin(defined?(config) ? {:config => config} : {})
   else
     NewRelic::Control.instance.log.debug "Attempt to initialize the plugin twice!"
     NewRelic::Control.instance.log.debug "Original call: \n#{::NEWRELIC_STARTED}"

data/lib/new_relic/agent/agent.rb

@@ -202,7 +202,7 @@ module NewRelic::Agent
         end
       end
       control.log! "New Relic RPM Agent #{NewRelic::VERSION::STRING} Initialized: pid = #{$$}"
-      control.log! "Agent Log found in #{NewRelic::Control.instance.log_file}"
+      control.log! "Agent Log found in #{NewRelic::Control.instance.log_file}" if NewRelic::Control.instance.log_file
     end
 
     private
@@ -322,10 +322,10 @@ module NewRelic::Agent
       # wait a few seconds for the web server to boot, necessary in development
       connect_retry_period = 5
       connect_attempts = 0
-      
+      @agent_id = nil
       begin
         sleep connect_retry_period.to_i
-        @agent_id = invoke_remote :start, @local_host, {
+        @agent_id ||= invoke_remote :start, @local_host, {
           :pid => $$, 
           :launch_time => @launch_time.to_f, 
           :agent_version => NewRelic::VERSION::STRING, 
@@ -375,16 +375,14 @@ module NewRelic::Agent
         # retry logic
         connect_attempts += 1
         case connect_attempts
-          when 1..5
-          connect_retry_period, period_msg = 5, nil
-          when 6..10 then
-          connect_retry_period, period_msg = 30, nil
-          when 11..20 then
+          when 1..2
           connect_retry_period, period_msg = 60, "1 minute"
+          when 3..5 then
+          connect_retry_period, period_msg = 60 * 2, "2 minutes"
         else 
           connect_retry_period, period_msg = 10*60, "10 minutes"
         end
-        log.info "Will re-attempt in #{period_msg}" if period_msg
+        log.info "Will re-attempt in #{period_msg}" 
         retry
       end
     end
@@ -445,14 +443,23 @@ module NewRelic::Agent
       unless @traces.empty?
         now = Time.now
         log.debug "Sending (#{@traces.length}) transaction traces"
-        
-        # take the traces and prepare them for sending across the wire.  This includes
-        # gathering SQL explanations, stripping out stack traces, and normalizing SQL.
-        # note that we explain only the sql statements whose segments' execution times exceed 
-        # our threshold (to avoid unnecessary overhead of running explains on fast queries.)
-        traces = @traces.collect {|trace| trace.prepare_to_send(:explain_sql => @explain_threshold, :record_sql => @record_sql, :keep_backtraces => true, :explain_enabled => @explain_enabled)} 
-        
-        invoke_remote :transaction_sample_data, @agent_id, traces
+        begin        
+          # take the traces and prepare them for sending across the
+          # wire.  This includes gathering SQL explanations, stripping
+          # out stack traces, and normalizing SQL.  note that we
+          # explain only the sql statements whose segments' execution
+          # times exceed our threshold (to avoid unnecessary overhead
+          # of running explains on fast queries.)
+          traces = @traces.collect {|trace| trace.prepare_to_send(:explain_sql => @explain_threshold, :record_sql => @record_sql, :keep_backtraces => true, :explain_enabled => @explain_enabled)} 
+
+
+          invoke_remote :transaction_sample_data, @agent_id, traces
+        rescue PostTooBigException
+          # we tried to send too much data, drop the first trace and
+          # try again
+          @traces.shift
+          retry
+        end
         
         log.debug "#{now}: sent slowest sample (#{@agent_id}) in #{Time.now - now} seconds"
       end
@@ -472,38 +479,57 @@ module NewRelic::Agent
       @unsent_errors = @error_collector.harvest_errors(@unsent_errors)
       if @unsent_errors && @unsent_errors.length > 0
         log.debug "Sending #{@unsent_errors.length} errors"
-        
-        invoke_remote :error_data, @agent_id, @unsent_errors
-        
-        # if the remote invocation fails, then we never clear @unsent_errors,
-        # and therefore we can re-attempt to send on the next heartbeat.  Note
-        # the error collector maxes out at 20 instances to prevent leakage
+        begin        
+          invoke_remote :error_data, @agent_id, @unsent_errors
+        rescue PostTooBigException
+          @unsent_errors.shift
+          retry
+        end
+        # if the remote invocation fails, then we never clear
+        # @unsent_errors, and therefore we can re-attempt to send on
+        # the next heartbeat.  Note the error collector maxes out at
+        # 20 instances to prevent leakage
         @unsent_errors = []
       end
     end
-    
-    # send a message via post
-    def invoke_remote(method, *args)
-      # we currently optimize for CPU here since we get roughly a 10x reduction in
-      # message size with this, and CPU overhead is at a premium.  If we wanted
-      # to go for higher compression instead, we could use Zlib::BEST_COMPRESSION and 
-      # pay a little more CPU.
-      data = Marshal.dump(args)
-      encoding = data.size > 2000 ? 'deflate' : 'identity' # don't compress small payloads
-      post_data = encoding == 'deflate' ? Zlib::Deflate.deflate(data, Zlib::BEST_SPEED) : data
-      http = control.http_connection(collector)
+
+    def compress_data(object)
+      dump = Marshal.dump(object)
       
-      uri = "/agent_listener/#{PROTOCOL_VERSION}/#{control.license_key}/#{method}"
-      uri += "?run_id=#{@agent_id}" if @agent_id
+      # we currently optimize for CPU here since we get roughly a 10x
+      # reduction in message size with this, and CPU overhead is at a
+      # premium. For extra-large posts, we use the higher compression
+      # since otherwise it actually errors out.
+      
+      dump_size = dump.size
+      
+      # small payloads don't need compression      
+      return [dump, 'identity'] if dump_size < 2000
       
-      request = Net::HTTP::Post.new(uri, 'CONTENT-ENCODING' => encoding, 'ACCEPT-ENCODING' => 'gzip', 'HOST' => collector.name)
+      # medium payloads get fast compression, to save CPU
+      # big payloads get all the compression possible, to stay under
+      # the 2,000,000 byte post threshold      
+      compression = dump_size < 2000000 ? Zlib::BEST_SPEED : Zlib::BEST_COMPRESSION
+      
+      [Zlib::Deflate.deflate(dump, compression), 'deflate']
+    end
+    
+    def check_post_size(post_string)
+      # TODO: define this as a config option on the server side
+      return if post_string.size < 2000000
+      log.warn "Tried to send too much data, retrying with less: #{post_string.size} bytes"
+      raise PostTooBigException
+    end
+
+    def send_request(opts)
+      request = Net::HTTP::Post.new(opts[:uri], 'CONTENT-ENCODING' => opts[:encoding], 'ACCEPT-ENCODING' => 'gzip', 'HOST' => opts[:collector].name)
       request.content_type = "application/octet-stream"
-      request.body = post_data
+      request.body = opts[:data]
       
-      log.debug "connect to #{collector}#{uri}"
+      log.debug "connect to #{opts[:collector]}#{opts[:uri]}"
       
       response = nil
-      
+      http = control.http_connection(collector)      
       begin
         timeout(@request_timeout) do      
           response = http.request(request)
@@ -513,26 +539,48 @@ module NewRelic::Agent
         raise IgnoreSilentlyException
       end
       
-      if response.is_a? Net::HTTPSuccess
-        body = nil
-        if response['content-encoding'] == 'gzip'
-          log.debug "Decompressing return value"
-          i = Zlib::GzipReader.new(StringIO.new(response.body))
-          body = i.read
-        else
-          log.debug "Uncompressed content returned"
-          body = response.body
-        end
-        return_value = Marshal.load(body)
-        if return_value.is_a? Exception
-          raise return_value
-        else
-          return return_value
-        end
-      else
+      if !(response.is_a? Net::HTTPSuccess)
         log.debug "Unexpected response from server: #{response.code}: #{response.message}"
         raise IgnoreSilentlyException
-      end 
+      end
+      response
+    end
+
+    def decompress_response(response)
+      if response['content-encoding'] != 'gzip'
+        log.debug "Uncompressed content returned"
+        return response.body
+      end
+      log.debug "Decompressing return value"
+      i = Zlib::GzipReader.new(StringIO.new(response.body))
+      i.read
+    end
+
+    def check_for_exception(response)
+      dump = decompress_response(response)
+      value = Marshal.load(dump)
+      raise value if value.is_a? Exception
+      value
+    end
+    
+    def remote_method_uri(method)
+      uri = "/agent_listener/#{PROTOCOL_VERSION}/#{control.license_key}/#{method}"
+      uri << "?run_id=#{@agent_id}" if @agent_id
+      uri
+    end
+      
+    # send a message via post
+    def invoke_remote(method, *args)
+      #determines whether to zip the data or send plain
+      post_data, encoding = compress_data(args)
+      
+      # this checks to make sure mongrel won't choke on big uploads
+      check_post_size(post_data) 
+      
+      response = send_request({:uri => remote_method_uri(method), :encoding => encoding, :collector => collector, :data => post_data})
+
+      # raises the right exception if the remote server tells it to die
+      return check_for_exception(response)
     rescue ForceDisconnectException => e
       log.error "RPM forced this agent to disconnect (#{e.message})\n" \
       "Restart this process to resume monitoring via rpm.newrelic.com."
@@ -562,7 +610,7 @@ module NewRelic::Agent
         rescue Timeout::Error, StandardError 
         end
       else
-        log.debug "Bypassing graceful shutdown - agent in development mode"
+        log.debug "Bypassing graceful shutdown - agent not connected"
       end
     end
   end

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

@@ -13,14 +13,13 @@ if defined?(ActiveRecord::Base) && !NewRelic::Control.instance['skip_ar_instrume
     end
     
     def active_record_all_stats
-      # need to lazy init this
-      @@active_record_all ||= NewRelic::Agent.instance.stats_engine.get_stats_no_scope("ActiveRecord/all")
+      NewRelic::Agent.instance.stats_engine.get_stats_no_scope("ActiveRecord/all")
     end
     
     def log_with_newrelic_instrumentation(sql, name, &block)
       # Capture db config if we are going to try to get the explain plans
-      if (defined? ActiveRecord::ConnectionAdapters::MysqlAdapter && self.is_a?(ActiveRecord::ConnectionAdapters::MysqlAdapter)) ||
-       (defined? ActiveRecord::ConnectionAdapters::PostgreSQLAdapter && self.is_a?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter))
+      if (defined?(ActiveRecord::ConnectionAdapters::MysqlAdapter) && self.is_a?(ActiveRecord::ConnectionAdapters::MysqlAdapter)) ||
+       (defined?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter) && self.is_a?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter))
         supported_config = @config
       end
       if name && (parts = name.split " ") && parts.size == 2

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

@@ -175,7 +175,7 @@ module NewRelic::Agent::Instrumentation
     
     private
     def apdex_overall_stat
-      @@newrelic_apdex_overall ||= NewRelic::Agent.instance.stats_engine.get_custom_stats("Apdex", NewRelic::ApdexStats)  
+      NewRelic::Agent.instance.stats_engine.get_custom_stats("Apdex", NewRelic::ApdexStats)  
     end
     
     def is_filtered?(ignore_actions)

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

@@ -32,7 +32,7 @@ module NewRelic::Agent::Instrumentation
         newrelic_dispatcher_start_time = Thread.current[:newrelic_dispatcher_start]
         response_code = newrelic_response_code
         if response_code
-          stats = response_stats[response_code] ||= NewRelic::Agent.agent.stats_engine.get_stats("HTTP/Response/#{response_code}")
+          stats = NewRelic::Agent.agent.stats_engine.get_stats_no_scope("HTTP/Response/#{response_code}")
           stats.trace_call(dispatcher_end_time - newrelic_dispatcher_start_time)
         end
         dispatch_stat.trace_call(dispatcher_end_time - newrelic_dispatcher_start_time) 
@@ -55,13 +55,10 @@ module NewRelic::Agent::Instrumentation
     private
     # memoize the stats to avoid the cost of the lookup each time.
     def dispatch_stat
-      @@newrelic_rails_dispatch_stat ||= NewRelic::Agent.agent.stats_engine.get_stats 'Rails/HTTP Dispatch'  
+      NewRelic::Agent.agent.stats_engine.get_stats_no_scope 'Rails/HTTP Dispatch'  
     end
     def mongrel_queue_stat
-      @@newrelic_mongrel_queue_stat ||= NewRelic::Agent.agent.stats_engine.get_stats('WebFrontend/Mongrel/Average Queue Time')  
-    end
-    def response_stats
-      @@newrelic_response_stats ||= { '200' => NewRelic::Agent.agent.stats_engine.get_stats('HTTP/Response/200')}  
+      NewRelic::Agent.agent.stats_engine.get_stats_no_scope 'WebFrontend/Mongrel/Average Queue Time'  
     end
     
     # This won't work with Rails 2.2 multi-threading
@@ -121,7 +118,7 @@ module NewRelic::Agent::Instrumentation
       private
       def instance_busy_stats
         # Late binding on the Instance/busy stats
-        @instance_busy ||= NewRelic::Agent.agent.stats_engine.get_stats('Instance/Busy')  
+        NewRelic::Agent.agent.stats_engine.get_stats_no_scope 'Instance/Busy'  
       end
       
     end

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

@@ -1,7 +1,20 @@
 if defined?(PhusionPassenger)
-  NewRelic::Control.instance.log.debug "Installing Passenger shutdown hook."
+  NewRelic::Control.instance.log.debug "Installing Passenger event hooks."
+
   PhusionPassenger.on_event(:stopping_worker_process) do 
     NewRelic::Control.instance.log.info "Passenger stopping this process, shutdown the agent."
     NewRelic::Agent.instance.shutdown
   end
+
+  PhusionPassenger.on_event(:starting_worker_process) do |forked|
+    if forked 
+      # We want to reset the stats from the stats engine in case any carried
+      # over into the spawned process.  Don't clear them in case any were
+      # cached.
+      NewRelic::Agent.instance.stats_engine.reset_stats
+    else 
+      # We're in conservative spawning mode. We don't need to do anything.
+    end
+  end
+  
 end 

data/lib/new_relic/agent/instrumentation/rails/action_controller.rb

@@ -34,10 +34,6 @@ if defined? ActionController
     alias_method :perform_action, :perform_action_with_newrelic_trace
     private :perform_action
     
-    #add_method_tracer :render_for_file, 'View/#{args[0]}/ForFile/Rendering'
-    #add_method_tracer :render_for_text, 'View/#{newrelic_metric_path}/Text/Rendering'
-    #add_method_tracer :render, 'View/#{newrelic_metric_path}/Rendering'
-    
     def self.newrelic_write_attr(attr_name, value) # :nodoc:
       write_inheritable_attribute(attr_name, value)
     end

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

@@ -6,16 +6,16 @@ module NewRelic::Agent::Samplers
       poll
     end
     def user_util_stats
-      @userutil ||= stats_engine.get_stats("CPU/User/Utilization", false)
+      stats_engine.get_stats_no_scope("CPU/User/Utilization")
     end
     def system_util_stats
-      @systemutil ||= stats_engine.get_stats("CPU/System/Utilization", false)
+      stats_engine.get_stats_no_scope("CPU/System/Utilization")
     end
     def usertime_stats
-      @usertime ||= stats_engine.get_stats("CPU/User Time", false)
+      stats_engine.get_stats_no_scope("CPU/User Time")
     end
     def systemtime_stats
-      @systemtime ||= stats_engine.get_stats("CPU/System Time", false)
+      stats_engine.get_stats_no_scope("CPU/System Time")
     end
     def poll
       now = Time.now

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

@@ -1,6 +1,8 @@
 module NewRelic::Agent::Samplers
   
   class MemorySampler < NewRelic::Agent::Sampler
+    attr_accessor :sampler
+    
     def initialize
       super :memory
       
@@ -35,7 +37,7 @@ module NewRelic::Agent::Samplers
     end
     
     def stats
-      @stats ||= stats_engine.get_stats("Memory/Physical", false) 
+      stats_engine.get_stats("Memory/Physical", false) 
     end
     def poll
       sample = @sampler.get_sample

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

@@ -5,7 +5,7 @@ module NewRelic::Agent::Samplers
       super :mongrel
     end
     def queue_stats
-      @queue_stats ||= stats_engine.get_stats("Mongrel/Queue Length", false)
+      stats_engine.get_stats("Mongrel/Queue Length", false)
     end
     def poll
       mongrel = NewRelic::Control.instance.local_env.mongrel

data/lib/new_relic/agent/stats_engine.rb

@@ -252,9 +252,16 @@ module NewRelic::Agent
       Thread::current[:newrelic_transaction_name] = nil
     end
     
-    def clear_stats # :nodoc: for test code only
+    # Remove all stats.  For test code only.
+    def clear_stats 
       @stats_hash.clear
     end
+    
+    # Reset each of the stats, such as when a new passenger instance starts up.
+    def reset_stats 
+      @stats_hash.values.each { |s| s.reset }
+    end
+
     private
     
     # Call poll on each of the samplers.  Remove

data/lib/new_relic/agent/transaction_sampler.rb

@@ -178,7 +178,6 @@ module NewRelic::Agent
           
           if (@harvest_count % @sampling_rate) == 0
             result << @random_sample if @random_sample
-            @random_sample = nil
           end
         end
         
@@ -192,6 +191,8 @@ module NewRelic::Agent
             result << previous_slowest
           end
         end
+
+        @random_sample = nil
       end
       result
     end

data/lib/new_relic/local_environment.rb

@@ -75,7 +75,7 @@ module NewRelic
       append_environment_value('Ruby version'){ RUBY_VERSION }
       append_environment_value('Ruby platform') { RUBY_PLATFORM }
       append_environment_value('Ruby patchlevel') { RUBY_PATCHLEVEL }
-      if defined? Java
+      if defined? ::JRUBY_VERSION
         append_environment_value('JRuby version') { JRUBY_VERSION }
         append_environment_value('Java VM version') { ENV_JAVA['java.vm.version']}
       end
@@ -160,7 +160,7 @@ module NewRelic
     end
 
     def check_for_glassfish
-      return unless defined?(Java) &&
+      return unless defined?(::Java) &&
          (((com.sun.grizzly.jruby.rack.DefaultRackApplicationFactory rescue nil) &&
          defined?(com::sun::grizzly::jruby::rack::DefaultRackApplicationFactory)) ||
          ((org.jruby.rack.DefaultRackApplicationFactory rescue nil) &&

data/lib/new_relic/metric_parser.rb

@@ -62,6 +62,10 @@ module NewRelic
       short_name
     end
     
+    def tooltip_name
+      short_name
+    end
+    
     # Return the name of another metric if the current
     # metric is really add-on data for another metric.
     def base_metric_name

data/lib/new_relic/metric_parser/controller.rb

@@ -23,7 +23,7 @@ class NewRelic::MetricParser::Controller < NewRelic::MetricParser
   # return the cpu measuring equivalent.  It may be nil since this metric was not
   # present in earlier versions of the agent.
   def cpu_metric
-    Metric.lookup((["ControllerCPU"] + segments[1..-1]).join('/'), "", :create => false)
+    Metric.lookup((["ControllerCPU"] + segments[1..-1]).join('/'), :create => false)
   end
   
   def short_name

data/lib/new_relic/metric_spec.rb

@@ -4,9 +4,9 @@ class NewRelic::MetricSpec
   attr_accessor   :name
   attr_accessor   :scope
   
-  def initialize (name, scope = '')
-    self.name = name
-    self.scope = scope
+  def initialize (metric_name, metric_scope = '')
+    self.name = metric_name
+    self.scope = metric_scope
   end
   
   def eql? (o)
@@ -20,6 +20,10 @@ class NewRelic::MetricSpec
     h
   end
   
+  def to_s
+    "#{name}:#{scope}"
+  end
+  
   def to_json(*a)
     {'name' => name, 
     'scope' => scope}.to_json(*a)

data/lib/new_relic/noticed_error.rb

@@ -11,9 +11,9 @@ class NewRelic::NoticedError
     self.exception_class = exception.class.name
     
     if exception.respond_to?('original_exception')
-      self.message = exception.original_exception.message
+      self.message = exception.original_exception.message.to_s
     else
-      self.message = exception.message
+      self.message = exception.message.to_s
     end
     
     # clamp long messages to 4k so that we don't send a lot of

data/lib/new_relic/version.rb

@@ -3,7 +3,7 @@ module NewRelic
   module VERSION #:nodoc:
     MAJOR = 2
     MINOR = 9
-    TINY  = 3
+    TINY  = 4
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
   

data/newrelic.yml

@@ -75,7 +75,6 @@ common: &default_settings
   # http://support.newrelic.com/faqs/general/apdex
 
   apdex_t: 0.5
-    
 
   # Proxy settings for connecting to the RPM server.
   #
@@ -156,9 +155,9 @@ common: &default_settings
 
 development:
   <<: *default_settings
-  # turn off communication to RPM service in development mode.  NOTE:
-  # for initial evaluation purposes, you may want to temporarily turn
-  # the agent on in development mode.
+  # Turn off communication to RPM service in development mode.  
+  # NOTE: for initial evaluation purposes, you may want to temporarily 
+  # turn the agent on in development mode.
   enabled: false
 
   # When running in Developer Mode, the New Relic Agent will present

data/newrelic_rpm.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{newrelic_rpm}
-  s.version = "2.9.3"
+  s.version = "2.9.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bill Kayser"]
-  s.date = %q{2009-07-10}
+  s.date = %q{2009-07-22}
   s.description = %q{New Relic Ruby Performance Monitoring Agent}
   s.email = %q{bkayser@newrelic.com}
   s.executables = ["mongrel_rpm", "newrelic_cmd"]

data/test/new_relic/agent/active_record_instrumentation_test.rb

@@ -54,6 +54,7 @@ class ActiveRecordInstrumentationTest < Test::Unit::TestCase
     #   This doesn't work on hudson because the sampler metrics creep in.    
     #   metrics = NewRelic::Agent.instance.stats_engine.metrics.select { |mname| mname =~ /ActiveRecord\/ActiveRecordFixtures::Order\// }.sort
     expected = %W[
+      ActiveRecord/all
       ActiveRecord/create
       ActiveRecord/find
       ActiveRecord/ActiveRecordFixtures::Order/create
@@ -75,6 +76,7 @@ class ActiveRecordInstrumentationTest < Test::Unit::TestCase
     #   This doesn't work on hudson because the sampler metrics creep in.    
     #   metrics = NewRelic::Agent.instance.stats_engine.metrics.select { |mname| mname =~ /ActiveRecord\/ActiveRecordFixtures::Order\// }.sort
     compare_metrics %W[
+    ActiveRecord/all
     ActiveRecord/destroy
     ActiveRecord/ActiveRecordFixtures::Order/destroy
     Database/SQL/insert
@@ -95,6 +97,7 @@ class ActiveRecordInstrumentationTest < Test::Unit::TestCase
     list = ActiveRecordFixtures::Order.connection.select_rows "select * from #{ActiveRecordFixtures::Order.table_name}"
     metrics = NewRelic::Agent.instance.stats_engine.metrics
     compare_metrics %W[
+    ActiveRecord/all
     Database/SQL/select
     ], metrics
     assert_equal 1, NewRelic::Agent.get_stats("Database/SQL/select").call_count

data/test/ui/newrelic_helper_test.rb

@@ -45,9 +45,9 @@ class NewRelic::Agent::NewrelicHelperTest < Test::Unit::TestCase
   private
   def assert_clean(backtrace, rails=false)
     if !rails
-      assert_equal 0, backtrace.grep('/rails/').size, backtrace.grep(/newrelic_rpm/)
+      assert_equal 0, backtrace.grep('/rails/').size, backtrace.join("\n")
     end
-    assert_equal 0, backtrace.grep(/trace/).size, backtrace.grep(/trace/)
-    assert_equal 0, backtrace.grep(/newrelic_rpm\/lib/).size, backtrace.grep(/newrelic_rpm\/lib/)
+    assert_equal 0, backtrace.grep(/trace/).size, backtrace.join("\n")
+    assert_equal 0, backtrace.grep(/newrelic_rpm\/agent/).size, backtrace.join("\n")
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: newrelic_rpm
 version: !ruby/object:Gem::Version 
-  version: 2.9.3
+  version: 2.9.4
 platform: ruby
 authors: 
 - Bill Kayser
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-10 00:00:00 -07:00
+date: 2009-07-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency