newrelic_rpm 2.8.2 → 2.8.3

data/README

@@ -38,7 +38,7 @@ http://localhost:3000/newrelic
 === PRODUCTION MODE
 
 To monitor your applications in production, create an account at
-http://newrelic.com/get-RPM.htm
+http://newrelic.com/get-RPM.html
 
 When your application runs in the production environment, the New Relic agent
 runs in production mode. It connects to the New Relic RPM service and sends deep

data/lib/new_relic/agent/collection_helper.rb

@@ -13,7 +13,7 @@ module NewRelic::Agent::CollectionHelper
         new_params = {}
         params.each do | key, value |
           new_params[truncate(normalize_params(key),32)] = normalize_params(value)
-      end
+        end
         new_params
       when Enumerable
       # We only want the first 20 values of any enumerable.  Invoking to_a.first(20) works but

data/lib/new_relic/config.rb

@@ -187,6 +187,7 @@ module NewRelic
     end
     
     def start_agent
+      require 'new_relic/agent.rb'
       NewRelic::Agent::Agent.instance.start(local_env.environment, local_env.identifier)
     end
     

data/lib/new_relic/config/rails.rb

@@ -43,20 +43,8 @@ class NewRelic::Config::Rails < NewRelic::Config
       return
     end
     
-    # This is a monkey patch to inject the developer tool route into the
-    # parent app without requiring users to modify their routes. Of course this 
-    # has the effect of adding a route indiscriminately which is frowned upon by 
-    # some: http://www.ruby-forum.com/topic/126316#563328
-    ActionController::Routing::RouteSet.class_eval do
-      next if defined? draw_with_newrelic_map
-      def draw_with_newrelic_map
-        draw_without_newrelic_map do | map |
-          map.named_route 'newrelic_developer', '/newrelic/:action/:id', :controller => 'newrelic' unless NewRelic::Config.instance['skip_developer_route']
-          yield map        
-        end
-      end
-      alias_method_chain :draw, :newrelic_map
-    end
+    install_devmode_route
+    
     
     # If we have the config object then add the controller path to the list.
     # Otherwise we have to assume the controller paths have already been
@@ -85,6 +73,24 @@ class NewRelic::Config::Rails < NewRelic::Config
   
   protected 
   
+  def install_devmode_route
+    # This is a monkey patch to inject the developer tool route into the
+    # parent app without requiring users to modify their routes. Of course this 
+    # has the effect of adding a route indiscriminately which is frowned upon by 
+    # some: http://www.ruby-forum.com/topic/126316#563328
+    ActionController::Routing::RouteSet.class_eval do
+      return false if self.instance_methods.include? 'draw_with_newrelic_map'
+      def draw_with_newrelic_map
+        draw_without_newrelic_map do | map |
+          map.named_route 'newrelic_developer', '/newrelic/:action/:id', :controller => 'newrelic' unless NewRelic::Config.instance['skip_developer_route']
+          yield map        
+        end
+      end
+      alias_method_chain :draw, :newrelic_map
+    end
+    return true
+  end
+  
   # Collect the Rails::Info into an associative array as well as the list of plugins
   def gather_info
     i = [[:app, app]]

data/lib/new_relic/recipes.rb

@@ -40,10 +40,10 @@ make_notify_task = lambda do
         end
         new_revision = rev || source.query_revision(source.head()) { |cmd| `#{cmd}` } 
         deploy_options = { :environment => rails_env,
-                :revision => new_revision,
-                :changelog => changelog, 
-                :description => description,
-                :appname => appname }
+          :revision => new_revision,
+          :changelog => changelog, 
+          :description => description,
+          :appname => appname }
         logger.debug "Uploading deployment to New Relic"
         deployment = NewRelic::Commands::Deployments.new deploy_options
         deployment.run
@@ -62,10 +62,13 @@ make_notify_task = lambda do
     end
   end
 end
-
-instance = Capistrano::Configuration.instance
-if instance
-  instance.load &make_notify_task
+if Capistrano::Version::MAJOR < 2
+  STDERR.puts "Unable to load #{__FILE__}\nNew Relic Capistrano hooks require at least version 2.0.0"
 else
-  make_notify_task.call
-end
+  instance = Capistrano::Configuration.instance
+  if instance
+    instance.load &make_notify_task
+  else
+    make_notify_task.call
+  end
+end

data/lib/new_relic/version.rb

@@ -3,7 +3,7 @@ module NewRelic
   module VERSION #:nodoc:
   MAJOR = 2
   MINOR = 8
-  TINY  = 2
+  TINY  = 3
   STRING = [MAJOR, MINOR, TINY].join('.')
   def self.changes
     puts "NewRelic RPM Plugin Version: #{NewRelic::VERSION::STRING}"
@@ -12,6 +12,12 @@ module NewRelic
 
   CHANGELOG = <<EOF
 
+2009-02-10 version 2.8.3
+  * refactor unit tests so they will run in a generic rails environment
+  * require classes in advance to avoid autoloading.  this is to address
+    incompatibilities with desert as well as more flexibility in gem 
+    initialization
+  * fixed newrelic_helper.rb 1.9 incompatibility
 2009-02-07 version 2.8.2
   * fix Ruby 1.9 syntax compatibility errors
   * update the class loading sanity check, will notify server of errors

data/test/config/test_config.rb

@@ -1,4 +1,6 @@
 require 'new_relic/config/rails'
+require 'new_relic/agent/agent_test_controller'
+
 class NewRelic::Config::Test < NewRelic::Config::Rails
   def env
     'test'
@@ -6,4 +8,28 @@ class NewRelic::Config::Test < NewRelic::Config::Rails
   def config_file
     File.join(File.dirname(__FILE__), "newrelic.yml")
   end
+  def initialize
+    super
+    setup_log env
+  end
+  # when running tests, don't write out stderr
+  def log!(msg, level=:info)
+    log.send level, msg if log
+  end
+  
+  # Add the default route in case it's missing.  Need it for testing.
+  def install_devmode_route
+    if super
+      ActionController::Routing::RouteSet.class_eval do
+      def draw_with_test_route
+        draw_without_test_route do | map |
+          map.connect ':controller/:action/:id'
+          yield map        
+        end
+      end
+      alias_method_chain :draw, :test_route
+    end
+    return true
+    end
+  end
 end

data/test/new_relic/agent/agent_test_controller.rb

@@ -0,0 +1,25 @@
+# This is a controller class used in testing controller instrumentation
+class NewRelic::Agent::AgentTestController < ActionController::Base
+  filter_parameter_logging :social_security_number
+  def index
+    render :text => params.inspect
+  end
+  def _filter_parameters(params)
+    filter_parameters params
+  end
+  def action_to_render
+    render :text => params.inspect
+  end
+  def action_to_ignore
+    render :text => 'unmeasured'
+  end
+  def entry_action
+    perform_action_with_newrelic_trace('internal_action') do
+      internal_action
+    end    
+  end
+  private
+  def internal_action
+    render :text => 'internal action'
+  end
+end

data/test/new_relic/agent/model_fixture.rb

@@ -6,11 +6,9 @@ class NewRelic::Agent::ModelFixture < ActiveRecord::Base
     connection.create_table :test_data, :force => true do |t|
       t.column :name, :string
     end
-    connection.setup_slow
   end
   
   def self.teardown
-    connection.teardown_slow
     connection.drop_table :test_data
   end
   

data/test/new_relic/agent/tc_active_record.rb

@@ -6,12 +6,7 @@ class ActiveRecordInstrumentationTests < Test::Unit::TestCase
   
   def setup
     super
-    begin
-      NewRelic::Agent::ModelFixture.setup
-    rescue => e
-      puts e
-      raise e
-    end
+    NewRelic::Agent::ModelFixture.setup
     @agent = NewRelic::Agent.instance
     @agent.start :test, :test
     @agent.transaction_sampler.harvest_slowest_sample
@@ -38,7 +33,7 @@ class ActiveRecordInstrumentationTests < Test::Unit::TestCase
     NewRelic::Agent::ModelFixture.find(:all)
     sample = @agent.transaction_sampler.harvest_slowest_sample
     segment = sample.root_segment.called_segments.first.called_segments.first
-    assert_equal "SELECT * FROM `test_data`", segment.params[:sql].strip
+    assert_match /^SELECT \* FROM ["`]test_data["`]$/i, segment.params[:sql].strip
     NewRelic::TransactionSample::Segment.any_instance.expects(:explain_sql).returns([])
     sample = sample.prepare_to_send(:obfuscate_sql => true, :explain_enabled => true, :explain_sql => 0.0)
     segment = sample.root_segment.called_segments.first.called_segments.first
@@ -53,10 +48,11 @@ class ActiveRecordInstrumentationTests < Test::Unit::TestCase
     segment = sample.root_segment.called_segments.first.called_segments.first
     assert_match /^SELECT /, segment.params[:sql]
     explanations = segment.params[:explanation]
-    assert_not_nil explanations, "No explains in segment: #{segment}"
-    assert_equal 1, explanations.size,"No explains in segment: #{segment}" 
-    assert_equal 1, explanations.first.size
-    
+    if isMysql? || isPostgres?
+      assert_not_nil explanations, "No explains in segment: #{segment}"
+      assert_equal 1, explanations.size,"No explains in segment: #{segment}" 
+      assert_equal 1, explanations.first.size
+    end
   end
   def test_transaction
     
@@ -66,16 +62,17 @@ class ActiveRecordInstrumentationTests < Test::Unit::TestCase
     segment = sample.root_segment.called_segments.first.called_segments.first
     assert_nil segment.params[:sql], "SQL should have been removed."
     explanations = segment.params[:explanation]
-    assert_not_nil explanations, "No explains in segment: #{segment}"
-    assert_equal 1, explanations.size,"No explains in segment: #{segment}" 
-    assert_equal 1, explanations.first.size
-    
+    if isMysql? || isPostgres?
+      assert_not_nil explanations, "No explains in segment: #{segment}"
+      assert_equal 1, explanations.size,"No explains in segment: #{segment}" 
+      assert_equal 1, explanations.first.size
+    end    
     if isPostgres?
       assert_equal Array, explanations.class
       assert_equal Array, explanations[0].class
       assert_equal Array, explanations[0][0].class
       assert_match /Seq Scan on test_data/, explanations[0][0].join(";") 
-    else
+    elsif isMysql?
       assert_equal "1;SIMPLE;test_data;ALL;;;;;1;", explanations.first.first.join(";")
     end
     
@@ -87,5 +84,7 @@ class ActiveRecordInstrumentationTests < Test::Unit::TestCase
   def isPostgres?
     NewRelic::Agent::ModelFixture.configurations[RAILS_ENV]['adapter'] =~ /postgres/
   end
-  
+  def isMysql?
+    NewRelic::Agent::ModelFixture.connection.class.name =~ /mysql/i 
+  end
 end

data/test/new_relic/agent/tc_agent.rb

@@ -111,8 +111,8 @@ class AgentTests < ActiveSupport::TestCase
   def test_info
     props = NewRelic::Config.instance.app_config_info
     list = props.assoc('Plugin List').last.sort
-    assert_equal 4, (list & %w[active_merchant active_scaffold acts_as_list acts_as_state_machine ]).size, list.join("\n")
-    assert_equal 'mysql', props.assoc('Database adapter').last
+    assert_not_nil list # can't really guess what might be in here.  
+    assert_match /jdbc|postgres|mysql|sqlite/, props.assoc('Database adapter').last
   end
   def test_version
     assert_match /\d\.\d\.\d+/, NewRelic::VERSION::STRING

data/test/new_relic/agent/tc_collection_helper.rb

@@ -26,13 +26,14 @@ class NewRelic::Agent::CollectionHelperTests < Test::Unit::TestCase
     assert_equal '1000', new_array[0]
   end
   def test_boolean
-    np = normalize_params(APP_CONFIG)
-    assert_equal false, np['disable_ui']
+    np = normalize_params(NewRelic::Config.instance.settings)
+    assert_equal false, np['enabled']
   end
-  def test_coercible_string
-    s = CoercibleString.new "This is a string"
+  class MyString < String; end
+  def test_kind_of_string
+    s = MyString.new "This is a string"
     assert_equal "This is a string", s.to_s
-    assert_equal CoercibleString, s.class
+    assert_equal MyString, s.class
     assert_equal String, s.to_s.class
     params = normalize_params(:val => [s])
     assert_equal String, params[:val][0].class

data/test/new_relic/agent/tc_controller.rb

@@ -1,35 +1,10 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper')) 
 require 'action_controller/base'
-
-
-class AgentTestController < ActionController::Base
-  filter_parameter_logging :social_security_number
-  def index
-    render :text => params.inspect
-  end
-  def _filter_parameters(params)
-    filter_parameters params
-  end
-  def action_to_render
-    render :text => params.inspect
-  end
-  def action_to_ignore
-    render :text => 'unmeasured'
-  end
-  def entry_action
-    perform_action_with_newrelic_trace('internal_action') do
-      internal_action
-    end    
-  end
-  private
-  def internal_action
-    render :text => 'internal action'
-  end
-end
+#require 'new_relic/agent/agent_test_controller'
 
 class AgentControllerTests < ActionController::TestCase
   
-  self.controller_class = AgentTestController
+  self.controller_class = NewRelic::Agent::AgentTestController
   
   attr_accessor :agent
   
@@ -40,7 +15,7 @@ class AgentControllerTests < ActionController::TestCase
     #    @agent.instrument_app
     agent.start :test, :test
     agent.transaction_sampler.harvest_slowest_sample
-    AgentTestController.class_eval do
+    NewRelic::Agent::AgentTestController.class_eval do
       newrelic_ignore :only => [:action_to_ignore, :entry_action]
     end
   end
@@ -57,7 +32,7 @@ class AgentControllerTests < ActionController::TestCase
   end
   def test_metric__no_ignore
     engine = @agent.stats_engine
-    index_stats = engine.get_stats_no_scope('Controller/agent_test/index')
+    index_stats = engine.get_stats_no_scope('Controller/new_relic/agent/agent_test/index')
     assert_difference 'index_stats.call_count' do
       get :index
     end
@@ -68,11 +43,15 @@ class AgentControllerTests < ActionController::TestCase
     get :entry_action
     assert_equal false, Thread.current[:controller_ignored]
     assert_nil engine.lookup_stat('Controller/agent_test/entry_action')
-    assert_equal 1, engine.lookup_stat('Controller/agent_test/internal_action').call_count
+    assert_equal 1, engine.lookup_stat('Controller/new_relic/agent/agent_test/internal_action').call_count
   end
   def test_action_instrumentation
-    get :index, :foo => 'bar'
-    assert_match /bar/, @response.body
+    begin
+      get :index, :foo => 'bar'
+      assert_match /bar/, @response.body
+    #rescue ActionController::RoutingError
+      # you might get here if you don't have the default route installed.
+    end
   end
   
   def test_controller_params

data/test/new_relic/agent/tc_transaction_sample_builder.rb

@@ -1,200 +1,194 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper')) 
-##require 'new_relic/agent/transaction_sampler'
-require 'test/unit'
 
-module NewRelic 
-  module Agent
-    class TransationSampleBuilderTests < Test::Unit::TestCase
-
-      def setup
-        @builder = TransactionSampleBuilder.new
+class NewRelic::Agent::TransationSampleBuilderTests < Test::Unit::TestCase
+  
+  def setup
+    @builder = NewRelic::Agent::TransactionSampleBuilder.new
+  end
+  
+  def test_build_sample
+    build_segment("a") do
+      build_segment("aa") do
+        build_segment("aaa")
       end
-    
-      def test_build_sample
-        build_segment("a") do
-          build_segment("aa") do
-            build_segment("aaa")
-          end
-          build_segment("ab") do
-            build_segment("aba") do
-              build_segment("abaa")
-            end
-            build_segment("aba")
-            build_segment("abc") do
-              build_segment("abca")
-              build_segment("abcd")
-            end
-          end
+      build_segment("ab") do
+        build_segment("aba") do
+          build_segment("abaa")
         end
-        build_segment "b"
-        build_segment "c" do
-          build_segment "ca" 
-          build_segment "cb" do
-            build_segment "cba"
-          end
+        build_segment("aba")
+        build_segment("abc") do
+          build_segment("abca")
+          build_segment("abcd")
         end
-      
-        @builder.finish_trace(Time.now.to_f)
-        validate_builder
       end
+    end
+    build_segment "b"
+    build_segment "c" do
+      build_segment "ca" 
+      build_segment "cb" do
+        build_segment "cba"
+      end
+    end
     
-      def test_freeze
-        build_segment "a" do
-          build_segment "aa"
-        end
-        
-        begin 
-          builder.sample
-          assert false
-        rescue Exception => e
-          # expected
-        end
-        
-        @builder.finish_trace(Time.now.to_f)
-      
-        validate_builder
+    @builder.finish_trace(Time.now.to_f)
+    validate_builder
+  end
+  
+  def test_freeze
+    build_segment "a" do
+      build_segment "aa"
+    end
+    
+    begin 
+      builder.sample
+      assert false
+    rescue Exception => e
+      # expected
+    end
+    
+    @builder.finish_trace(Time.now.to_f)
+    
+    validate_builder
+    
+    begin
+      build_segment "b"
+      assert_false
+    rescue TypeError => e
+      # expected
+    end
+  end
+  
+  # this is really a test for transaction sample
+  def test_omit_segments_with
+    build_segment "Controller/my_controller/index" do
+      sleep 0.010
       
-        begin
-          build_segment "b"
-          assert_false
-        rescue TypeError => e
-          # expected
+      build_segment "Rails/Application Code Loading" do
+        sleep 0.020
+        
+        build_segment "foo/bar" do
+          sleep 0.010
         end
       end
       
-      # this is really a test for transaction sample
-      def test_omit_segments_with
-        build_segment "Controller/my_controller/index" do
-          sleep 0.010
-          
-          build_segment "Rails/Application Code Loading" do
-            sleep 0.020
-            
-            build_segment "foo/bar" do
-              sleep 0.010
-            end
-          end
-          
-          build_segment "a" do
-            build_segment "ab"
-            sleep 0.010
-          end
-          build_segment "b" do
-            build_segment "ba"
-              sleep 0.05
-            build_segment "bb"
-            build_segment "bc" do
-              build_segment "bca"
-              sleep 0.05
-            end
-          end
-          build_segment "c"
-        end
-        @builder.finish_trace(Time.now.to_f)
-        
-        validate_builder false
-        
-        sample = @builder.sample
-        
-        should_be_a_copy = sample.omit_segments_with('OMIT NOTHING')
-        validate_segment should_be_a_copy.root_segment, false
-        
-        assert sample.to_s == should_be_a_copy.to_s
-        
-        without_code_loading = sample.omit_segments_with('Rails/Application Code Loading')
-        validate_segment without_code_loading.root_segment, false
-        
-        # after we take out code loading, the delta should be approximately
-        # 30 milliseconds
-        delta = (sample.duration - without_code_loading.duration).to_ms
-        
-        # allow a few milliseconds for slop just in case this is running on a 386 ;)
-        assert delta >= 30, "delta #{delta} should be between 30 and 50"
-        # disable this test for a couple days:
-        assert delta <= 50, "delta #{delta} should be between 30 and 50"
-
-        # ensure none of the segments have this regex
-        without_code_loading.each_segment do |segment|
-          assert_nil segment.metric_name =~ /Rails\/Application Code Loading/
-        end
+      build_segment "a" do
+        build_segment "ab"
+        sleep 0.010
       end
-      def test_unbalanced_handling
-        assert_raise RuntimeError do
-          build_segment("a") do
-            begin
-              build_segment("aa") do
-                build_segment("aaa") do
-                  raise "a problem"
-                end
-              end
-            rescue; end
-          end
+      build_segment "b" do
+        build_segment "ba"
+        sleep 0.05
+        build_segment "bb"
+        build_segment "bc" do
+          build_segment "bca"
+          sleep 0.05
         end
       end
-      def test_marshal
-        build_segment "a" do
-          build_segment "ab"
-        end
-        build_segment "b" do
-          build_segment "ba"
-          build_segment "bb"
-          build_segment "bc" do
-            build_segment "bca"
+      build_segment "c"
+    end
+    @builder.finish_trace(Time.now.to_f)
+    
+    validate_builder false
+    
+    sample = @builder.sample
+    
+    should_be_a_copy = sample.omit_segments_with('OMIT NOTHING')
+    validate_segment should_be_a_copy.root_segment, false
+    
+    assert sample.to_s == should_be_a_copy.to_s
+    
+    without_code_loading = sample.omit_segments_with('Rails/Application Code Loading')
+    validate_segment without_code_loading.root_segment, false
+    
+    # after we take out code loading, the delta should be approximately
+    # 30 milliseconds
+    delta = (sample.duration - without_code_loading.duration).to_ms
+    
+    # allow a few milliseconds for slop just in case this is running on a 386 ;)
+    assert delta >= 30, "delta #{delta} should be between 30 and 50"
+    # disable this test for a couple days:
+    assert delta <= 50, "delta #{delta} should be between 30 and 50"
+    
+    # ensure none of the segments have this regex
+    without_code_loading.each_segment do |segment|
+      assert_nil segment.metric_name =~ /Rails\/Application Code Loading/
+    end
+  end
+  def test_unbalanced_handling
+    assert_raise RuntimeError do
+      build_segment("a") do
+        begin
+          build_segment("aa") do
+            build_segment("aaa") do
+              raise "a problem"
+            end
           end
-        end
-        build_segment "c"
-        
-        @builder.finish_trace(Time.now.to_f)
-        validate_builder
-        
-        dump = Marshal.dump @builder.sample
-        sample = Marshal.restore(dump)
-        validate_segment(sample.root_segment)
+          rescue; end
       end
-        
-      def test_parallel_first_level_segments
-        build_segment "a" do
-          build_segment "ab"
-        end
-        build_segment "b"
-        build_segment "c"
-        
-        @builder.finish_trace(Time.now.to_f)
-        validate_builder
-      end
-      
-      def validate_builder(check_names = true)
-        validate_segment @builder.sample.root_segment, check_names
+    end
+  end
+  def test_marshal
+    build_segment "a" do
+      build_segment "ab"
+    end
+    build_segment "b" do
+      build_segment "ba"
+      build_segment "bb"
+      build_segment "bc" do
+        build_segment "bca"
       end
+    end
+    build_segment "c"
     
-      def validate_segment(s, check_names = true)
-        parent = s.parent_segment
-
-        unless p.nil?
-          assert p.called_segments.include?(s) 
-          assert p.metric_name.length == s.metric_name.length - 1 if check_names
-          assert p.metric_name < s.metric_name if check_names
-          assert p.entry_timestamp <= s.entry_timestamp
-        end
-      
-        assert s.exit_timestamp >= s.entry_timestamp
-      
-        children = s.called_segments
-        last_segment = s
-        children.each do |child|
-          assert child.metric_name > last_segment.metric_name if check_names
-          assert child.entry_timestamp >= last_segment.entry_timestamp
-          last_metric = child
-        
-          validate_segment(child)
-        end
-      end
+    @builder.finish_trace(Time.now.to_f)
+    validate_builder
+    
+    dump = Marshal.dump @builder.sample
+    sample = Marshal.restore(dump)
+    validate_segment(sample.root_segment)
+  end
+  
+  def test_parallel_first_level_segments
+    build_segment "a" do
+      build_segment "ab"
+    end
+    build_segment "b"
+    build_segment "c"
+    
+    @builder.finish_trace(Time.now.to_f)
+    validate_builder
+  end
+  
+  def validate_builder(check_names = true)
+    validate_segment @builder.sample.root_segment, check_names
+  end
+  
+  def validate_segment(s, check_names = true)
+    p = s.parent_segment
+    
+    unless p.nil? || p.metric_name == 'ROOT'
+      assert p.called_segments.include?(s) 
+      assert_equal p.metric_name.length, s.metric_name.length - 1, "p: #{p.metric_name}, s: #{s.metric_name}" if check_names
+      assert p.metric_name < s.metric_name if check_names
+      assert p.entry_timestamp <= s.entry_timestamp
+    end
+    
+    assert s.exit_timestamp >= s.entry_timestamp
+    
+    children = s.called_segments
+    last_segment = s
+    children.each do |child|
+      assert child.metric_name > last_segment.metric_name if check_names
+      assert child.entry_timestamp >= last_segment.entry_timestamp
+      last_metric = child
       
-      def build_segment(metric, time = 0, &proc)
-        @builder.trace_entry(metric, Time.now.to_f)
-        proc.call if proc
-        @builder.trace_exit(metric, Time.now.to_f)
-      end
+      validate_segment(child, check_names)
     end
   end
-end
+  
+  def build_segment(metric, time = 0, &proc)
+    @builder.trace_entry(metric, Time.now.to_f)
+    proc.call if proc
+    @builder.trace_exit(metric, Time.now.to_f)
+  end
+end

data/test/test_helper.rb

@@ -9,7 +9,6 @@ require 'test_help'
 require 'mocha'
 require 'test/unit'
 
-
 module NewRelic
   class Config
     def setup_log_with_block_logging(*args)
@@ -19,6 +18,7 @@ module NewRelic
   end
 end
 
+=begin
 # This is a mixin for hacking the select method
 if defined? ActiveRecord::ConnectionAdapters
   class ActiveRecord::ConnectionAdapters::MysqlAdapter
@@ -37,3 +37,4 @@ if defined? ActiveRecord::ConnectionAdapters
     end
   end
 end
+=end

data/ui/helpers/newrelic_helper.rb

@@ -275,11 +275,11 @@ private
   def mime_type_from_extension(extension)
     extension = extension[/[^.]*$/].downcase
     case extension
-      when 'png': 'image/png'
-      when 'gif': 'image/gif'
-      when 'jpg': 'image/jpg'
-      when 'css': 'text/css'
-      when 'js': 'text/javascript'
+      when 'png'; 'image/png'
+      when 'gif'; 'image/gif'
+      when 'jpg'; 'image/jpg'
+      when 'css'; 'text/css'
+      when 'js'; 'text/javascript'
       else 'text/plain'
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: newrelic_rpm
 version: !ruby/object:Gem::Version 
-  version: 2.8.2
+  version: 2.8.3
 platform: ruby
 authors: 
 - Bill Kayser
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-05 00:00:00 -08:00
+date: 2009-02-14 00:00:00 -08:00
 default_executable: newrelic_cmd
 dependencies: []
 
@@ -94,6 +94,7 @@ files:
 - test/config/test_config.rb
 - test/new_relic
 - test/new_relic/agent
+- test/new_relic/agent/agent_test_controller.rb
 - test/new_relic/agent/mock_ar_connection.rb
 - test/new_relic/agent/mock_scope_listener.rb
 - test/new_relic/agent/model_fixture.rb