ghazel-newrelic_rpm 3.1.0.1 → 3.4.0.2

data/CHANGELOG

@@ -1,10 +1,95 @@
-v3.1.0 
+v3.4.0.1
+ * Prevent the agent from resolving the collector address when disabled.
+ * Fix for error collector configuration that was introduced during beta.
+
+v3.4.0
+ * Major refactor of data transmission mechanism.  This enabled child processes to send data to parent processes, which then send the data to the New Relic service.  This should only affect Resque users, dramatically improving their experience.
+ * Moved Resque instrumentation from rpm_contrib to main agent.  Resque users should discontinue use of rpm_contrib or upgrade to 2.1.11.
+ * Resolve issue with configuring the Error Collector when using server-side configuration.
+
+v3.3.5
+ * [FIX] Allow tracing of methods ending in ! and ?
+ * [PERF] Give up after scanning first 50k of the response in RUM
+   auto-instrumentation.
+ * [FIX] Don't raise when extracting metrics from SQL queries with non UTF-8 bytes.
+ * Replaced "Custom/DJ Locked Jobs" metric with new metrics for
+   monitoring DelayedJob: queue_length, failed_jobs, and locked_jobs, all under
+   Workers/DelayedJob.  queue_length is also broken out by queue name or priority
+   depending on the version of DelayedJob deployed.
+
+v3.3.4.1
+ * Bug fix when rendering empty collection in Rails 3.1+
+
+v3.3.4
+  * Rails 3 view instrumentation
+
+v3.3.3
+  * Improved Sinatra instrumentation
+  * Limit the number of nodes collected in long running transactions to prevent leaking memory
+
+v3.3.2.1
+  * [SECURITY] fix for cookie handling by End User Monitoring instrumentation
+
+v3.3.2
+  * deployments recipe change: truncate git SHAs to 7 characters
+  * Fixes for obfuscation of PostgreSQL and SQLite queries
+  * Fix for lost database connections when using a forking framework
+  * Workaround for RedHat kernel bug which prevented blocking reads of /proc fs
+  * Do not trap signals when handling exceptions
+
+v3.3.1
+  * improved Ruby 1.8.6 support
+  * fix for issues with RAILS_ROOT deprecation warnings
+  * fixed incorrect 1.9 GC time reporting
+  * obfusction for Slow SQL queries respects transaction trace config
+  * fix for RUM instrumentation repoting bad timing info in some cases
+  * refactored ActiveRecord instrumentation, no longer requires Rails
+
+v3.3.0
+  * fix for GC instrumentation when using Ruby 1.9
+  * new feature to correlate browser and server transaction traces
+  * new feature to trace slow sql statements
+  * fix to help cope with malformed rack responses
+  * do not try to instrument versions of ActiveMerchant that are too old
+
+v3.2.0.1
+  * Updated LICENSE
+  * Updated links to support docs
+
+v3.2.0
+  * Fix over-detection of mongrel and unicorn and only start the agent when
+    actual server is running
+  * Improve developer mode backtraces to support ruby 1.9.2, windows
+  * Fixed some cases where Memcache instrumentation was failing to load
+  * Ability to set log destination by NEW_RELIC_LOG env var
+  * Fix to mutex lib load issue
+  * Performance enhancements (thanks to Jeremy Kemper)
+  * Fix overly verbose STDOUT message (thanks to Anselm Helbig)
+
+v3.1.2
+  * Fixed some thread safety issues
+  * Work around for Ruby 1.8.7 Marshal crash bug
+  * Numerous community patches (Gabriel Horner, Bradley Harris, Diego Garcia,
+    Tommy Sullivan, Greg Hazel, John Thomas Marino, Paul Elliott, Pan Thomakos)
+  * Fixed RUM instrumentation bug
+
+v3.1.1
+  * Support for Rails 3.1 (thanks to Ben Hoskings via github)
+  * Support for Rubinius
+  * Fixed issues affecting some Delayed Job users where log files were not appearing
+  * Fixed an issue where some instrumentation might not get loaded in Rails apps
+  * Fix for memcached cas method (thanks to Andrew Long and Joseph Palermo )
+  * Fix for logger deprecation warning (thanks to Jonathan del Strother via github)
+  * Support for logging to STDOUT
+  * Support for Spymemcached client on jruby
+
+v3.1.0
   * Support for aggregating data from short-running
     processes to reduce reporting overhead
   * Numerous bug fixes
   * Increased unit test coverage
 
-v3.0.1 
+v3.0.1
   * Updated Real User Monitoring to reduce javascript size and improve
     compatibility, fix a few known bugs
 
@@ -47,7 +132,7 @@ v2.13.3
   * Dalli instrumentation from Mike Perham (thanks Mike)
   * Datamapper instrumentation from Jordan Ritter (thanks Jordan)
   * Apdex now defaults to 0.5
-    !!! Please be aware that if you are not setting an apdex, 
+    !!! Please be aware that if you are not setting an apdex,
     !!! this will cause a change in the apparent performance of your app.
   * Make metric hashes threadsafe (fixes problems sending metrics in Jruby
     threaded code)
@@ -86,7 +171,7 @@ v2.13.0
     details from web and background transactions occurring outside RPM
   * fixed a bug related to enabling a gold trial / upgrade not sending
     trasaction traces correctly
-    
+
 v2.12.3
   * fix regression in startup sequence
 
@@ -111,7 +196,7 @@ v2.11.2
   * fix for unicorn not reporting when the proc line had 'master' in it
   * fix regression for passenger 2.0 and earlier
   * fix after_fork in the shim
-  
+
 v2.11.1
   * republished gem without generated rdocs
 
@@ -119,18 +204,18 @@ v2.11.0
   * rails3 instrumentation (no developer mode support yet)
   * removed the ensure_worker_thread started and instead defined an after_fork
     handler that will set up the agent properly in forked processes.
-  * change at_exit handler so the shutdown always goes after other shutdown 
+  * change at_exit handler so the shutdown always goes after other shutdown
     handlers
   * add visibility to active record db transactions in the rpm transaction
     traces (thanks to jeremy kemper)
   * fix regression in merb support which caused merb apps not to start
-  * added NewRelic::Agent.logger to the public api to write to the agent 
+  * added NewRelic::Agent.logger to the public api to write to the agent
     log file.
   * optimizations to background thread, controller instrumentation, memory
     usage
   * add logger method to public_api
   * support list notation for ignored exceptions in the newrelic.yml
-    
+
 v2.10.8
   * fix bug in delayed_job instrumentation that caused the job queue sampler
     to run in the wrong place
@@ -140,30 +225,30 @@ v2.10.8
   * fix problem with the Authlogic metric names which caused errors in
     developer mode.  Authlogic metrics now adhere to the convention of
     prefixing the name with  'Custom'
-  * allow more correct overriding of transaction trace settings in the 
+  * allow more correct overriding of transaction trace settings in the
     call to #manual_start
   * simplify WorkerLoop and add better protection for concurrency
   * preliminary support for rails3
-    
+
 v2.10.6
   * fix missing URL and referer on some traced errors and transactions
   * gather traced errors *after* executing the rescue chain in ActionController
   * always load controller instrumentation
   * pick up token validation from newrelic.yml
-  
+
 v2.10.5
   * fix bug in delayed_job instrumentation occurring when there was no DJ log
-  
+
 v2.10.4
   * fix incompatibility with Capistrano 2.5.16
   * strip down URLs reported in transactions and errors to path only
-  
+
 v2.10.3
   * optimization to reduce overhead: move background samplers into foreground thread
   * change default config file to ignore RoutingErrors
   * moved the background task instrumentation into a separate tab in the RPM UI
   * allow override of the RPM application name via NEWRELIC_APP_NAME environment variable
-  * revised Delayed::Job instrumentation so no manual_start is required 
+  * revised Delayed::Job instrumentation so no manual_start is required
   * send buffered data on shutdown
   * expanded support for queue length and queue time
   * remove calls to starts_with to fix Sinatra and non-rails deployments
@@ -175,9 +260,9 @@ v2.10.3
 
 v2.10.2.
   * beta release of 2.10
-  * fix bugs with Sinatra app instrumentation 
+  * fix bugs with Sinatra app instrumentation
   * minor doc updates
-  
+
 v2.10.1.
   * alpha release of 2.10
   * rack support, including metal; ignores 404s; requires a module inclusion (see docs)
@@ -185,14 +270,14 @@ v2.10.1.
   * add API method to abort transaction recording for in-flight transactions
   * remove account management calls from newrelic_api.rb
   * truncating extremely large transaction traces for efficiency
-  * fix error reporting in recipes; add newrelic_rails_env option to recipes to 
+  * fix error reporting in recipes; add newrelic_rails_env option to recipes to
     override the rails env used to pull the app_name out of newrelic.yml
   * added TorqueBox recognition (thanks Bob McWhirter)
   * renamed config settings: enabled => monitor_mode; developer => developer_mode;
     old names will still work in newrelic.yml
   * instrumentation for DelayedJob (thanks Travis Tilley)
-  * added config switches to turn off certain instrumentation when you aren't 
-    interested in the metrics, to save on overhead--see newrelic.yml for details. 
+  * added config switches to turn off certain instrumentation when you aren't
+    interested in the metrics, to save on overhead--see newrelic.yml for details.
   * add profiling support to dev mode; very experimental!
   * add 'multi_threaded' config option to indicate when the app is running
     multi-threaded, so we can disable some instrumentation
@@ -213,13 +298,13 @@ v2.10.1.
   * renamed the dispatcher metric
   * refactored stats_engine code for readability
   * optimization: reduce wakeup times for harvest thread
-  
+
 v2.10.0.
   * alpha release of 2.10
   * support unicorn
   * instrumentation of GC for REE and MRE with GC patch
   * support agent restarting when changes are made to the account
-  * removed #newrelic_notice_error from Object class, replaced by NewRelic::Agent#notic_error 
+  * removed #newrelic_notice_error from Object class, replaced by NewRelic::Agent#notic_error
   * collect histogram statistics
   * add custom parameters to newrelic_notice_error call to display
     extra info for errors
@@ -255,13 +340,13 @@ v2.9.4.
 v2.9.3.
   * fix startup failure in Windows due to memory sampler
   * add JRuby environment information
-   
+
 v2.9.2.
-  * change default apdex_t to 0.5 seconds 
+  * change default apdex_t to 0.5 seconds
   * fix bug in deployments introduced by multi_homed setting
   * support overriding the log in the agent api
   * fix JRuby problem using objectspace
-  * display custom parameters when looking at transactions in dev mode 
+  * display custom parameters when looking at transactions in dev mode
   * display count of sql statements on the list of transactions in dev mode
   * fixes for merb--thanks to Carl Lerche
 
@@ -269,14 +354,14 @@ v2.9.1.
   * add newrelic_ignore_apdex method to controller classes to allow
     you to omit some actions from apdex statistics
   * Add hook for Passenger shutdown events to get more timely shutdown
-    notices; this will help in more accurate memory readings in 
+    notices; this will help in more accurate memory readings in
     Passenger
   * add newrelic_notice_error to Object class
-  * optional ability to verify SSL certificates, note that this has some 
+  * optional ability to verify SSL certificates, note that this has some
     performance and reliability implications
   * support multi-homed host with multiple apps running on duplicate
     ports
-  
+
 v2.9.0.
   Noteworthy Enhancements
   * give visibility to templates and partials in Rails 2.1 and later, in
@@ -291,7 +376,7 @@ v2.9.0.
   * add API for system monitoring daemons (refer to KB articles); changed
     API for manual starting of the agent; refer to
     NewRelic::Agent.manual_start for details
-  * do certificate verification on ssl connections to 
+  * do certificate verification on ssl connections to
     collector.newrelic.com
   * support instances appearing in more than one application by allowing a
     semicolon separated list of names for the newrelic.yml app_name
@@ -305,17 +390,17 @@ v2.9.0.
   * added number of queries to transactions in the transaction list
   * added some sorting options for the transaction list
   * added a page showing the list of active threads
-      
+
   Compatibility Enhancements
   * ruby 1.9.1 compatibility
   * support concurrency when determining busy times, for 2.2 compatibility
   * in jruby, use Java used heap for memory sampling if the system memory
     is not accessible from an unsupported platform
-  * jruby will no longer start the agent now when running the console or 
+  * jruby will no longer start the agent now when running the console or
     rake tasks
   * API support for RPM as a footnote add-in
   * webrick support restored
-  
+
   Noteworthy bugfixes
   * sample memory on linux by reading /proc/#{$$}/status file
   * fixed ambiguous 'View' metrics showing up in controller breakdown
@@ -326,7 +411,7 @@ v2.9.0.
   * moved CPU sampler off background thread and onto the harvest thread
   * tests now run cleanly in any rails app using test:newrelic or
     test:plugins
-    
+
   Agent improvements to support future RPM enhancements
   * add instrumentation to capture metrics on response codes; not yet
     working in rails 2.3.*
@@ -397,7 +482,7 @@ v2.8.1.
     symlinked to /usr/bin.  Usage: newrelic_cmd deployments --help
   * Fix issue invoking api when host is not set in newrelic.yml
   * Fix deployments api so it will work from a gem
-  * Fix thin incompatibility in developer mode 
+  * Fix thin incompatibility in developer mode
 
 v2.8.0.
   * add beta of api in new_relic_api.rb
@@ -405,7 +490,7 @@ v2.8.0.
   * preliminary support for capturing deployment information via capistrano
   * change memory sampler for solaris to use /usr/bin/ps
   * allow ERB in newrelic.yml file
-  * merged support for merb into this version 
+  * merged support for merb into this version
   * fix incompatibility in the developer mode with the safe_erb plugin
   * fix module namespace issue causing an error accessing
     NewRelic::Instrumentation modules
@@ -495,7 +580,7 @@ v2.2.2.
 
 v2.2.1.
   + Add rails 2.1 support for Developer Mode
-  + Changes to memory sampler: Add support for JRuby and fix Solaris support.  
+  + Changes to memory sampler: Add support for JRuby and fix Solaris support.
   * Stop catching exceptions and start catching StandardError; other exception cleanup
   * Add protective exception catching to the stats engine
   * Improved support for thin domain sockets

data/LICENSE

@@ -1,4 +1,31 @@
-Copyright (c) 2008-2010 New Relic, Inc.  All rights reserved.
+This product includes jquery written by John Resig
+and distributed under an MIT license.
+See https://github.com/jquery/jquery/blob/master/MIT-LICENSE.txt
+
+    Copyright (c) 2011 John Resig, http://jquery.com/
+
+    Permission is hereby granted, free of charge, to any person obtaining
+    a copy of this software and associated documentation files (the
+    "Software"), to deal in the Software without restriction, including
+    without limitation the rights to use, copy, modify, merge, publish,
+    distribute, sublicense, and/or sell copies of the Software, and to
+    permit persons to whom the Software is furnished to do so, subject to
+    the following conditions:
+
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+    OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+All other components of this product are
+Copyright (c) 2008-2011 New Relic, Inc.  All rights reserved.
 
 Certain inventions disclosed in this file may be claimed within
 patents owned or patent applications filed by New Relic, Inc. or third
@@ -34,4 +61,4 @@ FITNESS FOR A PARTICULAR PURPOSE, TITLE, or NON-INFRINGEMENT.  As a
 condition to your use of these files, you are solely responsible for
 such use. New Relic will have no liability to you for direct,
 indirect, consequential, incidental, special, or punitive damages or
-for lost profits or data.
+for lost profits or data.

data/README.rdoc

@@ -163,7 +163,7 @@ online.  Refer to instructions in *Getting Started*, below.
 = Support
 
 Reach out to us--and to fellow users--at
-support.newrelic.com[http://support.newrelic.com/discussions/support].
+support.newrelic.com[http://support.newrelic.com/].
 There you'll find documentation, FAQs, and forums where you can submit
 suggestions and discuss New Relic with staff and other users.
 
@@ -171,7 +171,7 @@ Also available is community support on IRC: we generally use #newrelic
 on irc.freenode.net
 
 Find a bug?  E-mail support@newrelic.com, or post it to
-support.newrelic.com[http://support.newrelic.com/discussions/support].
+support.newrelic.com[http://support.newrelic.com/].
 
 Thank you, and may your application scale to infinity plus one.  
 

data/lib/new_relic/agent.rb

@@ -1,5 +1,6 @@
+require 'forwardable'
 require 'new_relic/control'
-require 'new_relic/data_serialization'
+
 # = New Relic Ruby Agent
 #
 # New Relic is a performance monitoring application for applications
@@ -58,7 +59,8 @@ module NewRelic
   # support at New Relic for help.
   module Agent
     extend self
-
+    extend Forwardable
+    
     require 'new_relic/version'
     require 'new_relic/local_environment'
     require 'new_relic/stats'
@@ -70,7 +72,6 @@ module NewRelic
     require 'new_relic/transaction_sample'
     require 'new_relic/url_rule'
     require 'new_relic/noticed_error'
-    require 'new_relic/histogram'
     require 'new_relic/timer_lib'
 
     require 'new_relic/agent'
@@ -82,16 +83,20 @@ module NewRelic
     require 'new_relic/agent/worker_loop'
     require 'new_relic/agent/stats_engine'
     require 'new_relic/agent/transaction_sampler'
+    require 'new_relic/agent/sql_sampler'
     require 'new_relic/agent/error_collector'
     require 'new_relic/agent/busy_calculator'
     require 'new_relic/agent/sampler'
+    require 'new_relic/agent/database'
+    require 'new_relic/agent/pipe_channel_manager'
+    require 'new_relic/agent/transaction_info'
 
     require 'new_relic/agent/instrumentation/controller_instrumentation'
 
     require 'new_relic/agent/samplers/cpu_sampler'
     require 'new_relic/agent/samplers/memory_sampler'
     require 'new_relic/agent/samplers/object_sampler'
-    require 'new_relic/agent/samplers/delayed_job_lock_sampler'
+    require 'new_relic/agent/samplers/delayed_job_sampler'
     require 'set'
     require 'thread'
     require 'resolv'
@@ -122,8 +127,7 @@ module NewRelic
 
     # The singleton Agent instance.  Used internally.
     def agent #:nodoc:
-      raise "Plugin not initialized!" if @agent.nil?
-      @agent
+      @agent || raise("Plugin not initialized!")
     end
 
     def agent=(new_instance)#:nodoc:
@@ -135,21 +139,28 @@ module NewRelic
     # Get or create a statistics gatherer that will aggregate numerical data
     # under a metric name.
     #
-    # +metric_name+ should follow a slash separated path convention.  Application
+    # +metric_name+ should follow a slash separated path convention. Application
     # specific metrics should begin with "Custom/".
     #
     # Return a NewRelic::Stats that accepts data
     # via calls to add_data_point(value).
     def get_stats(metric_name, use_scope=false)
-      @agent.stats_engine.get_stats(metric_name, use_scope)
+      agent.stats_engine.get_stats(metric_name, use_scope)
     end
 
     alias get_stats_no_scope get_stats
 
     # Get the logger for the agent.  Available after the agent has initialized.
-    # This sends output to the agent log file.
+    # This sends output to the agent log file.  If the agent has not initialized
+    # a standard output logger is returned.
     def logger
-      NewRelic::Control.instance.log
+      control = NewRelic::Control.instance(false)
+      if control && control.log
+        control.log
+      else
+        require 'logger'
+        @stdoutlog ||= Logger.new $stdout
+      end
     end
 
     # Call this to manually start the Agent in situations where the Agent does
@@ -169,6 +180,9 @@ module NewRelic
     #
     def manual_start(options={})
       raise "Options must be a hash" unless Hash === options
+      if options[:start_channel_listener]
+        NewRelic::Agent::PipeChannelManager.listener.start
+      end
       NewRelic::Control.instance.init_plugin({ :agent_enabled => true, :sync_startup => true }.merge(options))
     end
 
@@ -184,7 +198,7 @@ module NewRelic
     # jobs or other work.  If you are doing this with a web dispatcher
     # that forks worker processes then you will need to force the
     # agent to reconnect, which it won't do by default.  Passenger and
-    # Unicorn are already handled, nothing special needed for them.
+    # Unicorn and Rainbows are already handled, nothing special needed for them.
     #
     # Options:
     # * <tt>:force_reconnect => true</tt> to force the spawned process to
@@ -198,34 +212,17 @@ module NewRelic
       agent.after_fork(options)
     end
 
-    # Clear out any unsent metric data.
+    # Clear out any unsent metric data. See NewRelic::Agent::Agent#reset_stats
     def reset_stats
       agent.reset_stats
     end
 
     # Shutdown the agent.  Call this before exiting.  Sends any queued data
     # and kills the background thread.
-    def shutdown(options = {})
+    def shutdown(options={})
       agent.shutdown(options)
     end
 
-    def save_data
-      NewRelic::DataSerialization.read_and_write_to_file do |old_data|
-        agent.merge_data_from(old_data)
-        agent.serialize
-      end
-    end
-
-    def load_data
-      value = nil
-      NewRelic::DataSerialization.read_and_write_to_file do |old_data|
-        agent.merge_data_from(old_data)
-        value = {:metrics => agent.stats_engine.metrics.length, :traces => agent.unsent_traces_size, :errors => agent.unsent_errors_size}
-        nil # return nil so nothing is written to the file
-      end
-      value
-    end
-
     # Add instrumentation files to the agent.  The argument should be
     # a glob matching ruby scripts which will be executed at the time
     # instrumentation is loaded.  Since instrumentation is not loaded
@@ -251,7 +248,7 @@ module NewRelic
     #    end
     #
     def set_sql_obfuscator(type = :replace, &block)
-      agent.set_sql_obfuscator type, &block
+      NewRelic::Agent::Database.set_sql_obfuscator(type, &block)
     end
 
 
@@ -288,10 +285,7 @@ module NewRelic
     # any.  Only affects the transaction started on this thread once
     # it has started and before it has completed.
     def abort_transaction!
-      # The class may not be loaded if the agent is disabled
-      if defined? NewRelic::Agent::Instrumentation::MetricFrame
-        NewRelic::Agent::Instrumentation::MetricFrame.abort_transaction!
-      end
+      NewRelic::Agent::Instrumentation::MetricFrame.abort_transaction!
     end
 
     # Yield to the block without collecting any metrics or traces in
@@ -310,11 +304,15 @@ module NewRelic
     def is_execution_traced?
       Thread.current[:newrelic_untraced].nil? || Thread.current[:newrelic_untraced].last != false
     end
-
+    
+    # helper method to check the thread local to determine whether the
+    # transaction in progress is traced or not
     def is_transaction_traced?
       Thread::current[:record_tt] != false
     end
-
+    
+    # helper method to check the thread local to determine whether sql
+    # is being recorded or not
     def is_sql_recorded?
       Thread::current[:record_sql] != false
     end
@@ -356,6 +354,19 @@ module NewRelic
     def add_custom_parameters(params)
       NewRelic::Agent::Instrumentation::MetricFrame.add_custom_parameters(params)
     end
+    
+    # Set attributes about the user making this request. These attributes will be automatically
+    # appended to any Transaction Trace or Error that is collected. These attributes
+    # will also be collected for RUM requests.
+    #
+    # Attributes (hash)
+    # * <tt>:user</tt> => user name or ID
+    # * <tt>:account</tt> => account name or ID
+    # * <tt>:product</tt> => product name or level
+    #
+    def set_user_attributes(attributes)
+      NewRelic::Agent::Instrumentation::MetricFrame.set_user_attributes(attributes)
+    end
 
     # The #add_request_parameters method is aliased to #add_custom_parameters
     # and is now deprecated.
@@ -418,6 +429,7 @@ module NewRelic
     def browser_timing_footer
       agent.browser_timing_footer
     end
-
+    
+    def_delegator :'NewRelic::Agent::PipeChannelManager', :register_report_channel
   end
 end