newrelic_rpm 3.1.1.beta2 → 3.1.1.beta3

data/test/new_relic/agent/agent/start_test.rb

@@ -223,7 +223,7 @@ class NewRelic::Agent::Agent::StartTest < Test::Unit::TestCase
   def test_notify_log_file_location_positive
     log = mocked_log
     NewRelic::Control.instance.expects(:log_file).returns('./')
-    log.expects(:send).with(:info, "Agent Log found in ./")
+    log.expects(:send).with(:info, "Agent Log at ./")
     notify_log_file_location
   end
 

data/test/new_relic/agent/memcache_instrumentation_test.rb

@@ -2,8 +2,9 @@ require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper
 
 memcached_ready = false
 classes = {
-  'memcache' => 'MemCache',
-  'dalli' => 'Dalli::Client',
+  'memcache' => 'MemCache'
+#   'dalli' => 'Dalli::Client'
+#   'memcached' => 'Memcached'
 }
 begin
   TCPSocket.new('localhost', 11211)
@@ -27,10 +28,16 @@ class NewRelic::Agent::MemcacheInstrumentationTest < Test::Unit::TestCase
   def setup
     NewRelic::Agent.manual_start
     @engine = NewRelic::Agent.instance.stats_engine
-
-    @cache = MEMCACHED_CLASS.new('localhost')
-    @cache.flush_all
+    
+    if MEMCACHED_CLASS.name == 'Memcached'
+      @cache = MEMCACHED_CLASS.new('localhost', :support_cas => true)
+      @cache.flush
+    else
+      @cache = MEMCACHED_CLASS.new('localhost')
+      @cache.flush_all
+    end
     @key = 'schluessel'
+    @cache.set('schluessel', 1)
   end
 
   def _call_test_method_in_web_transaction(method, *args)
@@ -58,7 +65,7 @@ class NewRelic::Agent::MemcacheInstrumentationTest < Test::Unit::TestCase
   end
 
   def test_writes__web
-    %w[incr decr delete].each do |method|
+    %w[delete].each do |method|
       if @cache.class.method_defined?(method)
         _call_test_method_in_web_transaction(method)
         expected_metrics = ["MemCache/#{method}", "MemCache/allWeb", "MemCache/#{method}:Controller/NewRelic::Agent::MemcacheInstrumentationTest/action"]
@@ -67,6 +74,7 @@ class NewRelic::Agent::MemcacheInstrumentationTest < Test::Unit::TestCase
     end
 
     %w[set add].each do |method|
+      @cache.delete(@key) rescue nil
       if @cache.class.method_defined?(method)
         expected_metrics = ["MemCache/#{method}", "MemCache/allWeb", "MemCache/#{method}:Controller/NewRelic::Agent::MemcacheInstrumentationTest/action"]
         _call_test_method_in_web_transaction(method, 'value')
@@ -86,8 +94,7 @@ class NewRelic::Agent::MemcacheInstrumentationTest < Test::Unit::TestCase
   end
 
   def test_writes__background
-
-    %w[incr decr delete].each do |method|
+    %w[delete].each do |method|
       expected_metrics = ["MemCache/#{method}", "MemCache/allOther", "MemCache/#{method}:OtherTransaction/Background/NewRelic::Agent::MemcacheInstrumentationTest/bg_task"]
       if @cache.class.method_defined?(method)
         _call_test_method_in_background_task(method)
@@ -96,6 +103,7 @@ class NewRelic::Agent::MemcacheInstrumentationTest < Test::Unit::TestCase
     end
 
     %w[set add].each do |method|
+      @cache.delete(@key) rescue nil
       expected_metrics = ["MemCache/#{method}", "MemCache/allOther", "MemCache/#{method}:OtherTransaction/Background/NewRelic::Agent::MemcacheInstrumentationTest/bg_task"]
       if @cache.class.method_defined?(method)
         _call_test_method_in_background_task(method, 'value')
@@ -104,4 +112,16 @@ class NewRelic::Agent::MemcacheInstrumentationTest < Test::Unit::TestCase
     end
   end
 
+  def test_handles_cas
+    expected_metrics = ["MemCache/cas", "MemCache/allOther", "MemCache/cas:OtherTransaction/Background/NewRelic::Agent::MemcacheInstrumentationTest/bg_task"]
+    if @cache.class.method_defined?(:cas)
+      @engine.clear_stats
+      perform_action_with_newrelic_trace(:name => 'bg_task', :category => :task) do
+        @cache.cas(@key) {|val| val += 2 }
+      end
+      compare_metrics expected_metrics, @engine.metrics.select{|m| m =~ /^memcache.*/i}
+      assert_equal 3, @cache.get(@key)
+    end    
+  end
+
 end if memcached_ready

data/test/new_relic/agent_test.rb

@@ -151,6 +151,13 @@ module NewRelic
       assert_equal(NewRelic::Agent.agent, NewRelic::Agent.instance, "should return the same agent for both identical methods")
     end
 
+    def test_load_data_should_not_write_files_when_serialization_disabled
+      NewRelic::Control.instance['disable_serialization'] = true
+      NewRelic::DataSerialization.expects(:read_and_write_to_file).never
+      NewRelic::Agent.load_data
+      NewRelic::Control.instance['disable_serialization'] = false
+    end
+
     private
 
     def mocked_agent

data/test/new_relic/collection_helper_test.rb

@@ -72,13 +72,7 @@ class NewRelic::CollectionHelperTest < Test::Unit::TestCase
     assert_equal Hash, myhash.class
   end
 
-  class MyEnumerable
-    include Enumerable
 
-    def each
-      yield "1"
-    end
-  end
 
   def test_enumerable
     e = MyEnumerable.new
@@ -101,45 +95,55 @@ class NewRelic::CollectionHelperTest < Test::Unit::TestCase
     s.each { | entry | val = entry; break }
     assert_match /^startfoo bar/, val
   end
-
+  class MyEnumerable
+    include Enumerable
+    
+    def each
+      yield "1"
+    end
+  end
+  
   def test_object
     assert_equal ["foo", '#<OpenStruct>'], normalize_params(['foo', OpenStruct.new('z'=>'q')])
   end
 
   def test_strip_backtrace
-    begin
-      ActiveRecordFixtures.setup
-#      ActiveRecordFixtures::Order.add_delay
-      ActiveRecordFixtures::Order.find 0
-      flunk "should throw"
-    rescue => e
-      #puts e
-      #puts e.backtrace.grep(/trace/).join("\n")
-      #puts "\n\n"
-      clean_trace = strip_nr_from_backtrace(e.backtrace)
-      assert_equal(0, clean_trace.grep(/newrelic_rpm/).size,
-               "should remove all instances of new relic from backtrace but got: #{clean_trace.join("\n")}")
-      assert_equal(0, clean_trace.grep(/trace/).size, 
-                   "should remove trace method tags from method names but got: #{clean_trace.join("\n")}")
-      assert((clean_trace.grep(/find/).size >= 3),
-             "should see at least three frames with 'find' in them (#{e}): \n#{clean_trace.join("\n")}")
-    ensure
-      ActiveRecordFixtures.teardown
-    end
-  end if defined?(::ActiveRecord)
+    clean_trace = strip_nr_from_backtrace(mock_backtrace)
+    assert_equal(0, clean_trace.grep(/newrelic_rpm/).size,
+                 "should remove all instances of new relic from backtrace but got: #{clean_trace.join("\n")}")
+    assert_equal(0, clean_trace.grep(/trace/).size, 
+                     "should remove trace method tags from method names but got: #{clean_trace.join("\n")}")
+    assert((clean_trace.grep(/find/).size >= 3),
+               "should see at least three frames with 'find' in them: \n#{clean_trace.join("\n")}")
+  end
 
   def test_disabled_strip_backtrace
     NewRelic::Control.instance['disable_backtrace_cleanup'] = true
-    begin
-      flunk "should throw"
-    rescue => e
-      clean_trace = strip_nr_from_backtrace(e.backtrace)
-      assert_equal(1, clean_trace.grep(/new_relic/).size,
+    clean_trace = strip_nr_from_backtrace(mock_backtrace)
+    assert_equal(1, clean_trace.grep(/new_relic/).size,
             "should not remove instances of new relic from backtrace but got: #{clean_trace.join("\n")}")
-      assert_equal(1, clean_trace.grep(/trace/).size, 
+    assert_equal(1, clean_trace.grep(/_trace/).size, 
                    "should not remove trace method tags from method names but got: #{clean_trace.join("\n")}")
-#       assert (clean_trace.grep(/find/).size >= 3), "should see at least three frames with 'find' in them (#{e}): \n#{clean_trace.join("\n")}"
-    end
+    #       assert (clean_trace.grep(/find/).size >= 3), "should see at least three frames with 'find' in them (#{e}): \n#{clean_trace.join("\n")}"
     NewRelic::Control.instance['disable_backtrace_cleanup'] = false
   end
+  
+  private 
+  def mock_backtrace
+    [
+   %q{/home/app/gems/activerecord-2.3.12/lib/active_record/base.rb:1620:in `find_one_without_trace'}, 
+   %q{/home/app/gems/activerecord-2.3.12/lib/active_record/base.rb:1620:in `find_one'}, 
+   %q{/home/app/gems/activerecord-2.3.12/lib/active_record/base.rb:1603:in `find_from_ids'}, 
+   %q{./test/new_relic/collection_helper_test.rb:112:in `test_strip_stackdump'}, 
+   %q{/home/app/gems/mocha-0.9.8/lib/mocha/integration/test_unit/ruby_version_186_and_above.rb:19:in `__send__'}, 
+   %q{/home/app/gems/mocha-0.9.8/lib/mocha/integration/test_unit/ruby_version_186_and_above.rb:19:in `run'}, 
+   %q{/home/app/test/unit/testsuite.rb:34:in `run'}, 
+   %q{/home/app/test/unit/testsuite.rb:33:in `each'}, 
+   %q{/home/app/test/unit/testsuite.rb:33:in `run'}, 
+   %q{/home/app/test/unit/testsuite.rb:34:in `run'}, 
+   %q{/home/app/test/unit/testsuite.rb:33:in `each'}, 
+   %q{/home/app/test/unit/testsuite.rb:33:in `run'}, 
+   %q{/home/app/test/unit/ui/testrunnermediator.rb:46:in `run_suite'}
+   ]
+  end
 end

data/test/new_relic/control/configuration_test.rb

@@ -2,6 +2,18 @@ require File.expand_path(File.join(File.dirname(__FILE__),'/../../test_helper'))
 class NewRelic::Control::ConfigurationTest < Test::Unit::TestCase
   require 'new_relic/control/configuration'
   include NewRelic::Control::Configuration
+  
+  def setup
+    # The log stuff is memoized so let's clear it each time.
+    NewRelic::Control.instance.instance_variable_set '@log_path', nil
+    NewRelic::Control.instance.instance_variable_set '@log_file', nil
+    @root = ::Rails::VERSION::MAJOR == 3 ? Rails.root : RAILS_ROOT
+  end
+  
+  def teardown
+    NewRelic::Control.instance.settings.delete 'log_file_path'
+  end
+  
   def test_license_key_defaults_to_env_variable
     ENV['NEWRELIC_LICENSE_KEY'] = nil
     self.expects(:fetch).with('license_key', nil)
@@ -12,14 +24,16 @@ class NewRelic::Control::ConfigurationTest < Test::Unit::TestCase
     license_key
   end
   
-  def test_log_file_path_uses_default_if_not_set
-    root = ::Rails::VERSION::MAJOR == 3 ? Rails.root : RAILS_ROOT
-    assert_equal(File.join(root, 'log'),
-                 NewRelic::Control.instance.log_file_path)
+  def test_log_path_uses_default_if_not_set
+    NewRelic::Control.instance.setup_log
+    assert_equal(File.expand_path("log/newrelic_agent.log"),
+                 NewRelic::Control.instance.log_file)
   end
 
   def test_log_file_path_uses_given_value
-    NewRelic::Control.instance['log_file_path'] = '/lerg'
-    assert_equal '/lerg', NewRelic::Control.instance.log_file_path
+    NewRelic::Control.instance['log_file_path'] = 'lerg'
+    NewRelic::Control.instance.setup_log
+    assert_equal("#{@root}/lerg/newrelic_agent.log",
+                 NewRelic::Control.instance.log_file)
   end
 end

data/test/new_relic/control/logging_methods_test.rb

@@ -5,6 +5,7 @@ require 'fileutils'
 class BaseLoggingMethods
   # stub class to enable testing of the module
   include NewRelic::Control::LoggingMethods
+  def root; "."; end
 end
 
 class NewRelic::Control::LoggingMethodsTest < Test::Unit::TestCase
@@ -123,15 +124,15 @@ class NewRelic::Control::LoggingMethodsTest < Test::Unit::TestCase
 
   def test_log_path_path_exists
     @base.instance_eval { @log_path = nil }
-    @base.expects(:fetch).with('log_file_path', 'log/').returns('log/')
-    assert File.directory?('log/')
-    assert_equal File.expand_path('log/'), @base.log_path
+    @base.expects(:fetch).with('log_file_path', 'log').returns('log')
+    assert File.directory?('log')
+    assert_equal File.expand_path('log'), @base.log_path
   end
 
   def test_log_path_path_created
     path = File.expand_path('tmp/log_path_test')
     @base.instance_eval { @log_path = nil }
-    @base.expects(:fetch).with('log_file_path', 'log/').returns('tmp/log_path_test')
+    @base.expects(:fetch).with('log_file_path', 'log').returns('tmp/log_path_test')
     assert !File.directory?(path) || FileUtils.rmdir(path)
     @base.expects(:log!).never
     assert_equal path, @base.log_path
@@ -141,11 +142,11 @@ class NewRelic::Control::LoggingMethodsTest < Test::Unit::TestCase
   def test_log_path_path_unable_to_create
     path = File.expand_path('tmp/log_path_test')
     @base.instance_eval { @log_path = nil }
-    @base.expects(:fetch).with('log_file_path', 'log/').returns('tmp/log_path_test')
+    @base.expects(:fetch).with('log_file_path', 'log').returns('tmp/log_path_test')
     assert !File.directory?(path) || FileUtils.rmdir(path)
-    @base.expects(:log!).with("Error creating New Relic log directory '#{path}'", :error)
-    Dir.expects(:mkdir).with(path).raises('cannot make directory bro!')
-    assert_equal path, @base.log_path
+    @base.expects(:log!).with("Error creating log directory for New Relic log file: '#{path}'", :error)
+    Dir.expects(:mkdir).with(path).raises('cannot make directory bro!').at_least_once
+    assert_equal 'tmp/log_path_test', @base.log_path
     assert !File.directory?(path)
   end
 

data/test/new_relic/data_serialization_test.rb

@@ -1,15 +1,23 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..', 'test_helper'))
 require 'new_relic/data_serialization'
 class NewRelic::DataSerializationTest < Test::Unit::TestCase
+
+  attr_reader :file, :path
   
   def setup
     NewRelic::Control.instance['log_file_path'] = './log'
-    FileUtils.rm_rf('./log/newrelic_agent_store.db')
-    FileUtils.rm_rf('./log/newrelic_agent_store.age')    
+    @path = NewRelic::Control.instance.log_path
+    @file = "#{path}/newrelic_agent_store.db"
+    Dir.mkdir(path) if !File.directory?(path)
+    FileUtils.rm_rf(@file)
+    FileUtils.rm_rf("#{@path}/newrelic_agent_store.age")
+  end
+  
+  def teardown
+    NewRelic::Control.instance['disable_serialization'] = false # this gets set to true in some tests
   end
   
   def test_read_and_write_from_file_read_only
-    file = './log/newrelic_agent_store.db'
     File.open(file, 'w') do |f|
       f.write(Marshal.dump('a happy string'))
     end
@@ -20,8 +28,16 @@ class NewRelic::DataSerializationTest < Test::Unit::TestCase
     assert_equal(0, File.size(file), "Should not leave any data in the file")
   end
 
+  def test_bad_paths
+    NewRelic::Control.instance.stubs(:log_path).returns("/bad/path")
+    assert NewRelic::DataSerialization.should_send_data?
+    NewRelic::DataSerialization.read_and_write_to_file do
+      'a happy string'
+    end
+    assert !File.exists?(file)
+  end
+  
   def test_read_and_write_to_file_dumping_contents
-    file = './log/newrelic_agent_store.db'
     expected_contents = Marshal.dump('a happy string')
     NewRelic::DataSerialization.read_and_write_to_file do
       'a happy string'
@@ -30,7 +46,6 @@ class NewRelic::DataSerializationTest < Test::Unit::TestCase
   end
 
   def test_read_and_write_to_file_yields_old_data
-    file = './log/newrelic_agent_store.db'
     expected_contents = 'a happy string'
     File.open(file, 'w') do |f|
       f.write(Marshal.dump(expected_contents))
@@ -54,8 +69,9 @@ class NewRelic::DataSerializationTest < Test::Unit::TestCase
     end
   end
 
-  def test_should_send_data
-    NewRelic::DataSerialization.expects(:max_size).returns(20)
+  def test_should_send_data_when_over_limit
+#    NewRelic::DataSerialization.expects(:max_size).returns(20)
+    NewRelic::DataSerialization.stubs(:max_size).returns(20)
     NewRelic::DataSerialization.read_and_write_to_file do
       "a" * 30
     end
@@ -63,7 +79,6 @@ class NewRelic::DataSerializationTest < Test::Unit::TestCase
   end
 
   def test_read_until_eoferror
-    file = './log/newrelic_agent_store.db'    
     File.open(file, 'w') do |f|
       f.write("a" * 10_001)
     end
@@ -75,7 +90,6 @@ class NewRelic::DataSerializationTest < Test::Unit::TestCase
   end
   
   def test_write_contents_nonblockingly
-    file = './log/newrelic_agent_store.db'    
     File.open(file, 'w') do |f|
       f.write("") # write nothing! NOTHING
     end
@@ -108,7 +122,8 @@ class NewRelic::DataSerializationTest < Test::Unit::TestCase
   end
 
   def test_spool_file_location_respects_log_file_path_setting
-    NewRelic::Control.instance['log_file_path'] = "./tmp"
+    NewRelic::Control.instance.expects(:log_path).returns('./tmp')
+    Dir.mkdir('./tmp') if !File.directory?('./tmp')
     NewRelic::DataSerialization.read_and_write_to_file do |_|
       'a' * 30
     end
@@ -117,7 +132,8 @@ class NewRelic::DataSerializationTest < Test::Unit::TestCase
   end
 
   def test_age_file_location_respects_log_file_path_setting
-    NewRelic::Control.instance['log_file_path'] = "./tmp"
+    NewRelic::Control.instance.expects(:log_path).returns('./tmp')
+    Dir.mkdir('./tmp') if !File.directory?('./tmp')
     NewRelic::DataSerialization.update_last_sent!
     assert(File.exists?('./tmp/newrelic_agent_store.age'),
            "Age file not created at user specified location")

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: newrelic_rpm
 version: !ruby/object:Gem::Version 
-  hash: -1848230026
-  prerelease: true
+  hash: 62196445
+  prerelease: 6
   segments: 
   - 3
   - 1
   - 1
-  - beta2
-  version: 3.1.1.beta2
+  - beta
+  - 3
+  version: 3.1.1.beta3
 platform: ruby
 authors: 
 - Bill Kayser
@@ -19,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-12 00:00:00 -07:00
+date: 2011-07-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -74,9 +75,9 @@ description: |
 
 email: support@newrelic.com
 executables: 
-- mongrel_rpm
-- newrelic
 - newrelic_cmd
+- newrelic
+- mongrel_rpm
 extensions: []
 
 extra_rdoc_files: 
@@ -189,6 +190,7 @@ files:
 - lib/tasks/all.rb
 - lib/tasks/install.rake
 - lib/tasks/tests.rake
+- log/newrelic_agent.log
 - newrelic.yml
 - newrelic_rpm.gemspec
 - recipes/newrelic.rb
@@ -362,7 +364,6 @@ post_install_message: |
     
 
 rdoc_options: 
-- --charset=UTF-8
 - --line-numbers
 - --inline-source
 - --title
@@ -390,7 +391,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: New Relic Ruby Agent