newrelic_rpm 3.6.5.130 → 3.6.6.147

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

@@ -0,0 +1,23 @@
+# 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.
+
+DependencyDetection.defer do
+  named :puma
+
+  depends_on do
+    defined?(::Puma) &&
+      defined?(::Puma::Const::VERSION) &&
+      NewRelic::VersionNumber.new(::Puma::Const::VERSION) > NewRelic::VersionNumber.new("2.0.0")
+  end
+
+  executes do
+    ::NewRelic::Agent.logger.info 'Installing Puma cluster mode support'
+  end
+
+  executes do
+    Puma.cli_config.options[:worker_boot] << Proc.new do
+      ::NewRelic::Agent.after_fork(:force_reconnect => true)
+    end
+  end
+end

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

@@ -100,3 +100,43 @@ module NewRelic
     end
   end
 end
+
+
+DependencyDetection.defer do
+  named :rack
+
+  depends_on do
+    defined?(::Rack) && defined?(::Rack::Builder)
+  end
+
+  executes do
+    ::NewRelic::Agent.logger.info 'Installing deferred Rack instrumentation'
+  end
+
+  executes do
+    unless ::Rack::Builder.respond_to?(:_nr_deferred_detection_ran)
+      class ::Rack::Builder
+
+        class << self
+          attr_accessor :_nr_deferred_detection_ran
+        end
+        self._nr_deferred_detection_ran = false
+
+        def to_app_with_newrelic_deferred_dependency_detection
+          unless Rack::Builder._nr_deferred_detection_ran
+            NewRelic::Agent.logger.info "Doing deferred dependency-detection before Rack startup"
+            DependencyDetection.detect!
+            Rack::Builder._nr_deferred_detection_ran = true
+          end
+
+          to_app_without_newrelic
+        end
+
+        alias_method :to_app_without_newrelic, :to_app
+        alias_method :to_app, :to_app_with_newrelic_deferred_dependency_detection
+
+      end
+    end
+  end
+end
+

data/lib/new_relic/agent/instrumentation/rails/action_web_service.rb

@@ -4,15 +4,15 @@
 
 DependencyDetection.defer do
   @name = :rails_action_web_service
-  
+
   depends_on do
     defined?(ActionWebService)
   end
-  
+
   executes do
     ::NewRelic::Agent.logger.info 'Installing Rails ActionWebService instrumentation'
-  end  
-  
+  end
+
   executes do
     # NewRelic Agent instrumentation for WebServices
 

data/lib/new_relic/agent/instrumentation/rails/errors.rb

@@ -43,4 +43,3 @@ DependencyDetection.defer do
     end
   end
 end
-

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

@@ -51,4 +51,3 @@ DependencyDetection.defer do
   end
 
 end
-

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

@@ -12,7 +12,7 @@ DependencyDetection.defer do
   executes do
     ::NewRelic::Agent.logger.info 'Installing Rails Sunspot instrumentation'
   end
-  
+
   executes do
     ::Sunspot.module_eval do
       class << self

data/lib/new_relic/agent/internal_agent_error.rb

@@ -0,0 +1,18 @@
+# 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 base class for all errors that we want to record through the
+# NewRelic::Agent::ErrorCollector#notice_agent_error API. It provides the
+# standard support text at the front of the message, and is used for flagging
+# agent errors when checking queue limits.
+
+module NewRelic
+  module Agent
+    class InternalAgentError < StandardError
+      def initialize(msg=nil)
+        super("Ruby agent internal error. Please contact support referencing this error.\n #{msg}")
+      end
+    end
+  end
+end

data/lib/new_relic/agent/new_relic_service.rb

@@ -38,8 +38,6 @@ module NewRelic
         Agent.config.register_callback(:ssl) do |ssl|
           if !ssl
             ::NewRelic::Agent.logger.warn("Agent is configured not to use SSL when communicating with New Relic's servers")
-          elsif !Agent.config[:verify_certificate]
-            ::NewRelic::Agent.logger.warn("Agent is configured to use SSL but to skip certificate validation when communicating with New Relic's servers")
           else
             ::NewRelic::Agent.logger.debug("Agent is configured to use SSL")
           end
@@ -209,12 +207,8 @@ module NewRelic
             # an error when use_ssl=(true) is called and jruby-openssl isn't
             # installed
             http.use_ssl = true
-            if Agent.config[:verify_certificate]
-              http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-              http.ca_file = cert_file_path
-            else
-              http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-            end
+            http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+            http.ca_file = cert_file_path
           rescue StandardError, LoadError
             msg = "Agent is configured to use SSL, but SSL is not available in the environment. "
             msg << "Either disable SSL in the agent configuration, or install SSL support."

data/lib/new_relic/agent/request_sampler.rb

@@ -146,11 +146,12 @@ class NewRelic::Agent::RequestSampler
 
 
   # Event handler for the :transaction_finished event.
-  def on_transaction_finished( metric, duration, options={} )
+  def on_transaction_finished( metric, start_timestamp, duration, options={} )
     return unless @enabled
     self << {
-      NAME_KEY     => string(metric),
-      DURATION_KEY => float(duration)
+      TIMESTAMP_KEY => float(start_timestamp),
+      NAME_KEY      => string(metric),
+      DURATION_KEY  => float(duration)
     }.merge(options)
   end
 
@@ -234,8 +235,6 @@ class NewRelic::Agent::RequestSampler
     @last_sample_taken = Time.now
 
     sample[TYPE_KEY]      = SAMPLE_TYPE
-    sample[TIMESTAMP_KEY] = @last_sample_taken
-
     @samples << sample
   end
 
@@ -247,4 +246,3 @@ class NewRelic::Agent::RequestSampler
   end
 
 end # class NewRelic::Agent::RequestSampler
-

data/lib/new_relic/agent/samplers/cpu_sampler.rb

@@ -68,4 +68,3 @@ module NewRelic
     end
   end
 end
-

data/lib/new_relic/agent/stats.rb

@@ -100,6 +100,15 @@ module NewRelic
         "#<NewRelic::Agent::Stats #{to_s} >"
       end
 
+      # Concerned about implicit usage of inspect relying on stats format, so
+      # putting back a version to get full inspection as separate method
+      def inspect_full
+        variables = instance_variables.map do |ivar|
+          "#{ivar.to_s}=#{instance_variable_get(ivar).inspect}"
+        end.join(" ")
+        "#<NewRelic::Agent::Stats #{variables}>"
+      end
+
       def ==(other)
         other.class == self.class &&
         (

data/lib/new_relic/agent/stats_engine/stats_hash.rb

@@ -12,6 +12,9 @@
 #
 # This class makes no provisions for safe usage from multiple threads, such
 # measures should be externally provided.
+
+require 'new_relic/agent/internal_agent_error'
+
 module NewRelic
   module Agent
     class StatsHash < ::Hash
@@ -31,9 +34,32 @@ module NewRelic
         Hash[self] == Hash[other]
       end
 
+      class CorruptedDefaultProcError < NewRelic::Agent::InternalAgentError
+        def initialize(hash, metric_spec)
+          super("Corrupted default proc for StatsHash. Falling back adding #{metric_spec.inspect}")
+        end
+      end
+
       def record(metric_specs, value=nil, aux=nil)
         Array(metric_specs).each do |metric_spec|
-          stats = self[metric_spec]
+          stats = nil
+          begin
+            stats = self[metric_spec]
+          rescue => e
+            # This only happen in the case of a corrupted default_proc
+            # Side-step it manually, notice the issue, and carry on....
+            NewRelic::Agent.instance.error_collector. \
+              notice_agent_error(CorruptedDefaultProcError.new(self, metric_spec))
+
+            stats = NewRelic::Agent::Stats.new
+            self[metric_spec] = stats
+
+            # Try to restore the default_proc so we won't continually trip the error
+            if respond_to?(:default_proc=)
+              self.default_proc = Proc.new { |hash, key| hash[key] = NewRelic::Agent::Stats.new }
+            end
+          end
+
           if block_given?
             yield stats
           else
@@ -50,12 +76,24 @@ module NewRelic
         end
       end
 
+      class StatsMergerError < NewRelic::Agent::InternalAgentError
+        def initialize(key, destination, source, original_exception)
+          super("Failure when merging stats '#{key}'. In Hash: #{destination.inspect_full}. Merging: #{source.inspect_full}. Original exception: #{original_exception.class} #{original_exception.message}")
+          set_backtrace(original_exception.backtrace)
+        end
+      end
+
       def merge!(other)
         other.each do |key,val|
-          if self.has_key?(key)
-            self[key].merge!(val)
-          else
-            self[key] = val
+          begin
+            if self.has_key?(key)
+              self[key].merge!(val)
+            else
+              self[key] = val
+            end
+          rescue => err
+            NewRelic::Agent.instance.error_collector. \
+              notice_agent_error(StatsMergerError.new(key, self.fetch(key, nil), val, err))
           end
         end
         self
@@ -69,4 +107,4 @@ module NewRelic
       end
     end
   end
-end
+end

data/lib/new_relic/agent/system_info.rb

@@ -51,4 +51,4 @@ module NewRelic
       end
     end
   end
-end
+end

data/lib/new_relic/agent/thread_profiler.rb

@@ -39,9 +39,9 @@ module NewRelic
       end
 
       def respond_to_commands(commands, &notify_results)
-        return if commands.empty? || commands.first.size < 2 
+        return if commands.empty? || commands.first.size < 2
 
-        # Doesn't deal with multiple commands in the return set  as 
+        # Doesn't deal with multiple commands in the return set  as
         # we currently only have start/stop of thread profiling
         command_id = commands.first[0]
         command = commands.first[1]
@@ -107,10 +107,10 @@ EOF
 
     class ThreadProfile
 
-      attr_reader :profile_id, 
-        :traces, 
-        :profile_agent_code, :interval, 
-        :poll_count, :sample_count, 
+      attr_reader :profile_id,
+        :traces,
+        :profile_agent_code, :interval,
+        :poll_count, :sample_count,
         :start_time, :stop_time
 
       def initialize(profile_id, duration, interval, profile_agent_code)

data/lib/new_relic/agent/transaction.rb

@@ -196,7 +196,7 @@ module NewRelic
 
         # these tear everything down so need to be done after merging stats
         if self.root?
-          agent.events.notify(:transaction_finished, @name, end_time.to_f - start_time.to_f, overview_metrics)
+          agent.events.notify(:transaction_finished, @name, start_time.to_f, end_time.to_f - start_time.to_f, overview_metrics)
           agent.stats_engine.end_transaction
         end
       end

data/lib/new_relic/agent/transaction_info.rb

@@ -112,4 +112,3 @@ module NewRelic
     end
   end
 end
-

data/lib/new_relic/agent/transaction_sample_builder.rb

@@ -32,13 +32,14 @@ module NewRelic
           @depth = 1
         end
 
-        # No-op - some clients expect to be able to use this to attach params to
-        # TT segments.
+        # No-op - some clients expect to be able to use these to read/write
+        # params on TT segments.
+        def [](key); end
         def []=(key, value); end
 
-        # No-op - some clients expect to be able to use this to read params from
-        # TT segments.
-        def [](key); end
+        # Stubbed out in case clients try to touch params directly.
+        def params; {}; end
+        def params=; end
       end
 
       attr_reader :current_segment, :sample

data/lib/new_relic/agent/transaction_sampler.rb

@@ -343,7 +343,7 @@ module NewRelic
       # Set parameters on the current segment.
       def add_segment_parameters( params )
         return unless builder
-        builder.current_segment.params.merge!( params )
+        params.each { |k,v| builder.current_segment[k] = v }
       end
 
       # Every 1/n harvests, adds the most recent sample to the harvest

data/lib/new_relic/commands/deployments.rb

@@ -35,6 +35,7 @@ class NewRelic::Command::Deployments < NewRelic::Command
     control.env = @environment if @environment
     load_yaml_from_env(control.env)
     @appname ||= NewRelic::Agent.config.app_names[0] || control.env || 'development'
+    setup_logging(control.env)
   end
 
   def load_yaml_from_env(env)
@@ -42,6 +43,11 @@ class NewRelic::Command::Deployments < NewRelic::Command
     NewRelic::Agent.config.replace_or_add_config(yaml, 1)
   end
 
+  def setup_logging(env)
+    NewRelic::Agent.logger = NewRelic::Agent::AgentLogger.new(NewRelic::Agent.config)
+    NewRelic::Agent.logger.info("Running Capistrano from '#{env}' environment for application '#{@appname}'")
+  end
+
   # Run the Deployment upload in New Relic via Active Resource.
   # Will possibly print errors and exit the VM
   def run

data/lib/new_relic/commands/install.rb

@@ -56,10 +56,10 @@ at www.newrelic.com, and replace the newrelic.yml file with the one
 you receive upon registration.
     EOF
     puts <<-EOF unless quiet
-    
+
 E-mail support@newrelic.com with any problems or questions.
     EOF
-    
+
   end
 
   def content

data/lib/new_relic/control/frameworks/rails.rb

@@ -49,8 +49,7 @@ module NewRelic
           if rails_config && ::Rails.configuration.respond_to?(:after_initialize)
             rails_config.after_initialize do
               # This will insure we load all the instrumentation as late as possible.  If the agent
-              # is not enabled, it will load a limited amount of instrumentation.  See
-              # delayed_job_injection.rb
+              # is not enabled, it will load a limited amount of instrumentation.
               DependencyDetection.detect!
             end
           end

data/lib/new_relic/control/instrumentation.rb

@@ -45,13 +45,13 @@ module NewRelic
           @instrumentation_files << pattern
         end
       end
-      
+
       # Signals the agent that it's time to actually load the
       # instrumentation files. May be overridden by subclasses
       def install_instrumentation
         _install_instrumentation
       end
-      
+
       # adds samplers to the stats engine so that they run every
       # minute. This is dynamically recognized by any class that
       # subclasses NewRelic::Agent::Sampler

data/lib/new_relic/control/server_methods.rb

@@ -52,7 +52,7 @@ module NewRelic
       def convert_to_ip_address(host)
         # here we leave it as a host name since the cert verification
         # needs it in host form
-        return host if Agent.config[:ssl] && Agent.config[:verify_certificate]
+        return host if Agent.config[:ssl]
         # We won't talk directly to the host, so no need to resolve if proxy configured
         return host if Agent.config[:proxy_host]
         return nil if host.nil? || host.downcase == "localhost"
@@ -83,4 +83,3 @@ module NewRelic
     include ServerMethods
   end
 end
-