newrelic_rpm 2.14.0 → 2.14.1.logging1

data/CHANGELOG

@@ -1,4 +1,12 @@
-v2.13.6
+v2.14.1.logging1
+  * Special debug logging build, for all those fans of War and Peace out there
+
+v2.14.1
+  * Avoid overriding methods named 'log' when including the MethodTracer module
+  * Ensure that all load paths for 'new_relic/agent' go through 'new_relic/control' first
+  * Remove some debugging output from tests
+
+v2.14.0
   * Dependency detection framework to prevent multi-loading or early-loading
     of instrumentation files
 

data/lib/new_relic/agent.rb

@@ -1,3 +1,4 @@
+require 'new_relic/control'
 # = New Relic RPM Agent
 #
 # New Relic RPM is a performance monitoring application for Ruby

data/lib/new_relic/agent/method_tracer.rb

@@ -314,19 +314,15 @@ module NewRelic
             "Custom/#{self.name}/#{method_name.to_s}"
           end
           
-          def log
-            NewRelic::Control.instance.log
-          end
-          
           def method_exists?(method_name)
             exists = method_defined?(method_name) || private_method_defined?(method_name)
-            log.warn("Did not trace #{self.name}##{method_name} because that method does not exist") unless exists
+            NewRelic::Control.instance.log.warn("Did not trace #{self.name}##{method_name} because that method does not exist") unless exists
             exists
           end
 
           def traced_method_exists?(method_name, metric_name_code)
             exists = method_defined?(_traced_method_name(method_name, metric_name_code))
-            log.warn("Attempt to trace a method twice with the same metric: Method = #{method_name}, Metric Name = #{metric_name_code}") if exists
+            NewRelic::Control.instance.log.warn("Attempt to trace a method twice with the same metric: Method = #{method_name}, Metric Name = #{metric_name_code}") if exists
             exists
           end
 
@@ -391,7 +387,7 @@ module NewRelic
           class_eval traced_method, __FILE__, __LINE__
           alias_method _untraced_method_name(method_name, metric_name_code), method_name
           alias_method method_name, _traced_method_name(method_name, metric_name_code)
-          log.debug("Traced method: class = #{self.name},"+
+          NewRelic::Control.instance.log.debug("Traced method: class = #{self.name},"+
                     "method = #{method_name}, "+
                     "metric = '#{metric_name_code}'")
         end
@@ -404,7 +400,7 @@ module NewRelic
           if method_defined? "#{_traced_method_name(method_name, metric_name_code)}"
             alias_method method_name, "#{_untraced_method_name(method_name, metric_name_code)}"
             undef_method "#{_traced_method_name(method_name, metric_name_code)}"
-            log.debug("removed method tracer #{method_name} #{metric_name_code}\n")
+            NewRelic::Control.instance.log.debug("removed method tracer #{method_name} #{metric_name_code}\n")
           else
             raise "No tracer for '#{metric_name_code}' on method '#{method_name}'"
           end

data/lib/new_relic/control/logging_methods.rb

@@ -26,6 +26,7 @@ module NewRelic
       end
 
       def should_log?
+        return true # debug build! always log, ALWAYS
         @settings && agent_enabled?
       end
 
@@ -41,15 +42,17 @@ module NewRelic
         end
 
         # set the log level as specified in the config file
-
-        case fetch("log_level","info").downcase
-          when "debug" then log.level = Logger::DEBUG
-          when "info" then log.level = Logger::INFO
-          when "warn" then log.level = Logger::WARN
-          when "error" then log.level = Logger::ERROR
-          when "fatal" then log.level = Logger::FATAL
-        else log.level = Logger::INFO
-        end
+        
+        # debug build! Always log everything!
+        log.level = Logger::DEBUG
+#         case fetch("log_level","info").downcase
+#           when "debug" then log.level = Logger::DEBUG
+#           when "info" then log.level = Logger::INFO
+#           when "warn" then log.level = Logger::WARN
+#           when "error" then log.level = Logger::ERROR
+#           when "fatal" then log.level = Logger::FATAL
+#         else log.level = Logger::INFO
+#         end
         log
       end
 

data/lib/new_relic/version.rb

@@ -3,8 +3,8 @@ module NewRelic
   module VERSION #:nodoc:
     MAJOR = 2
     MINOR = 14
-    TINY  = 0
-    BUILD = nil #'0' # Set to nil for a release, 'beta1', 'alpha', etc for prerelease builds
+    TINY  = 1
+    BUILD = 'logging1' #'0' # 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 = "2.14.0"
+  s.version = "2.14.1.logging1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bill Kayser", "Justin George"]
-  s.date = %q{2011-03-29}
+  s.date = %q{2011-03-31}
   s.description = %q{New Relic RPM is a Ruby performance management system, developed by
 New Relic, Inc (http://www.newrelic.com).  RPM provides you with deep
 information about the performance of your Ruby on Rails or Merb
@@ -278,7 +278,7 @@ for instructions for previous versions
 }
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "New Relic Ruby Performance Monitoring Agent"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{New Relic Ruby Performance Monitoring Agent}
 
   if s.respond_to? :specification_version then

data/test/active_record_fixtures.rb

@@ -10,6 +10,10 @@ module ActiveRecordFixtures
   def teardown
     ActiveRecordFixtures::Shipment.teardown
     ActiveRecordFixtures::Order.teardown
+    begin
+      super
+    rescue Exception => e
+    end
   end
   class Order < ActiveRecord::Base
     self.table_name = 'newrelic_test_orders'

data/test/new_relic/agent/method_tracer/class_methods/add_method_tracer_test.rb

@@ -35,8 +35,7 @@ module NewRelic
             end
 
             def test_default_metric_name_code
-              self.expects(:name).returns("TEST_CLASS")
-              assert_equal 'Custom/TEST_CLASS/test_method', default_metric_name_code('test_method')
+              assert_equal "Custom/#{name}/test_method", default_metric_name_code('test_method')
             end
 
             def test_method_exists_positive
@@ -47,10 +46,10 @@ module NewRelic
             def test_method_exists_negative
               self.expects(:method_defined?).returns(false)
               self.expects(:private_method_defined?).returns(false)
-              self.expects(:name).returns('TEST_CLASS')
+
               fake_log = mock('log')
-              self.expects(:log).returns(fake_log)
-              fake_log.expects(:warn).with("Did not trace TEST_CLASS#test_method because that method does not exist")
+              NewRelic::Control.instance.expects(:log).returns(fake_log)
+              fake_log.expects(:warn).with("Did not trace #{name}#test_method because that method does not exist")
               assert !method_exists?('test_method')
             end
 
@@ -113,7 +112,7 @@ module NewRelic
               self.expects(:_traced_method_name)
               self.expects(:method_defined?).returns(true)
               fake_log = mock('log')
-              self.expects(:log).returns(fake_log)
+              NewRelic::Control.instance.expects(:log).returns(fake_log)
               fake_log.expects(:warn).with('Attempt to trace a method twice with the same metric: Method = test_method, Metric Name = Custom/Test/test_method')
               assert traced_method_exists?('test_method', 'Custom/Test/test_method')
             end

data/test/new_relic/agent/method_tracer_test.rb

@@ -41,6 +41,20 @@ module NewRelic
   end
 end
 
+module TestModuleWithLog
+  extend self
+  def other_method
+    #just here to be traced
+    log "12345"
+  end
+  
+  def log( msg )
+    msg
+  end
+  include NewRelic::Agent::MethodTracer
+  add_method_tracer :other_method, 'Custom/foo/bar'
+end 
+
 class NewRelic::Agent::MethodTracerTest < Test::Unit::TestCase
   attr_reader :stats_engine
   
@@ -66,6 +80,10 @@ class NewRelic::Agent::MethodTracerTest < Test::Unit::TestCase
     @metric_name = nil
     super
   end
+
+  def test_preserve_logging
+    assert_equal '12345', TestModuleWithLog.other_method
+  end
   
   def test_basic
     metric = "hello"

data/test/new_relic/agent/stats_engine/metric_stats_test.rb

@@ -11,6 +11,7 @@ class NewRelic::Agent::MetricStatsTest < Test::Unit::TestCase
   end
   def teardown
     @engine.harvest_timeslice_data({},{})
+    super
   end
   def test_get_no_scope
     s1 = @engine.get_stats "a"

data/test/new_relic/agent/stats_engine/stats_engine_test.rb

@@ -11,6 +11,7 @@ class NewRelic::Agent::StatsEngine::TransactionsTest < Test::Unit::TestCase
   end
   def teardown
     @engine.harvest_timeslice_data({},{})
+    super
   end
   
   def test_scope

data/test/new_relic/agent/transaction_sampler_test.rb

@@ -30,6 +30,7 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
   end
 
   def teardown
+    super
     @sampler.send(:clear_builder)
   end
   

data/test/new_relic/command/deployments_test.rb

@@ -12,6 +12,7 @@ class NewRelic::Command::DeploymentsTest < Test::Unit::TestCase
     end
   end
   def teardown
+    super
     return unless @deployment
     puts @deployment.errors
     puts @deployment.messages

data/test/test_contexts.rb

@@ -17,6 +17,7 @@ module TestContexts
       yield
       
       def teardown
+        super
         NewRelic::Agent.shutdown
         @log_data.reset
         NewRelic::Control.instance['dispatcher']=nil

metadata

@@ -1,8 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: newrelic_rpm
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 2.14.0
+  hash: 897997444
+  prerelease: true
+  segments: 
+  - 2
+  - 14
+  - 1
+  - logging1
+  version: 2.14.1.logging1
 platform: ruby
 authors: 
 - Bill Kayser
@@ -11,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-29 00:00:00 -07:00
+date: 2011-03-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +28,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id001
@@ -33,6 +42,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id002
@@ -44,6 +56,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id003
@@ -294,23 +309,32 @@ has_rdoc: true
 homepage: http://www.github.com/newrelic/rpm
 licenses: []
 
-post_install_message: "\n\
-  PLEASE NOTE:\n\n\
-  Developer Mode is now a Rack middleware.\n\n\
-  RPM Developer Mode is no longer available in Rails 2.1 and earlier.\n\
-  However, starting in version 2.12 you can use Developer Mode in any\n\
-  Rack based framework, in addition to Rails.  To install developer mode\n\
-  in a non-Rails application, just add NewRelic::Rack::DeveloperMode to\n\
-  your middleware stack.\n\n\
-  If you are using JRuby, we recommend using at least version 1.4 or \n\
-  later because of issues with the implementation of the timeout library.\n\n\
-  Refer to the README.md file for more information.\n\n\
-  Please see http://support.newrelic.com/faqs/docs/ruby-agent-release-notes\n\
-  for a complete description of the features and enhancements available\n\
-  in version 2.14 of the Ruby Agent.\n\n\
-  For details on this specific release, refer to the CHANGELOG file.\n\n\
-  Notice: Developer Mode now supports only Rails 2.3+ - refer to README\n\
-  for instructions for previous versions\n\n"
+post_install_message: |+
+  
+  PLEASE NOTE:
+  
+  Developer Mode is now a Rack middleware.
+  
+  RPM 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://support.newrelic.com/faqs/docs/ruby-agent-release-notes
+  for a complete description of the features and enhancements available
+  in version 2.14 of the Ruby Agent.
+  
+  For details on this specific release, refer to the CHANGELOG file.
+  
+  Notice: Developer Mode now supports only Rails 2.3+ - refer to README
+  for instructions for previous versions
+  
 rdoc_options: 
 - --line-numbers
 - --inline-source
@@ -323,17 +347,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: New Relic Ruby Performance Monitoring Agent