newrelic_rpm 3.1.0.beta1 → 3.1.0.beta2

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

@@ -175,7 +175,7 @@ module NewRelic
         # dispatches to more specific operation methods based on a
         # parameter (very dangerous, btw!).  With this instrumentation,
         # the +invoke_operation+ action is ignored but the operation
-        # methods show up in RPM as if they were first class controller
+        # methods show up in New Relic as if they were first class controller
         # actions
         #
         #   MyController < ActionController::Base
@@ -199,7 +199,7 @@ module NewRelic
         #   controller action and will appear with all the other actions.  This
         #   is the default.
         # * <tt>:category => :task</tt> indicates that this is a
-        #   background task and will show up in RPM with other background
+        #   background task and will show up in New Relic with other background
         #   tasks instead of in the controllers list
         # * <tt>:category => :rack</tt> if you are instrumenting a rack
         #   middleware call.  The <tt>:name</tt> is optional, useful if you

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

@@ -19,7 +19,7 @@
 # NOTE: On using "Database" versus "ActiveRecord" as base metric name
 #
 #   Using "Database" as the metric name base seems to properly identify methods
-#   as being DB-related in call graphs, but certain RPM views that show
+#   as being DB-related in call graphs, but certain New Relic views that show
 #   aggregations of DB CPM, etc still seem to rely solely on "ActiveRecord"
 #   being the base name, thus AFAICT "Database" calls to this are lost.  (Though
 #   I haven't yet tested "Database/SQL/{find/save/destroy/all}" yet, as it seems

data/lib/new_relic/commands/deployments.rb

@@ -32,7 +32,7 @@ class NewRelic::Command::Deployments < NewRelic::Command
     @appname ||= config.app_names[0] || config.env || 'development'
   end
 
-  # Run the Deployment upload in RPM via Active Resource.
+  # Run the Deployment upload in New Relic via Active Resource.
   # Will possibly print errors and exit the VM
   def run
     begin

data/lib/new_relic/control/configuration.rb

@@ -97,7 +97,7 @@ module NewRelic
       end
 
       # Configuration option of the same name to indicate that we should connect
-      # to RPM synchronously on startup.  This means when the agent is loaded it
+      # to New Relic synchronously on startup.  This means when the agent is loaded it
       # won't return without trying to set up the server connection at least once
       # which can make startup take longer.  Defaults to false.
       def sync_startup

data/lib/new_relic/delayed_job_injection.rb

@@ -1,7 +1,8 @@
 require 'dependency_detection'
-# This installs some code to manually start the agent when a delayed job worker starts.
-# It's not really instrumentation.  It's more like a hook from DJ to RPM so it gets
-# loaded at the time the RPM plugin initializes, which must be before the DJ worker
+# This installs some code to manually start the agent when a delayed
+# job worker starts.  It's not really instrumentation.  It's more like
+# a hook from DJ to the Ruby Agent so it gets loaded at the time the
+# Ruby Agent initializes, which must be before the DJ worker
 # initializes.  Loaded from control.rb
 module NewRelic
   module DelayedJobInjection
@@ -24,7 +25,7 @@ DependencyDetection.defer do
                       when self.class.respond_to?(:default_name) then self.class.default_name
                       end
         dispatcher_instance_id = worker_name || "host:#{Socket.gethostname} pid:#{Process.pid}" rescue "pid:#{Process.pid}"
-        say "RPM Monitoring DJ worker #{dispatcher_instance_id}"
+        say "New Relic Ruby Agent Monitoring DJ worker #{dispatcher_instance_id}"
         NewRelic::DelayedJobInjection.worker_name = worker_name
         NewRelic::Control.instance.init_plugin :dispatcher => :delayed_job, :dispatcher_instance_id => dispatcher_instance_id
       end

data/lib/new_relic/histogram.rb

@@ -15,7 +15,7 @@ module NewRelic
     # Stores statistics for response times falling in a particular range.
     # A bucket has a min and max response time.  A response time event
     # falls in a bucket if min <= r/t < max.  A bucket also
-    # has an associated metric for reporting data to RPM.  The
+    # has an associated metric for reporting data to New Relic.  The
     # bucket range is encoded in the metic name
     class Bucket
 

data/lib/new_relic/noticed_error.rb

@@ -1,4 +1,4 @@
-# This class encapsulates an error that was noticed by RPM in a managed app.
+# This class encapsulates an error that was noticed by New Relic in a managed app.
 class NewRelic::NoticedError
   extend NewRelic::CollectionHelper
   attr_accessor :path, :timestamp, :params, :exception_class, :message

data/lib/new_relic/rack/browser_monitoring.rb

@@ -9,6 +9,12 @@ module NewRelic::Rack
 
     # method required by Rack interface
     def call(env)
+      
+      # clear out the thread locals we use in case this is a static request
+      Thread.current[:newrelic_most_recent_transaction] = nil
+      Thread.current[:newrelic_start_time] = Time.now
+      Thread.current[:newrelic_queue_time] = 0
+      
       result = @app.call(env)   # [status, headers, response]
 
       if (NewRelic::Agent.browser_timing_header != "") && should_instrument?(result[0], result[1])
@@ -30,7 +36,7 @@ module NewRelic::Rack
 
     def autoinstrument_source(response, headers)
       source = nil
-      response.each {|fragment| (source) ? (source << f) : (source = fragment)}
+      response.each {|fragment| (source) ? (source << fragment) : (source = fragment)}
 
       body_start = source.index("<body")
       body_close = source.rindex("</body>")

data/lib/new_relic/rack/metric_app.rb

@@ -19,6 +19,7 @@ module NewRelic
         options[:app_name] ||= 'EPM Monitor'
         options[:disable_samplers] = true
         NewRelic::Agent.manual_start options
+        NewRelic::Agent.logger.warn "This rack app is deprecated - it will be removed in the next version of the Ruby Agent"
         unless NewRelic::Control.instance.license_key
           raise "Please add a valid license key to newrelic.yml."
         end

data/lib/new_relic/rack/mongrel_rpm.ru

@@ -15,6 +15,8 @@ require 'new_relic/rack_app'
 # use Rack::ShowExceptions
 # use Rack::Reloader if ENV['RACK_ENV'] == 'development'
 
+puts "This Rack Metric Collection system is deprecated - it will be removed in the next version of the Ruby Agent"
+
 map "/newrelic/record_value" do
   run NewRelic::Rack::MetricApp.new(options)
 end

data/lib/new_relic/recipes.rb

@@ -13,7 +13,7 @@ make_notify_task = Proc.new do
   namespace :newrelic do
 
     # on all deployments, notify New Relic
-    desc "Record a deployment in New Relic (rpm.newrelic.com)"
+    desc "Record a deployment in New Relic (newrelic.com)"
     task :notice_deployment, :roles => :app, :except => {:no_release => true } do
       rails_env = fetch(:newrelic_rails_env, fetch(:rails_env, "production"))
       require File.join(File.dirname(__FILE__), 'command.rb')

data/lib/new_relic/transaction_sample.rb

@@ -174,8 +174,9 @@ module NewRelic
       sample
     end
 
-    # return a new transaction sample that can be sent to the RPM service.
-    # this involves potentially one or more of the following options
+    # Return a new transaction sample that can be sent to the New
+    # Relic service. This involves potentially one or more of the
+    # following options
     #
     #   :explain_sql : run EXPLAIN on all queries whose response times equal the value for this key
     #       (for example :explain_sql => 2.0 would explain everything over 2 seconds.  0.0 would explain everything.)

data/lib/new_relic/transaction_sample/segment.rb

@@ -157,14 +157,15 @@ module NewRelic
         nil
       end
 
-      # perform this in the runtime environment of a managed
+      # Perform this in the runtime environment of a managed
       # application, to explain the sql statement(s) executed within a
-      # segment of a transaction sample.  returns an array of
+      # segment of a transaction sample. Returns an array of
       # explanations (which is an array rows consisting of an array of
       # strings for each column returned by the the explain query)
       # Note this happens only for statements whose execution time
       # exceeds a threshold (e.g. 500ms) and only within the slowest
-      # transaction in a report period, selected for shipment to RPM
+      # transaction in a report period, selected for shipment to New
+      # Relic
       def explain_sql
         sql = params[:sql]
         return nil unless sql && params[:connection_config]

data/lib/new_relic/version.rb

@@ -4,7 +4,7 @@ module NewRelic
     MAJOR = 3
     MINOR = 1
     TINY  = 0
-    BUILD = 'beta1' #'0' # Set to nil for a release, 'beta1', 'alpha', etc for prerelease builds
+    BUILD = 'beta2' #'0' # Set to nil for a release, 'beta1', 'alpha', etc for prerelease builds
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
   end
 

data/newrelic.yml

@@ -1,7 +1,7 @@
 #
-# This file configures the NewRelic RPM Agent, NewRelic RPM monitors
+# This file configures the New Relic Ruby Agent, New Relic monitors
 # Rails applications with deep visibility and low overhead.  For more
-# information, visit www.newrelic.com.
+# information, visit www.newrelic.com
 #
 # Generated <%= Time.now.strftime('%B %d, %Y') %>, for version <%= NewRelic::VERSION::STRING %>
 #
@@ -14,7 +14,7 @@ common: &default_settings
 
   # 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.
+  # New Relic service.
   license_key: '<%= license_key %>'
   
   # Agent Enabled (Rails Only)
@@ -27,14 +27,14 @@ common: &default_settings
   #
   # agent_enabled: auto
   
-  # Application Name
-  # Set this to be the name of your application as you'd like it show
-  # up in RPM.  RPM will then auto-map instances of your application
-  # 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, or a yaml list.  Defaults to the 
-  # capitalized RAILS_ENV or RACK_ENV (i.e., Production, Staging, etc)
+  # Application Name Set this to be the name of your application as
+  # you'd like it show up in New Relic. The service will then auto-map
+  # instances of your application into an "application" on your
+  # 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, or a yaml list.
+  # Defaults to the capitalized RAILS_ENV or RACK_ENV (i.e.,
+  # Production, Staging, etc)
   #
   # Example:
   #
@@ -45,7 +45,7 @@ common: &default_settings
   app_name: <%= @app_name %>
 
   # When "true", the agent collects performance data about your 
-  # application and reports this data to the NewRelic RPM service at 
+  # application and reports this data to the New Relic service at 
   # newrelic.com. This global switch is normally overridden for each 
   # environment below. (formerly called 'enabled')
   monitor_mode: true
@@ -68,7 +68,7 @@ common: &default_settings
   # Optionally set the name of the log file, defaults to 'newrelic_agent.log'
   # log_file_name: 'newrelic_agent.log'
 
-  # The newrelic agent communicates with the RPM service via http by
+  # The newrelic agent communicates with the service via http by
   # default.  If you want to communicate via https to increase
   # security, then turn on SSL by setting this value to true.  Note,
   # this will result in increased CPU overhead to perform the
@@ -83,7 +83,7 @@ common: &default_settings
   # you send us needs end-to-end verified certificates.
   #
   # This means we cannot cache the DNS lookup, so each request to the
-  # RPM service will perform a lookup. It also means that we cannot
+  # service will perform a lookup. It also means that we cannot
   # use a non-blocking lookup, so in a worst case, if you have DNS
   # problems, your app may block indefinitely.
   # verify_certificate: true
@@ -110,7 +110,7 @@ common: &default_settings
       # into web pages. Set this attribute to false to turn off this behavior.
       auto_instrument: true
 
-  # Proxy settings for connecting to the RPM server.
+  # Proxy settings for connecting to the service.
   #
   # If a proxy is used, the host setting is required.  Other settings
   # are optional.  Default port is 8080.
@@ -132,22 +132,22 @@ common: &default_settings
 
 
   # Transaction tracer captures deep information about slow
-  # transactions and sends this to the RPM service once a
+  # transactions and sends this to the service once a
   # minute. Included in the transaction is the exact call sequence of
   # the transactions including any SQL statements issued.
   transaction_tracer:
   
     # Transaction tracer is enabled by default. Set this to false to
-    # turn it off. This feature is only available at the Silver and
-    # above product levels.
+    # turn it off. This feature is only available at the Professional
+    # and above product levels.
     enabled: true
     
     # Threshold in seconds for when to collect a transaction
     # trace. When the response time of a controller action exceeds
     # this threshold, a transaction trace will be recorded and sent to
-    # RPM. Valid values are any float value, or (default) "apdex_f",
-    # which will use the threshold for an dissatisfying Apdex
-    # controller action - four times the Apdex T value.
+    # the service. Valid values are any float value, or (default)
+    # "apdex_f", which will use the threshold for an dissatisfying
+    # Apdex controller action - four times the Apdex T value.
     transaction_threshold: apdex_f
  
     # When transaction tracer is on, SQL statements can optionally be
@@ -158,7 +158,7 @@ common: &default_settings
     
     # Threshold in seconds for when to collect stack trace for a SQL
     # call. In other words, when SQL statements exceed this threshold,
-    # then capture and send to RPM the current stack trace. This is
+    # then capture and send the current stack trace. This is
     # helpful for pinpointing where long SQL calls originate from
     stack_trace_threshold: 0.500
 
@@ -172,11 +172,11 @@ common: &default_settings
     # explain_threshold: 0.5
   
   # Error collector captures information about uncaught exceptions and
-  # sends them to RPM for viewing
+  # sends them to the service for viewing
   error_collector:
     
     # Error collector is enabled by default. Set this to false to turn
-    # it off. This feature is only available at the Silver and above
+    # it off. This feature is only available at the Professional and above
     # product levels
     enabled: true
     
@@ -185,7 +185,7 @@ common: &default_settings
     # related.
     capture_source: true    
     
-    # To stop specific errors from reporting to RPM, set this property
+    # To stop specific errors from reporting to New Relic, set this property
     # to comma separated values.  Default is to ignore routing errors
     # which are how 404's get triggered.
     #
@@ -226,7 +226,7 @@ common: &default_settings
 
 development:
   <<: *default_settings
-  # Turn off communication to RPM service in development mode (also 
+  # Turn off communication to New Relic service in development mode (also 
   # 'enabled').
   # NOTE: for initial evaluation purposes, you may want to temporarily 
   # turn the agent on in development mode.

data/newrelic_rpm.gemspec

@@ -5,17 +5,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{newrelic_rpm}
-  s.version = "3.1.0.beta1"
+  s.version = "3.1.0.beta2"
 
   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-05-11}
-  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
-application as it runs in production. The New Relic Agent is
-dual-purposed as a either a Rails plugin or a Gem, hosted on
-http://github.com/newrelic/rpm/tree/master.
+  s.date = %q{2011-05-20}
+  s.description = %q{New Relic is a performance management system, developed by New Relic,
+Inc (http://www.newrelic.com).  New Relic provides you with deep
+information about the performance of your web application as it runs
+in production. The New Relic Ruby Agent is dual-purposed as a either a
+Gem or plugin, hosted on
+http://github.com/newrelic/rpm/
 }
   s.email = %q{support@newrelic.com}
   s.executables = ["newrelic_cmd", "newrelic", "mongrel_rpm"]
@@ -185,7 +185,7 @@ http://github.com/newrelic/rpm/tree/master.
     "test/new_relic/local_environment_test.rb",
     "test/new_relic/metric_data_test.rb",
     "test/new_relic/metric_spec_test.rb",
-    "test/new_relic/rack/episodes_test.rb",
+    "test/new_relic/rack/all_test.rb",
     "test/new_relic/stats_test.rb",
     "test/new_relic/transaction_analysis/segment_summary_test.rb",
     "test/new_relic/transaction_analysis_test.rb",
@@ -285,7 +285,7 @@ PLEASE NOTE:
 
 Developer Mode is now a Rack middleware.
 
-RPM Developer Mode is no longer available in Rails 2.1 and earlier.
+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
@@ -296,20 +296,15 @@ 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
+Please see http://github.com/newrelic/rpm/blob/master/CHANGELOG
 for a complete description of the features and enhancements available
 in version 3.1 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 = ["--line-numbers", "--inline-source", "--title", "New Relic Ruby Performance Monitoring Agent"]
+  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "New Relic Ruby Agent"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.6}
-  s.summary = %q{New Relic Ruby Performance Monitoring Agent}
+  s.summary = %q{New Relic Ruby Agent}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

data/test/active_record_fixtures.rb

@@ -65,7 +65,7 @@ module ActiveRecordFixtures
       end
     end
     def self.check_for_table
-      connection.table_exists?(self.table_name)
+      connection.table_exists?(self.table_name) && connection.table_exists?('orders_shipments')
     rescue Exception => e
       false
     end

data/test/new_relic/agent/agent/connect_test.rb

@@ -88,7 +88,7 @@ class NewRelic::Agent::Agent::ConnectTest < Test::Unit::TestCase
     fake_control = mock()
     fake_control.expects(:server).returns("server")
     self.expects(:control).once.returns(fake_control)
-    log.expects(:error).with("Error establishing connection with New Relic RPM Service at server: message")
+    log.expects(:error).with("Error establishing connection with New Relic Service at server: message")
     log.expects(:debug).with("line\nsecondline")
     log_error(error)
   end
@@ -165,7 +165,7 @@ class NewRelic::Agent::Agent::ConnectTest < Test::Unit::TestCase
     fake_collector = mocked_error_collector
     fake_collector.expects(:config_enabled).returns(false)
     fake_collector.expects(:enabled=).with(false)
-    log.expects(:debug).with("Errors will not be sent to the RPM service.")
+    log.expects(:debug).with("Errors will not be sent to the New Relic service.")
     configure_error_collector!(false)
   end
 
@@ -173,7 +173,7 @@ class NewRelic::Agent::Agent::ConnectTest < Test::Unit::TestCase
     fake_collector = mocked_error_collector
     fake_collector.expects(:config_enabled).returns(true)
     fake_collector.expects(:enabled=).with(true)
-    log.expects(:debug).with("Errors will be sent to the RPM service.")
+    log.expects(:debug).with("Errors will be sent to the New Relic service.")
     configure_error_collector!(true)
   end
 
@@ -181,7 +181,7 @@ class NewRelic::Agent::Agent::ConnectTest < Test::Unit::TestCase
     fake_collector = mocked_error_collector
     fake_collector.expects(:config_enabled).returns(true)
     fake_collector.expects(:enabled=).with(false)
-    log.expects(:debug).with("Errors will not be sent to the RPM service.")
+    log.expects(:debug).with("Errors will not be sent to the New Relic service.")
     configure_error_collector!(false)
   end
 
@@ -226,14 +226,14 @@ class NewRelic::Agent::Agent::ConnectTest < Test::Unit::TestCase
 
   def test_configure_transaction_tracer_negative
     @config_should_send_samples = false
-    log.expects(:debug).with('Transaction traces will not be sent to the RPM service.')
+    log.expects(:debug).with('Transaction traces will not be sent to the New Relic service.')
     configure_transaction_tracer!(true, 10)
     assert !@should_send_samples
   end
 
   def test_configure_transaction_tracer_server_disabled
     @config_should_send_samples = true
-    log.expects(:debug).with('Transaction traces will not be sent to the RPM service.')
+    log.expects(:debug).with('Transaction traces will not be sent to the New Relic service.')
     configure_transaction_tracer!(false, 10)
     assert !@should_send_samples
   end