newrelic_rpm 2.13.6.beta2 → 2.14.0

data/lib/new_relic/control/instance_methods.rb

@@ -0,0 +1,150 @@
+module NewRelic
+  class Control
+    module InstanceMethods
+      # The env is the setting used to identify which section of the newrelic.yml
+      # to load.  This defaults to a framework specific value, such as ENV['RAILS_ENV']
+      # but can be overridden as long as you set it before calling #init_plugin
+      attr_writer :env
+
+      attr_reader :local_env
+
+      
+      # Initialize the plugin/gem and start the agent.  This does the
+      # necessary configuration based on the framework environment and
+      # determines whether or not to start the agent.  If the agent is
+      # not going to be started then it loads the agent shim which has
+      # stubs for all the external api.
+      #
+      # This may be invoked multiple times, as long as you don't attempt
+      # to uninstall the agent after it has been started.
+      #
+      # If the plugin is initialized and it determines that the agent is
+      # not enabled, it will skip starting it and install the shim.  But
+      # if you later call this with <tt>:agent_enabled => true</tt>,
+      # then it will install the real agent and start it.
+      #
+      # What determines whether the agent is launched is the result of
+      # calling agent_enabled?  This will indicate whether the
+      # instrumentation should/will be installed.  If we're in a mode
+      # where tracers are not installed then we should not start the
+      # agent.
+      #
+      # Subclasses are not allowed to override, but must implement
+      # init_config({}) which is called one or more times.
+      #
+      def init_plugin(options={})
+        options['app_name'] = ENV['NEWRELIC_APP_NAME'] if ENV['NEWRELIC_APP_NAME']
+
+        # Merge the stringified options into the config as overrides:
+        logger_override = options.delete(:log)
+        environment_name = options.delete(:env) and self.env = environment_name
+        dispatcher = options.delete(:dispatcher) and @local_env.dispatcher = dispatcher
+        dispatcher_instance_id = options.delete(:dispatcher_instance_id) and @local_env.dispatcher_instance_id = dispatcher_instance_id
+
+
+        # Clear out the settings, if they've already been loaded.  It may be that
+        # between calling init_plugin the first time and the second time, the env
+        # has been overridden
+        @settings = nil
+        settings
+        merge_options(options)
+        if logger_override
+          @log = logger_override
+          # Try to grab the log filename
+          @log_file = @log.instance_eval { @logdev.filename rescue nil }
+        end
+        # An artifact of earlier implementation, we put both #add_method_tracer and #trace_execution
+        # methods in the module methods.
+        Module.send :include, NewRelic::Agent::MethodTracer::ClassMethods
+        Module.send :include, NewRelic::Agent::MethodTracer::InstanceMethods
+        init_config(options)
+        NewRelic::Agent.agent = NewRelic::Agent::Agent.instance
+        if agent_enabled? && !NewRelic::Agent.instance.started?
+          setup_log unless logger_override
+          start_agent
+          install_instrumentation
+          load_samplers unless self['disable_samplers']
+          local_env.gather_environment_info
+          append_environment_info
+        elsif !agent_enabled?
+          install_shim
+        end
+      end
+
+      # Install the real agent into the Agent module, and issue the start command.
+      def start_agent
+        NewRelic::Agent.agent.start
+      end
+
+      # True if dev mode or monitor mode are enabled, and we are running
+      # inside a valid dispatcher like mongrel or passenger.  Can be overridden
+      # by NEWRELIC_ENABLE env variable, monitor_daemons config option when true, or
+      # agent_enabled config option when true or false.
+      def agent_enabled?
+        return false if !developer_mode? && !monitor_mode?
+        return self['agent_enabled'].to_s =~ /true|on|yes/i if !self['agent_enabled'].nil? && self['agent_enabled'] != 'auto'
+        return false if ENV['NEWRELIC_ENABLE'].to_s =~ /false|off|no/i
+        return true if self['monitor_daemons'].to_s =~ /true|on|yes/i
+        return true if ENV['NEWRELIC_ENABLE'].to_s =~ /true|on|yes/i
+        # When in 'auto' mode the agent is enabled if there is a known
+        # dispatcher running
+        return true if @local_env.dispatcher != nil
+      end
+
+      def app
+        @local_env.framework
+      end
+      alias framework app
+
+      def to_s
+        "Control[#{self.app}]"
+      end
+
+      protected
+
+      # Append framework specific environment information for uploading to
+      # the server for change detection.  Override in subclasses
+      def append_environment_info; end
+
+      def bundler_gem_list
+        if defined?(Bundler) && Bundler.instance_eval do @load end
+          Bundler.load.specs.map do | spec |
+            version = (spec.respond_to?(:version) && spec.version)
+            spec.name + (version ? "(#{version})" : "")
+          end
+        else
+          []
+        end
+      end
+      
+      def config_file
+        File.expand_path(File.join(root,"config","newrelic.yml"))
+      end
+
+      def initialize local_env, config_file_override=nil
+        @local_env = local_env
+        @instrumentation_files = []
+        newrelic_file = config_file_override || config_file
+        # Next two are for populating the newrelic.yml via erb binding, necessary
+        # when using the default newrelic.yml file
+        generated_for_user = ''
+        license_key=''
+        if !File.exists?(newrelic_file)
+          log! "Cannot find read #{newrelic_file}."
+          @yaml = {}
+        else
+          @yaml = YAML.load(ERB.new(File.read(newrelic_file)).result(binding))
+        end
+      rescue ScriptError, StandardError => e
+        puts e
+        puts e.backtrace.join("\n")
+        raise "Error reading newrelic.yml file: #{e}"
+      end
+
+      def newrelic_root
+        self.class.newrelic_root
+      end
+    end
+    include InstanceMethods
+  end
+end

data/lib/new_relic/control/instrumentation.rb

@@ -76,5 +76,6 @@ module NewRelic
         log.debug "Finished instrumentation"
       end
     end
+    include Instrumentation
   end
 end

data/lib/new_relic/control/logging_methods.rb

@@ -70,5 +70,6 @@ module NewRelic
         fetch('log_file_name', 'newrelic_agent.log')
       end
     end
+    include LoggingMethods
   end
 end

data/lib/new_relic/control/profiling.rb

@@ -20,5 +20,6 @@ module NewRelic
         @profiling = profiling_available? && val && defined?(RubyProf)
       end
     end
+    include Profiling
   end
 end

data/lib/new_relic/control/server_methods.rb

@@ -67,6 +67,10 @@ module NewRelic
         end
       end
 
+      def cert_file_path
+        File.expand_path(File.join(newrelic_root, 'cert', 'cacert.pem'))
+      end
+
       # Return the Net::HTTP with proxy configuration given the NewRelic::Control::Server object.
       # Default is the collector but for api calls you need to pass api_server
       #
@@ -85,7 +89,7 @@ module NewRelic
           http.use_ssl = true
           if verify_certificate?
             http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-            http.ca_file = File.join(File.dirname(__FILE__), '..', '..', 'cert', 'cacert.pem')
+            http.ca_file = cert_file_path
           else
             http.verify_mode = OpenSSL::SSL::VERIFY_NONE
           end
@@ -93,6 +97,8 @@ module NewRelic
         http
       end
     end
+
+    include ServerMethods
   end
 end
 

data/lib/new_relic/delayed_job_injection.rb

@@ -12,7 +12,7 @@ end
 
 DependencyDetection.defer do
   depends_on do
-    defined?(::Delayed) && defined?(::Delayed::Worker) and !NewRelic::Control.instance['disable_dj']
+    defined?(::Delayed) && defined?(::Delayed::Worker)
   end
   
   executes do
@@ -34,3 +34,4 @@ DependencyDetection.defer do
     end
   end
 end
+DependencyDetection.detect!

data/lib/new_relic/version.rb

@@ -2,9 +2,9 @@
 module NewRelic
   module VERSION #:nodoc:
     MAJOR = 2
-    MINOR = 13
-    TINY  = 6
-    BUILD = 'beta2' #'0' # Set to nil for a release, 'beta1', 'alpha', etc for prerelease builds
+    MINOR = 14
+    TINY  = 0
+    BUILD = nil #'0' # Set to nil for a release, 'beta1', 'alpha', etc for prerelease builds
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
   end
 

data/lib/newrelic_rpm.rb

@@ -18,7 +18,6 @@
 # directly.
 #
 require 'new_relic/control'
-
 if defined? Merb
   module NewRelic
     class MerbBootLoader < Merb::BootLoader
@@ -39,14 +38,11 @@ elsif defined? Rails
       end
     end
   else
-    if Rails.respond_to?(:configuration)
     # After verison 2.0 of Rails we can access the configuration directly.
     # We need it to add dev mode routes after initialization finished.
-      config = Rails.configuration
-      NewRelic::Control.instance.init_plugin :config => config
-    else
-      NewRelic::Control.instance.init_plugin
-    end
+    config = nil
+    config = Rails.configuration if Rails.respond_to?(:configuration)
+    NewRelic::Control.instance.init_plugin :config => config
   end
 else
   NewRelic::Control.instance.init_plugin

data/newrelic_rpm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{newrelic_rpm}
-  s.version = "2.13.6.beta2"
+  s.version = "2.14.0"
 
   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-22}
+  s.date = %q{2011-03-29}
   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
@@ -33,6 +33,8 @@ http://github.com/newrelic/rpm/tree/master.
     "bin/newrelic",
     "bin/newrelic_cmd",
     "cert/cacert.pem",
+    "cert/oldsite.pem",
+    "cert/site.pem",
     "install.rb",
     "lib/conditional_vendored_dependency_detection.rb",
     "lib/conditional_vendored_metric_parser.rb",
@@ -84,6 +86,7 @@ http://github.com/newrelic/rpm/tree/master.
     "lib/new_relic/commands/deployments.rb",
     "lib/new_relic/commands/install.rb",
     "lib/new_relic/control.rb",
+    "lib/new_relic/control/class_methods.rb",
     "lib/new_relic/control/configuration.rb",
     "lib/new_relic/control/frameworks/external.rb",
     "lib/new_relic/control/frameworks/merb.rb",
@@ -91,6 +94,7 @@ http://github.com/newrelic/rpm/tree/master.
     "lib/new_relic/control/frameworks/rails3.rb",
     "lib/new_relic/control/frameworks/ruby.rb",
     "lib/new_relic/control/frameworks/sinatra.rb",
+    "lib/new_relic/control/instance_methods.rb",
     "lib/new_relic/control/instrumentation.rb",
     "lib/new_relic/control/logging_methods.rb",
     "lib/new_relic/control/profiling.rb",
@@ -264,7 +268,7 @@ 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.13 of the Ruby Agent.
+in version 2.14 of the Ruby Agent.
 
 For details on this specific release, refer to the CHANGELOG file.
 
@@ -274,10 +278,11 @@ 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.5.2}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{New Relic Ruby Performance Monitoring Agent}
 
   if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

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

@@ -18,6 +18,12 @@ class NewRelic::Agent::Instrumentation::ActiveRecordInstrumentationTest < Test::
     ActiveRecordFixtures.teardown
     NewRelic::Agent.shutdown
   end
+
+  #####################################################################
+  # Note: If these tests are failing, most likely the problem is that #
+  # the active record instrumentation is not loading for whichever    #
+  # version of rails you're testing at the moment.                    #
+  #####################################################################
   
   def test_agent_setup
     assert NewRelic::Agent.instance.class == NewRelic::Agent::Agent

data/test/new_relic/control_test.rb

@@ -13,6 +13,21 @@ class NewRelic::ControlTest < Test::Unit::TestCase
     NewRelic::Agent.shutdown
   end
 
+  def test_cert_file_path
+    assert @c.cert_file_path
+    assert_equal File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'cert', 'cacert.pem')), @c.cert_file_path
+  end
+  
+  def test_cert_file
+    result = `openssl verify -CAfile #{@c.cert_file_path} #{@c.send(:newrelic_root)}/cert/site.pem`
+    assert (result =~ /OK/), 'Should verify certificate: ' + result
+  end
+
+  def test_old_cert_file
+    result = `openssl verify -CAfile #{@c.cert_file_path} #{@c.send(:newrelic_root)}/cert/oldsite.pem`
+    assert (result =~ /OK/), 'Should verify the old certificate: ' + result
+  end  
+
   def test_monitor_mode
     assert ! @c.monitor_mode?
     @c.settings.delete 'enabled'
@@ -34,7 +49,7 @@ class NewRelic::ControlTest < Test::Unit::TestCase
   end
   
   def test_test_config
-    if defined?(Rails) && Rails.respond_to?(:version) && Rails.version.to_i > 2
+    if defined?(Rails) && Rails::VERSION::MAJOR.to_i == 3
       assert_equal :rails3, c.app
     elsif defined?(Rails)
       assert_equal :rails, c.app      

metadata

@@ -1,15 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: newrelic_rpm
 version: !ruby/object:Gem::Version 
-  hash: 62196231
-  prerelease: 7
-  segments: 
-  - 2
-  - 13
-  - 6
-  - beta
-  - 2
-  version: 2.13.6.beta2
+  prerelease: 
+  version: 2.14.0
 platform: ruby
 authors: 
 - Bill Kayser
@@ -18,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-22 00:00:00 -07:00
+date: 2011-03-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,9 +22,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id001
@@ -43,9 +33,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id002
@@ -57,9 +44,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id003
@@ -91,6 +75,8 @@ files:
 - bin/newrelic
 - bin/newrelic_cmd
 - cert/cacert.pem
+- cert/oldsite.pem
+- cert/site.pem
 - install.rb
 - lib/conditional_vendored_dependency_detection.rb
 - lib/conditional_vendored_metric_parser.rb
@@ -142,6 +128,7 @@ files:
 - lib/new_relic/commands/deployments.rb
 - lib/new_relic/commands/install.rb
 - lib/new_relic/control.rb
+- lib/new_relic/control/class_methods.rb
 - lib/new_relic/control/configuration.rb
 - lib/new_relic/control/frameworks/external.rb
 - lib/new_relic/control/frameworks/merb.rb
@@ -149,6 +136,7 @@ files:
 - lib/new_relic/control/frameworks/rails3.rb
 - lib/new_relic/control/frameworks/ruby.rb
 - lib/new_relic/control/frameworks/sinatra.rb
+- lib/new_relic/control/instance_methods.rb
 - lib/new_relic/control/instrumentation.rb
 - lib/new_relic/control/logging_methods.rb
 - lib/new_relic/control/profiling.rb
@@ -306,32 +294,23 @@ has_rdoc: true
 homepage: http://www.github.com/newrelic/rpm
 licenses: []
 
-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.13 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
-  
+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"
 rdoc_options: 
 - --line-numbers
 - --inline-source
@@ -344,23 +323,17 @@ 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.2
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: New Relic Ruby Performance Monitoring Agent