newrelic_rpm 2.12.3 → 2.13.0.beta3

data/lib/new_relic/url_rule.rb

@@ -0,0 +1,14 @@
+# Represents url mapping rules stored on the server.  These rules should be applied
+# to URLs which are not normalized into controller class/action by Rails routes.
+# Insantiated strictly by Marshal.
+class NewRelic::UrlRule
+  attr_reader :match_expression, :replacement, :eval_order, :terminate_chain
+  
+  def apply url
+    return nil
+  end
+  
+  class RuleSet
+    
+  end
+end

data/lib/new_relic/version.rb

@@ -2,9 +2,9 @@
 module NewRelic
   module VERSION #:nodoc:
     MAJOR = 2
-    MINOR = 12
-    TINY  = 3
-    BUILD = nil #'0' # Set to nil for a release, 'beta1', 'alpha', etc for prerelease builds
+    MINOR = 13
+    TINY  = 0
+    BUILD = 'beta3' #'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

@@ -19,22 +19,18 @@
 #
 require 'new_relic/control'
 
-# After verison 2.0 of Rails we can access the configuration directly.
-# We need it to add dev mode routes after initialization finished. 
-if defined? Rails.configuration
-  Rails.configuration.after_initialize do
-    NewRelic::Control.instance.init_plugin :config => Rails.configuration
-  end
-elsif defined? Merb
+if defined? Merb
   module NewRelic
     class MerbBootLoader < Merb::BootLoader
       after Merb::BootLoader::ChooseAdapter
-
       def self.run
         NewRelic::Control.instance.init_plugin
       end
     end
   end
 else
-  NewRelic::Control.instance.init_plugin
+  # 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 if defined?(Rails.configuration)
+  NewRelic::Control.instance.init_plugin :config => config
 end

data/newrelic.yml

@@ -3,13 +3,16 @@
 # Rails applications with deep visibility and low overhead.  For more
 # information, visit www.newrelic.com.
 #
-# <%= generated_for_user %>
+# Generated <%= Time.now.strftime('%B %d, %Y') %>, for version <%= NewRelic::VERSION::STRING %>
 #
-# here are the settings that are common to all environments
+# <%= generated_for_user %>
+
+
+# Here are the settings that are common to all environments
 common: &default_settings
   # ============================== LICENSE KEY ===============================
 
-  # You must specify the licence key associated with your New Relic
+  # You must specify the license key associated with your New Relic
   # account.  This key binds your Agent's data to your account in the
   # New Relic RPM service.
   license_key: '<%= license_key %>'
@@ -21,6 +24,7 @@ common: &default_settings
   # it from running with Rake or the console.  Set to false to
   # completely turn the agent off regardless of the other settings.
   # Valid values are true, false and auto.
+  #
   # agent_enabled: auto
   
   # Application Name
@@ -29,9 +33,16 @@ common: &default_settings
   # into a RPM "application" on your home dashboard page. If you want
   # to map this instance into multiple apps, like "AJAX Requests" and
   # "All UI" then specify a semicolon separated list of up to three
-  # distinct names.  If you comment this out, it defaults to the 
-  # capitalized RAILS_ENV (i.e., Production, Staging, etc)
-  app_name: My Application
+  # distinct names, or a yaml list.  Defaults to the 
+  # capitalized RAILS_ENV or RACK_ENV (i.e., Production, Staging, etc)
+  #
+  # Example:
+  #
+  #   app_name:
+  #       - Ajax Service
+  #       - All Services
+  # 
+  app_name: <%= @app_name %>
 
   # When "true", the agent collects performance data about your 
   # application and reports this data to the NewRelic RPM service at 
@@ -174,6 +185,12 @@ common: &default_settings
   # disable_memcache_instrumentation: true
   # disable_dj: true
 
+  # If you're interested in capturing memcache keys as though they
+  # were SQL uncomment this flag. Note that this does increase
+  # overhead slightly on every memcached call, and can have security
+  # implications if your memcached keys are sensitive
+  # capture_memcache_keys: true
+  
   # Certain types of instrumentation such as GC stats will not work if 
   # you are running multi-threaded.  Please let us know.
   # multi_threaded = false
@@ -186,7 +203,7 @@ common: &default_settings
 # the environment
 
 # NOTE if your application has other named environments, you should
-# provide newrelic conifguration settings for these enviromnents here.
+# provide newrelic configuration settings for these environments here.
 
 development:
   <<: *default_settings
@@ -215,7 +232,7 @@ test:
 # Turn on the agent in production for 24x7 monitoring.  NewRelic
 # testing shows an average performance impact of < 5 ms per
 # transaction, you you can leave this on all the time without
-# incurring any user-visible performance degredation.
+# incurring any user-visible performance degradation.
 production:
   <<: *default_settings
   monitor_mode: true
@@ -226,4 +243,4 @@ production:
 staging:
   <<: *default_settings
   monitor_mode: true
-  app_name: My Application (Staging)
+  app_name: <%= @app_name %> (Staging)

data/newrelic_rpm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{newrelic_rpm}
-  s.version = "2.12.3"
+  s.version = "2.13.0.beta3"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Bill Kayser"]
-  s.date = %q{2010-06-10}
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Bill Kayser", "Justin George"]
+  s.date = %q{2010-07-07}
   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
@@ -18,16 +18,19 @@ dual-purposed as a either a Rails plugin or a Gem, hosted on
 http://github.com/newrelic/rpm/tree/master.
 }
   s.email = %q{support@newrelic.com}
-  s.executables = ["mongrel_rpm", "newrelic_cmd"]
+  s.executables = ["mongrel_rpm", "newrelic", "newrelic_cmd"]
   s.extra_rdoc_files = [
     "CHANGELOG",
-     "LICENSE"
+     "LICENSE",
+     "README.rdoc",
+     "newrelic.yml"
   ]
   s.files = [
     "CHANGELOG",
      "LICENSE",
-     "README.md",
+     "README.rdoc",
      "bin/mongrel_rpm",
+     "bin/newrelic",
      "bin/newrelic_cmd",
      "cert/cacert.pem",
      "install.rb",
@@ -72,15 +75,21 @@ http://github.com/newrelic/rpm/tree/master.
      "lib/new_relic/agent/transaction_sampler.rb",
      "lib/new_relic/agent/worker_loop.rb",
      "lib/new_relic/collection_helper.rb",
+     "lib/new_relic/command.rb",
      "lib/new_relic/commands/deployments.rb",
-     "lib/new_relic/commands/new_relic_commands.rb",
+     "lib/new_relic/commands/install.rb",
      "lib/new_relic/control.rb",
-     "lib/new_relic/control/external.rb",
-     "lib/new_relic/control/merb.rb",
-     "lib/new_relic/control/rails.rb",
-     "lib/new_relic/control/rails3.rb",
-     "lib/new_relic/control/ruby.rb",
-     "lib/new_relic/control/sinatra.rb",
+     "lib/new_relic/control/configuration.rb",
+     "lib/new_relic/control/frameworks/external.rb",
+     "lib/new_relic/control/frameworks/merb.rb",
+     "lib/new_relic/control/frameworks/rails.rb",
+     "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/instrumentation.rb",
+     "lib/new_relic/control/logging_methods.rb",
+     "lib/new_relic/control/profiling.rb",
+     "lib/new_relic/control/server_methods.rb",
      "lib/new_relic/delayed_job_injection.rb",
      "lib/new_relic/histogram.rb",
      "lib/new_relic/local_environment.rb",
@@ -90,6 +99,7 @@ http://github.com/newrelic/rpm/tree/master.
      "lib/new_relic/metric_parser/action_mailer.rb",
      "lib/new_relic/metric_parser/active_merchant.rb",
      "lib/new_relic/metric_parser/active_record.rb",
+     "lib/new_relic/metric_parser/apdex.rb",
      "lib/new_relic/metric_parser/controller.rb",
      "lib/new_relic/metric_parser/controller_cpu.rb",
      "lib/new_relic/metric_parser/errors.rb",
@@ -102,14 +112,17 @@ http://github.com/newrelic/rpm/tree/master.
      "lib/new_relic/metric_spec.rb",
      "lib/new_relic/metrics.rb",
      "lib/new_relic/noticed_error.rb",
+     "lib/new_relic/rack/developer_mode.rb",
      "lib/new_relic/rack/metric_app.rb",
      "lib/new_relic/rack/mongrel_rpm.ru",
      "lib/new_relic/rack/newrelic.yml",
      "lib/new_relic/rack_app.rb",
      "lib/new_relic/recipes.rb",
      "lib/new_relic/stats.rb",
+     "lib/new_relic/timer_lib.rb",
      "lib/new_relic/transaction_analysis.rb",
      "lib/new_relic/transaction_sample.rb",
+     "lib/new_relic/url_rule.rb",
      "lib/new_relic/version.rb",
      "lib/new_relic_api.rb",
      "lib/newrelic_rpm.rb",
@@ -132,7 +145,6 @@ http://github.com/newrelic/rpm/tree/master.
      "test/new_relic/agent/method_tracer_test.rb",
      "test/new_relic/agent/metric_data_test.rb",
      "test/new_relic/agent/metric_frame_test.rb",
-     "test/new_relic/agent/mock_ar_connection.rb",
      "test/new_relic/agent/mock_scope_listener.rb",
      "test/new_relic/agent/net_instrumentation_test.rb",
      "test/new_relic/agent/rpm_agent_test.rb",
@@ -150,15 +162,14 @@ http://github.com/newrelic/rpm/tree/master.
      "test/new_relic/environment_test.rb",
      "test/new_relic/metric_parser_test.rb",
      "test/new_relic/metric_spec_test.rb",
+     "test/new_relic/rack/episodes_test.rb",
      "test/new_relic/shim_agent_test.rb",
      "test/new_relic/stats_test.rb",
      "test/new_relic/version_number_test.rb",
+     "test/test_contexts.rb",
      "test/test_helper.rb",
-     "test/ui/newrelic_controller_test.rb",
-     "test/ui/newrelic_helper_test.rb",
-     "ui/controllers/newrelic_controller.rb",
+     "ui/helpers/developer_mode_helper.rb",
      "ui/helpers/google_pie_chart.rb",
-     "ui/helpers/newrelic_helper.rb",
      "ui/views/layouts/newrelic_default.rhtml",
      "ui/views/newrelic/_explain_plans.rhtml",
      "ui/views/newrelic/_sample.rhtml",
@@ -172,33 +183,51 @@ http://github.com/newrelic/rpm/tree/master.
      "ui/views/newrelic/_stack_trace.rhtml",
      "ui/views/newrelic/_table.rhtml",
      "ui/views/newrelic/explain_sql.rhtml",
-     "ui/views/newrelic/images/arrow-close.png",
-     "ui/views/newrelic/images/arrow-open.png",
-     "ui/views/newrelic/images/blue_bar.gif",
-     "ui/views/newrelic/images/file_icon.png",
-     "ui/views/newrelic/images/gray_bar.gif",
-     "ui/views/newrelic/images/new-relic-rpm-desktop.gif",
-     "ui/views/newrelic/images/new_relic_rpm_desktop.gif",
-     "ui/views/newrelic/images/textmate.png",
+     "ui/views/newrelic/file/images/arrow-close.png",
+     "ui/views/newrelic/file/images/arrow-open.png",
+     "ui/views/newrelic/file/images/blue_bar.gif",
+     "ui/views/newrelic/file/images/file_icon.png",
+     "ui/views/newrelic/file/images/gray_bar.gif",
+     "ui/views/newrelic/file/images/new-relic-rpm-desktop.gif",
+     "ui/views/newrelic/file/images/new_relic_rpm_desktop.gif",
+     "ui/views/newrelic/file/images/textmate.png",
+     "ui/views/newrelic/file/javascript/jquery-1.4.2.js",
+     "ui/views/newrelic/file/javascript/transaction_sample.js",
+     "ui/views/newrelic/file/stylesheets/style.css",
      "ui/views/newrelic/index.rhtml",
-     "ui/views/newrelic/javascript/prototype-scriptaculous.js",
-     "ui/views/newrelic/javascript/transaction_sample.js",
      "ui/views/newrelic/sample_not_found.rhtml",
      "ui/views/newrelic/show_sample.rhtml",
      "ui/views/newrelic/show_source.rhtml",
-     "ui/views/newrelic/stylesheets/style.css",
      "ui/views/newrelic/threads.rhtml"
   ]
   s.homepage = %q{http://www.github.com/newrelic/rpm}
   s.post_install_message = %q{
+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.12 of the Ruby Agent.
+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
+
 }
-  s.rdoc_options = ["--charset=UTF-8", "--line-numbers", "--inline-source", "--title", "New Relic RPM"]
+  s.rdoc_options = ["--charset=UTF-8", "--line-numbers", "--inline-source", "--title", "New Relic Ruby Performance Monitoring Agent"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.6}
   s.summary = %q{New Relic Ruby Performance Monitoring Agent}
@@ -209,11 +238,17 @@ For details on this specific release, refer to the CHANGELOG file.
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<mocha>, [">= 0"])
+      s.add_development_dependency(%q<shoulda>, [">= 0"])
     else
       s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<mocha>, [">= 0"])
+      s.add_dependency(%q<shoulda>, [">= 0"])
     end
   else
     s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<mocha>, [">= 0"])
+    s.add_dependency(%q<shoulda>, [">= 0"])
   end
 end
 

data/test/config/newrelic.yml

@@ -20,6 +20,11 @@ test:
   license_key: '<%= license_key %>'
   agent_enabled: auto
   apdex_t: 1.1
+  app_name:
+    - a
+    - b
+    - c
+  log_file_path: <%= RAILS_ROOT %>/log
 
   # Some fixtures for newrelic.yml parsing tests
   erb_value: <%= 'hey'*3 %>

data/test/config/test_control.rb

@@ -1,17 +1,15 @@
-require 'new_relic/control/rails'
+require 'new_relic/control/frameworks/rails'
 
-class NewRelic::Control::Test < NewRelic::Control::Rails #:nodoc:
+class NewRelic::Control::Frameworks::Test < NewRelic::Control::Frameworks::Rails #:nodoc:
   def env
     'test'
   end
   def app
     :rails
   end
-  def config_file
-    File.join(File.dirname(__FILE__), "newrelic.yml")
-  end
-  def initialize local_env
-    super local_env
+  
+  def initialize *args
+    super
     setup_log 
   end
   # when running tests, don't write out stderr
@@ -35,4 +33,4 @@ class NewRelic::Control::Test < NewRelic::Control::Rails #:nodoc:
     # Force the routes to be reloaded
     ActionController::Routing::Routes.reload!
   end
-end
+end

data/test/new_relic/agent/active_record_instrumentation_test.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper')) 
-require 'active_record_fixtures'
 class ActiveRecordInstrumentationTest < Test::Unit::TestCase
+  require 'active_record_fixtures'
   include NewRelic::Agent::Instrumentation::ControllerInstrumentation
   def setup
     super
@@ -172,7 +172,7 @@ class ActiveRecordInstrumentationTest < Test::Unit::TestCase
     segment = sample.root_segment.called_segments.first.called_segments.first.called_segments.first
     assert_match /^SELECT \* FROM ["`]?#{ActiveRecordFixtures::Order.table_name}["`]?$/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)
+    sample = sample.prepare_to_send(:record_sql => :obfuscated, :explain_sql => 0.0)
     segment = sample.root_segment.called_segments.first.called_segments.first
   end
   def test_prepare_to_send
@@ -188,7 +188,7 @@ class ActiveRecordInstrumentationTest < Test::Unit::TestCase
     assert_not_nil sql_segment, sample.to_s
     assert_match /^SELECT /, sql_segment.params[:sql]
     assert sql_segment.duration > 0.0, "Segment duration must be greater than zero."
-    sample = sample.prepare_to_send(:record_sql => :raw, :explain_enabled => true, :explain_sql => 0.0)
+    sample = sample.prepare_to_send(:record_sql => :raw, :explain_sql => 0.0)
     sql_segment = sample.root_segment.called_segments.first.called_segments.first.called_segments.first
     assert_match /^SELECT /, sql_segment.params[:sql]
     explanations = sql_segment.params[:explanation]
@@ -207,9 +207,8 @@ class ActiveRecordInstrumentationTest < Test::Unit::TestCase
     
     sample = NewRelic::Agent.instance.transaction_sampler.last_sample
     
-    sample = sample.prepare_to_send(:obfuscate_sql => true, :explain_enabled => true, :explain_sql => 0.0)
+    sample = sample.prepare_to_send(:record_sql => :obfuscated, :explain_sql => 0.0)
     segment = sample.root_segment.called_segments.first.called_segments.first.called_segments.first
-    assert_nil segment.params[:sql], "SQL should have been removed."
     explanations = segment.params[:explanation]
     if isMysql? || isPostgres?
       assert_not_nil explanations, "No explains in segment: #{segment}"
@@ -284,4 +283,4 @@ class ActiveRecordInstrumentationTest < Test::Unit::TestCase
   def isMysql?
     ActiveRecordFixtures::Order.connection.class.name =~ /mysql/i 
   end
-end
+end if defined? Rails

data/test/new_relic/agent/agent_controller_test.rb

@@ -1,8 +1,8 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper')) 
-require 'action_controller/base'
-require 'new_relic/agent/agent_test_controller'
 
 class AgentControllerTest < ActionController::TestCase
+  require 'action_controller/base'
+  require 'new_relic/agent/agent_test_controller'
   
   self.controller_class = NewRelic::Agent::AgentTestController
   
@@ -12,6 +12,19 @@ class AgentControllerTest < ActionController::TestCase
   # setup is not called.
   def initialize name
     super name
+
+  # Suggested by cee-dub for merb tests.  I'm actually amazed if our tests work with merb.
+  if defined?(Merb::Router)
+    Merb::Router.prepare do |r|
+      match('/:controller(/:action)(.:format)').register
+    end
+  else
+    ActionController::Routing::Routes.draw do | map |
+      map.connect '/:controller/:action.:format'
+      map.connect '/:controller/:action'
+    end
+  end
+  
     Thread.current[:newrelic_ignore_controller] = nil
     NewRelic::Agent.manual_start
     @agent = NewRelic::Agent.instance
@@ -226,7 +239,7 @@ class AgentControllerTest < ActionController::TestCase
     queue_time_stat = stats('WebFrontend/Mongrel/Average Queue Time')
     
     # no request start header
-    get :index
+    get 'index'
     assert_equal 0, queue_length_stat.call_count
 
     # apache version of header
@@ -277,4 +290,5 @@ class AgentControllerTest < ActionController::TestCase
     engine.get_stats_no_scope(name)
   end
   
-end
+end if defined? Rails
+