newrelic_rpm 2.8.4 → 2.8.5

data/README

@@ -2,67 +2,83 @@
 
 * http://www.newrelic.com
 
-New Relic RPM is a Ruby performance management system, developed by New Relic, Inc.
-RPM provides you with deep information about the performance of your Ruby on Rails 
-or Merb application as it runs in production. The New Relic Agent is distributed as
-a either a Rails plugin or a Gem, both hosted on RubyForge.
+New Relic RPM is a Ruby performance management system, developed by
+New Relic, Inc.  RPM provides you with deep information about the
+performance of your Ruby on Rails or Merb application as it runs in
+production. The New Relic Agent is distributed as a either a Rails
+plugin or a Gem, both hosted on RubyForge.
 
 The New Relic Agent runs in one of two modes:
 
-* Developer Mode : Adds a web interface mapped to /newrelic to your application for
-  showing detailed performance metrics on a page by page basis.
+* Developer Mode : Adds a web interface mapped to /newrelic to your
+  application for showing detailed performance metrics on a page by
+  page basis.
   
-* Production Mode : Low overhead instrumentation that captures detailed information
-  on your application running in production and transmits them to rpm.newrelic.com
-  where you can monitor them in real time.
+* Production Mode : Low overhead instrumentation that captures
+  detailed information on your application running in production and
+  transmits them to rpm.newrelic.com where you can monitor them in
+  real time.
 
-=== DEVELOPER MODE
+=== Developer Mode
 
-Developer mode is on by default when you run your application in the development
-environment (but not when it runs in other environments.)  When running in
-developer mode, RPM will track the performance of every http request serviced
-by your application, and store in memory this information for the last 100 http 
-transactions.
+Developer mode is on by default when you run your application in the
+development environment (but not when it runs in other environments.)
+When running in developer mode, RPM will track the performance of
+every http request serviced by your application, and store in memory
+this information for the last 100 http transactions.
 
-When running in Developer Mode, the RPM will also add a few pages to 
-your application that allow you to analyze this performance information. (Don't 
-worry - those pages are not added to your application's routes when you run in 
-production mode.)
+When running in Developer Mode, the RPM will also add a few pages to
+your application that allow you to analyze this performance
+information. (Don't worry - those pages are not added to your
+application's routes when you run in production mode.)
 
-To view this performance information, including detailed SQL statement analysis,
-open '/newrelic' in your web application.  For instance if you are running
-mongrel or thin on port 3000, enter the following into your browser:
+To view this performance information, including detailed SQL statement
+analysis, open '/newrelic' in your web application.  For instance if
+you are running mongrel or thin on port 3000, enter the following into
+your browser:
 
 http://localhost:3000/newrelic
 
-=== PRODUCTION MODE
+=== Production Mode
 
 To monitor your applications in production, create an account at
 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
-performance data to the RPM service for your analysis. To view this data, login
-to http://rpm.newrelic.com.
+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 performance data to the RPM service for your
+analysis. To view this data, login to http://rpm.newrelic.com.
 
-NOTE: You must have a valid account and license key to view this data online.
-When you sign up for an account at www.newrelic.com, you will be provided with a
-license key, as well as a default configuration file for New Relic RPM. You can
-either paste your license key into your existing configuration file,
-config/newrelic.yml, or you can replace that config file with the one included in
-your welcome email.
+NOTE: You must have a valid account and license key to view this data
+online.  When you sign up for an account at www.newrelic.com, you will
+be provided with a license key, as well as a default configuration
+file for New Relic RPM. You can either paste your license key into
+your existing configuration file, config/newrelic.yml, or you can
+replace that config file with the one included in your welcome email.
 
-== REQUIREMENTS:
+== Installation
+
+RPM requires an agent be installed in the application as either a
+Rails plug-in or a gem.  Both are available on RubyForge--instructions
+below.
+
+=== Git your RPM on!
+
+The agent is also available on Github under newrelic/rpm. As of March,
+2009, we keep the latest release on the master, the edge on a working
+branch, and previous releases with tags.  Fork away!
+
+=== Requirements:
 
 Ruby 1.8.6
 Rails 1.2.6 or above
 Merb 1.0 or above
 
-== RAILS PLUG-IN INSTALL:
+=== Rails Plug-In Installation
 
    script/plugin install http://newrelic.rubyforge.net/svn/newrelic_rpm
    
-== GEM INSTALL:
+=== Gem Installation
 
    sudo gem install newrelic_rpm
 
@@ -70,20 +86,47 @@ For Rails, edit environment.rb and add to the initalizer block:
 
    config.gem "newrelic_rpm" 
 
-The Developer Mode is unavailable when using the gem on Rails versions prior to 2.0.
+The Developer Mode is unavailable when using the gem on Rails versions
+prior to 2.0.
 
-== MERB SUPPORT:
+== Merb Support
+
+To monitor a merb app install the newrelic_rpm gem and add
+
+    dependency 'newrelic_rpm'
 
-To monitor a merb app install the newrelic_rpm gem and add <code>dependency 'newrelic_rpm'</code> 
 to your init.rb file.
 
-Developer Mode not currently available in merb.
-   
-== SUPPORT:
+Current features implemented:
+
+    * Standard monitoring, overview pages
+    * Error capturing
+    * Full Active Record instrumentation, including SQL explains
+    * Very limited Data Mapper instrumentation
+    * Transaction Traces are implemented but will not be very useful
+      with Data Mapper until more work is done with the Data Mapper
+      instrumentation
+
+Still under development:
+
+    * Developer Mode
+    * Data Mapper bindings
+
+Also some of the instrumentation has been implemented with method
+chaining, a mechanism that truly goes against the merb way. This was
+necessary in some cases where the API’s were not yet available or
+understood well enough to use. Converting these to hook methods using
+the Merb public API is a work in progress.
+
+== Support
+
+Reach out to us--and to fellow RPM users--at
+http://support.newrelic.com.  There you'll find documentation, FAQs,
+and forums where you can submit suggestions and discuss RPM with New
+Relic staff and other users.
 
-Reach out to us - and to fellow RPM users - on our support forum at 
-http://getsatisfaction.com/newrelic. We’ll share tips and tricks, answer all your 
-questions, and announce product updates. Operators are standing by.
+Find a bug?  E-mail support@newrelic.com, or post it to
+support.newrelic.com.
 
 For other support channels, see http://www.newrelic.com/support.
 

data/lib/new_relic/agent/agent.rb

@@ -304,7 +304,7 @@ module NewRelic::Agent
     end
     
     def apdex_t
-      @apdex_t ||= (config['apdex_t'] || 2.0).to_f
+      @apdex_t ||= config['apdex_t'].to_f
     end    
         
     private
@@ -466,7 +466,7 @@ module NewRelic::Agent
       @transaction_sampler = NewRelic::Agent::TransactionSampler.new(self)
       @error_collector = NewRelic::Agent::ErrorCollector.new(self)
       
-      @request_timeout = 15 * 60
+      @request_timeout = NewRelic::Config.instance.fetch('timeout', 2 * 60)
       
       @invalid_license = false
       

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

@@ -0,0 +1,18 @@
+# ActiveMerchant Instrumentation.
+
+if defined? ActiveMerchant
+
+  ActiveMerchant::Billing::Gateway.implementations.each do |gateway|
+    gateway.class_eval do
+      implemented_methods = public_instance_methods(false)
+      gateway_name = self.name.split('::').last
+      [:authorize, :purchase, :credit, :void, :capture, :recurring].each do |operation|
+        if implemented_methods.include?(operation.to_s)
+          add_method_tracer operation, "ActiveMerchant/gateway/#{gateway_name}/#{operation}", :scoped_metric_only => true
+          add_method_tracer operation, "ActiveMerchant/gateway/#{gateway_name}", :push_scope => false
+          add_method_tracer operation, "ActiveMerchant/operation/#{operation}", :push_scope => false
+        end
+      end
+    end
+  end
+end

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

@@ -1,6 +1,6 @@
 
 # NewRelic instrumentation for ActiveRecord
-if defined? ActiveRecord
+if defined? ActiveRecord::Base
   
   ActiveRecord::Base.class_eval do
     class << self

data/lib/new_relic/agent/instrumentation/merb/controller.rb

@@ -1,7 +1,7 @@
 require 'set'
-require 'merb-core/controller/abstract_controller'
+require 'merb-core/controller/merb_controller'
 
-Merb::AbstractController.class_eval do
+Merb::Controller.class_eval do
   include NewRelic::Agent::Instrumentation::ControllerInstrumentation
   
   class_inheritable_accessor :newrelic_ignore_attr

data/lib/new_relic/agent/stats_engine.rb

@@ -62,7 +62,6 @@ module NewRelic::Agent
     end
     
     def remove_scope_stack_listener(l)
-      fail "Unknown stack listener trying to be removed" if @scope_stack_listener != l
       @scope_stack_listener = nil
     end
     

data/lib/new_relic/agent/transaction_sampler.rb

@@ -1,7 +1,6 @@
 
 module NewRelic::Agent
   
-  
   class TransactionSampler
     include Synchronize
     
@@ -34,23 +33,17 @@ module NewRelic::Agent
     
     
     def default_sql_obfuscator(sql)
-#      puts "obfuscate: #{sql}"
-      
-      # remove escaped strings
-      sql = sql.gsub("''", "?")
-      
-      # replace all string literals
-      sql = sql.gsub(/'[^']*'/, "?")
-      
+      sql = sql.dup
+      # This is hardly readable.  Use the unit tests.
+      # remove single quoted strings:
+      sql.gsub!(/'(.*?[^\\'])??'(?!')/, '?')
+      # remove double quoted strings:
+      sql.gsub!(/"(.*?[^\\"])??"(?!")/, '?')
       # replace all number literals
-      sql = sql.gsub(/\d+/, "?")
-      
-#      puts "result: #{sql}"
-      
+      sql.gsub!(/\d+/, "?")
       sql
     end
     
-    
     def notice_first_scope_push(time)
       if Thread::current[:record_tt] == false
         Thread::current[BUILDER_KEY] = nil

data/lib/new_relic/config.rb

@@ -3,6 +3,7 @@ require 'new_relic/local_environment'
 require 'singleton'
 require 'erb'
 require 'net/https'
+require 'logger'
 
 # Configuration supports the behavior of the agent which is dependent
 # on what environment is being monitored: rails, merb, ruby, etc
@@ -12,7 +13,7 @@ module NewRelic
   
   class Config
 
-    attr_accessor :log_file
+    attr_accessor :log_file, :env
     
     # Structs holding info for the remote server and proxy server 
     class Server < Struct.new :host, :port
@@ -50,13 +51,12 @@ module NewRelic
       fetch(key)
     end
     ####################################
-    def env=(env_name)
-      @env = env_name
-      @settings = @yaml[env_name]
-    end
-    
     def settings
-      @settings ||= (@yaml && @yaml[env]) || {}
+      if @settings.nil?
+        @settings = (@yaml && @yaml[env]) || {}
+        @settings['apdex_t'] ||= 1.0
+      end
+      @settings
     end
     
     def []=(key, value)

data/lib/new_relic/recipes.rb

@@ -52,7 +52,7 @@ make_notify_task = lambda do
         logger.info "error creating New Relic deployment (#{e})\n#{e.backtrace.join("\n")}"
       rescue NewRelic::Commands::CommandFailure => e
         logger.info "unable to notify New Relic of the deployment (#{e})... skipping"
-      rescue CommandError
+      rescue Capistrano::CommandError
         logger.info "unable to notify New Relic of the deployment... skipping"
       end
       # WIP: For rollbacks, let's update the deployment we created with an indication of the failure:

data/lib/new_relic/version.rb

@@ -3,7 +3,7 @@ module NewRelic
   module VERSION #:nodoc:
   MAJOR = 2
   MINOR = 8
-  TINY  = 4
+  TINY  = 5
   STRING = [MAJOR, MINOR, TINY].join('.')
   def self.changes
     puts "NewRelic RPM Plugin Version: #{NewRelic::VERSION::STRING}"
@@ -11,7 +11,14 @@ module NewRelic
   end
 
   CHANGELOG = <<EOF
-
+2009-02-22 version 2.8.5
+  * fix reference to CommandError which was breaking some cap scripts
+  * fix incompatibility with Rails 2.0 in the server API
+  * fix problem with litespeed with Lite accounts
+  * fix problem when ActiveRecord is disabled
+  * moved merb instrumentation to Merb::Controller instead of 
+    AbstractController to address incompatibility with MailController
+  * fix problem in devmode displaying sql with embedded urls
 2009-02-17 version 2.8.4
   * fix bug detecting Phusion Passenger v 2.1.0
   * fix bug in capistrano recipe causing cap commands to fail with error

data/lib/new_relic_api.rb

@@ -246,5 +246,10 @@ module NewRelicApi
   class Deployment < BaseResource
   end
   
+  class User < BaseResource
+  end
+  
+  class Subscription < BaseResource
+  end
 end
 

data/lib/tasks/agent_tests.rake

@@ -1,4 +1,6 @@
 # run unit tests for the NewRelic Agent
+if defined? Rake::TestTask
+
 namespace :test do
   AGENT_HOME = File.expand_path(File.join(File.dirname(__FILE__), "..",".."))
   Rake::TestTask.new(:agent) do |t|
@@ -11,4 +13,5 @@ namespace :test do
 
   Rake::TestTask.new(:all => ["test", "test:agent"])
   Rake::Task['test:all'].comment = "Run all tests including agent code"
-end
+end
+end

data/test/new_relic/agent/tc_transaction_sampler.rb

@@ -1,11 +1,8 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper')) 
-##require 'new_relic/agent/transaction_sampler'
 
 ::RPM_DEVELOPER = true unless defined? ::RPM_DEVELOPER
 
-    class NewRelic::Agent::TransactionSampler
-      public :builder
-    end
+    NewRelic::Agent::TransactionSampler.send :public, :builder
     
     class NewRelic::Agent::TransationSamplerTests < Test::Unit::TestCase
       

data/ui/helpers/newrelic_helper.rb

@@ -141,7 +141,7 @@ module NewrelicHelper
   end
   
   def line_wrap_sql(sql)
-    sql.gsub(/\,/,', ').squeeze(' ') if sql
+    h(sql.gsub(/\,/,', ').squeeze(' ')) if sql
   end
   
   def render_sample_details(sample)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: newrelic_rpm
 version: !ruby/object:Gem::Version 
-  version: 2.8.4
+  version: 2.8.5
 platform: ruby
 authors: 
 - Bill Kayser
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-17 00:00:00 -08:00
+date: 2009-03-04 00:00:00 -08:00
 default_executable: newrelic_cmd
 dependencies: []
 
@@ -35,6 +35,7 @@ files:
 - lib/new_relic/agent/collection_helper.rb
 - lib/new_relic/agent/error_collector.rb
 - lib/new_relic/agent/instrumentation
+- lib/new_relic/agent/instrumentation/active_merchant.rb
 - lib/new_relic/agent/instrumentation/active_record_instrumentation.rb
 - lib/new_relic/agent/instrumentation/controller_instrumentation.rb
 - lib/new_relic/agent/instrumentation/data_mapper.rb