newrelic_rpm 3.5.8.72 → 3.6.0.74.beta

data/.travis.yml

@@ -4,6 +4,7 @@ rvm:
   - ree
   - 1.9.2
   - 1.9.3
+  - 2.0.0
   - jruby-19mode
   - jruby-18mode
 

data/CHANGELOG

@@ -1,6 +1,22 @@
 
 # New Relic Ruby Agent Release Notes #
 
+## v3.6.0 ##
+
+  * Sidekiq supprt
+
+  The Ruby agent now supports the Sidekiq background job framework. Traces from
+  Sidekiq jobs will automatically show up in the Background tasks on New Relic
+  similar to Resque and Delayed::Job tasks.
+
+  * Experimental Rainbows! support
+
+  The Ruby agent now automatically detects and instruments the Rainbows! web
+  server. This support is considered experimental at present, and has not been
+  tested with all dispatch modes.
+
+  Thanks to Joseph Chen for the contribution.
+
 ## v3.5.8 ##
 
   * Key Transactions

data/LICENSE

@@ -23,22 +23,22 @@ See https://github.com/jquery/jquery/blob/master/MIT-LICENSE.txt
     OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
     WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-It also includes source derived from 'okjson' by Keith Rarick, distributed
-under the MIT license.
+It includes source derived from 'okjson' by Keith Rarick, distributed under the
+MIT license.
 See https://github.com/kr/okjson/blob/bdd1113/okjson.rb#L3-21
 
     Copyright 2011, 2012 Keith Rarick
-    
+
     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
@@ -47,8 +47,72 @@ See https://github.com/kr/okjson/blob/bdd1113/okjson.rb#L3-21
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
     THE SOFTWARE.
 
+It includes source derived from 'system_timer' by David Vollbracht & Philippe
+Hanrigou, distributed under Ruby's license terms.
+
+Copyright:  (C) 2008 David Vollbracht & Philippe Hanrigou
+
+Ruby is copyrighted free software by Yukihiro Matsumoto <matz@netlab.co.jp>.
+You can redistribute it and/or modify it under either the terms of the GPL
+(see COPYING.txt file), or the conditions below:
+
+  1. You may make and give away verbatim copies of the source form of the
+     software without restriction, provided that you duplicate all of the
+     original copyright notices and associated disclaimers.
+
+  2. You may modify your copy of the software in any way, provided that
+     you do at least ONE of the following:
+
+       a) place your modifications in the Public Domain or otherwise
+          make them Freely Available, such as by posting said
+modifications to Usenet or an equivalent medium, or by allowing
+the author to include your modifications in the software.
+
+       b) use the modified software only within your corporation or
+          organization.
+
+       c) rename any non-standard executables so the names do not conflict
+with standard executables, which must also be provided.
+
+       d) make other distribution arrangements with the author.
+
+  3. You may distribute the software in object code or executable
+     form, provided that you do at least ONE of the following:
+
+       a) distribute the executables and library files of the software,
+together with instructions (in the manual page or equivalent)
+on where to get the original distribution.
+
+       b) accompany the distribution with the machine-readable source of
+the software.
+
+       c) give non-standard executables non-standard names, with
+          instructions on where to get the original software distribution.
+
+       d) make other distribution arrangements with the author.
+
+  4. You may modify and include the part of the software into any other
+     software (possibly commercial). But some files in the distribution
+     are not written by the author, so that they are not under this terms.
+
+     They are gc.c(partly), utils.c(partly), regex.[ch], st.[ch] and some
+     files under the ./missing directory. See each file for the copying
+     condition.
+
+  5. The scripts and library files supplied as input to or produced as
+     output from the software do not automatically fall under the
+     copyright of the software, but belong to whomever generated them,
+     and may be sold commercially, and may be aggregated with this
+     software.
+
+  6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+     PURPOSE.
+
+
 All other components of this product are
-Copyright (c) 2008-2012 New Relic, Inc.  All rights reserved.
+Copyright (c) 2008-2013 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

data/init.rb

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
 # This is the initialization for the New Relic Ruby Agent when used as
 # a plugin
 require 'new_relic/control'

data/install.rb

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
 if __FILE__ == $0 || $0 =~ /script\/plugin/
   $LOAD_PATH << File.expand_path(File.join(File.dirname(__FILE__), 'lib'))
   require 'new_relic/command'

data/lib/conditional_vendored_dependency_detection.rb

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
 path = File.expand_path('../vendor/gems/dependency_detection-0.0.1.build/lib', File.dirname(__FILE__))
 $LOAD_PATH << path unless $LOAD_PATH.include?(path)
 require 'dependency_detection'

data/lib/conditional_vendored_metric_parser.rb

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
 unless defined?(NewRelic) && defined?(NewRelic::MetricParser)
   vendored_metric_parser = File.expand_path('../../vendor/gems/metric_parser-0.1.0.pre1/lib/', __FILE__)
   $:.unshift vendored_metric_parser unless $:.include?(vendored_metric_parser)

data/lib/new_relic/agent/agent.rb

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
 require 'socket'
 require 'net/https'
 require 'net/http'
@@ -143,8 +147,7 @@ module NewRelic
 
           metrics << metric
           metrics.each do |name|
-            stats = stats_engine.get_stats_no_scope(name)
-            stats.record_data_point(duration_seconds)
+            NewRelic::Agent.record_metric(name, duration_seconds)
           end
 
           if is_error
@@ -451,7 +454,7 @@ module NewRelic
           # requests, we need to wait until the children are forked
           # before connecting, otherwise the parent process sends odd data
           def using_forking_dispatcher?
-            log_if([:passenger, :unicorn].include?(Agent.config[:dispatcher]),
+            log_if([:passenger, :rainbows, :unicorn].include?(Agent.config[:dispatcher]),
                    :info, "Connecting workers after forking.")
           end
 
@@ -880,8 +883,8 @@ module NewRelic
         # transmission later
         def harvest_and_send_timeslice_data
           now = Time.now
-          NewRelic::Agent.instance.stats_engine.get_stats_no_scope('Supportability/invoke_remote').record_data_point(0.0)
-          NewRelic::Agent.instance.stats_engine.get_stats_no_scope('Supportability/invoke_remote/metric_data').record_data_point(0.0)
+          NewRelic::Agent.record_metric('Supportability/invoke_remote', 0.0)
+          NewRelic::Agent.record_metric('Supportability/invoke_remote/metric_data', 0.0)
           harvest_timeslice_data(now)
           begin
             @service.metric_data(@last_harvest_time.to_f,
@@ -1028,8 +1031,8 @@ module NewRelic
           raise e
         ensure
           NewRelic::Agent::Database.close_connections unless forked?
-          @stats_engine.get_stats_no_scope('Supportability/Harvest') \
-            .record_data_point((Time.now - now).to_f)
+          duration = (Time.now - now).to_f
+          @stats_engine.record_metrics('Supportability/Harvest', duration)
         end
 
         # This method contacts the server to send remaining data and

data/lib/new_relic/agent/agent_logger.rb

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
 require 'logger'
 
 module NewRelic

data/lib/new_relic/agent/audit_logger.rb

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
 require 'logger'
 require 'fileutils'
 

data/lib/new_relic/agent/beacon_configuration.rb

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
 module NewRelic
   module Agent
     # This class contains the configuration data for setting up RUM

data/lib/new_relic/agent/browser_monitoring.rb

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
 require 'base64'
 require 'new_relic/agent/beacon_configuration'
 module NewRelic

data/lib/new_relic/agent/busy_calculator.rb

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
 module NewRelic
   module Agent
     # This module supports calculation of actual time spent processing requests over the course of
@@ -90,7 +94,9 @@ module NewRelic
 
         busy = busy / time_window
 
-        instance_busy_stats.record_data_point busy if Agent.config[:report_instance_busy]
+        if Agent.config[:report_instance_busy]
+          NewRelic::Agent.record_metric('Instance/Busy', busy)
+        end
         @harvest_start = t0
       end
 
@@ -101,11 +107,6 @@ module NewRelic
         Time.now
       end
 
-      def instance_busy_stats
-        # Late binding on the Instance/busy stats
-        NewRelic::Agent.agent.stats_engine.get_stats_no_scope 'Instance/Busy'
-      end
-
       self.reset
     end
   end

data/lib/new_relic/agent/chained_call.rb

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
 # This class is used by NewRelic::Agent.set_sql_obfuscator to chain multiple
 # obfuscation blocks when not using the default :replace action
 class NewRelic::ChainedCall

data/lib/new_relic/agent/configuration/defaults.rb

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
 module NewRelic
   module Agent
     module Configuration

data/lib/new_relic/agent/configuration/environment_source.rb

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
 module NewRelic
   module Agent
     module Configuration

data/lib/new_relic/agent/configuration/manager.rb

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
 require 'forwardable'
 require 'new_relic/agent/configuration/defaults'
 require 'new_relic/agent/configuration/mask_defaults'

data/lib/new_relic/agent/configuration/mask_defaults.rb

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
 module NewRelic
   module Agent
     module Configuration

data/lib/new_relic/agent/configuration/server_source.rb

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
 module NewRelic
   module Agent
     module Configuration

data/lib/new_relic/agent/configuration/yaml_source.rb

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
 require 'new_relic/agent/configuration'
 
 module NewRelic
@@ -7,7 +11,7 @@ module NewRelic
         attr_accessor :file_path
 
         def initialize(path, env)
-          ::NewRelic::Agent.logger.debug("Reading configuration from #{path}")
+          ::NewRelic::Agent.logger.info("Reading configuration from #{path}")
 
           config = {}
           begin

data/lib/new_relic/agent/configuration.rb

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
 require 'new_relic/agent/configuration/manager'
 
 # The agent's configuration is accessed through a configuration object exposed

data/lib/new_relic/agent/cross_app_monitor.rb

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
 require 'new_relic/rack/agent_hooks'
 require 'new_relic/agent/thread'
 
@@ -24,7 +28,7 @@ module NewRelic
       # Same for the referring transaction guid
       THREAD_TXN_KEY = :newrelic_cross_app_referring_txn_info
 
-      
+
       # Functions for obfuscating and unobfuscating header values
       module EncodingFunctions
 
@@ -149,7 +153,7 @@ module NewRelic
 
       def cross_app_enabled?
         NewRelic::Agent.config[:cross_process_id] &&
-          (NewRelic::Agent.config[:"cross_application_tracer.enabled"] || 
+          (NewRelic::Agent.config[:"cross_application_tracer.enabled"] ||
            NewRelic::Agent.config[:cross_application_tracing])
       end
 
@@ -167,14 +171,9 @@ module NewRelic
       end
 
       def build_payload(timings, content_length)
-
-        # FIXME The transaction name might not be properly encoded.  use a json generator
-        # For now we just handle quote characters by dropping them
-        transaction_name = timings.transaction_name.gsub(/["']/, "")
-
         payload = [
           NewRelic::Agent.config[:cross_process_id],
-          transaction_name,
+          timings.transaction_name,
           timings.queue_time_in_seconds.to_f,
           timings.app_time_in_seconds.to_f,
           content_length,
@@ -200,8 +199,8 @@ module NewRelic
       end
 
       def set_metrics(id, timings)
-        metric = NewRelic::Agent.instance.stats_engine.get_stats_no_scope("ClientApplication/#{id}/all")
-        metric.record_data_point(timings.app_time_in_seconds)
+        metric_name = "ClientApplication/#{id}/all"
+        NewRelic::Agent.record_metric(metric_name, timings.app_time_in_seconds)
       end
 
       def decoded_id(request)

data/lib/new_relic/agent/cross_app_tracing.rb

@@ -1,5 +1,7 @@
 # -*- ruby -*-
-#encoding: utf-8
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
 module NewRelic
   module Agent
@@ -72,9 +74,8 @@ module NewRelic
             metrics = metrics_for( http, request, response )
             scoped_metric = metrics.pop
 
-            # Report the metrics
-            metrics.each { |metric| get_metric(metric).trace_call(duration) }
-            get_scoped_metric( scoped_metric ).trace_call( duration )
+            stats_engine.record_metrics(metrics, duration)
+            stats_engine.record_metrics(scoped_metric, duration, :scoped => true)
 
             # Add TT custom parameters
             stats_engine.rename_scope_segment( scoped_metric )
@@ -135,7 +136,7 @@ module NewRelic
       end
 
 
-      # Return the set of metrics (NewRelic::MethodTraceStats objects) that correspond to
+      # Return the set of metric names that correspond to
       # the given +request+ and +response+.
       def metrics_for( http, request, response )
         metrics = common_metrics( http )
@@ -240,19 +241,6 @@ module NewRelic
       end
 
 
-      # Convenience function for fetching the metric associated with +metric_name+.
-      def get_metric( metric_name )
-        stats_engine.get_stats_no_scope( metric_name )
-      end
-
-
-      # Convenience function for fetching the scoped metric associated with +metric_name+.
-      def get_scoped_metric( metric_name )
-        # Default is to use the metric_name itself as the scope, which is what we want
-        stats_engine.get_stats( metric_name )
-      end
-
-
       # Fetch a reference to the stats engine.
       def stats_engine
         NewRelic::Agent.instance.stats_engine