newrelic_rpm 3.8.1.221 → 3.9.0.229

data/lib/new_relic/agent/vm/monotonic_gc_profiler.rb

@@ -19,25 +19,22 @@ module NewRelic
           @lock         = Mutex.new
         end
 
-        class ProfilerNotEnabledError < StandardError
-          def initialize
-            super("total_time is not available if GC::Profiler isn't enabled")
-          end
-        end
-
         def total_time_s
-          raise ProfilerNotEnabledError.new unless NewRelic::LanguageSupport.gc_profiler_enabled?
-
-          # There's a race here if the next two lines don't execute as an atomic
-          # unit - we may end up double-counting some GC time in that scenario.
-          # Locking around them guarantees atomicity of the read/increment/reset
-          # sequence.
-          @lock.synchronize do
-            # The Ruby 1.9.x docs claim that GC::Profiler.total_time returns
-            # a value in milliseconds. They are incorrect - both 1.9.x and 2.x
-            # return values in seconds.
-            @total_time_s += ::GC::Profiler.total_time
-            ::GC::Profiler.clear
+          if NewRelic::LanguageSupport.gc_profiler_enabled?
+            # There's a race here if the next two lines don't execute as an atomic
+            # unit - we may end up double-counting some GC time in that scenario.
+            # Locking around them guarantees atomicity of the read/increment/reset
+            # sequence.
+            @lock.synchronize do
+              # The Ruby 1.9.x docs claim that GC::Profiler.total_time returns
+              # a value in milliseconds. They are incorrect - both 1.9.x and 2.x
+              # return values in seconds.
+              @total_time_s += ::GC::Profiler.total_time
+              ::GC::Profiler.clear
+            end
+          else
+            NewRelic::Agent.logger.log_once(:warn, :gc_profiler_disabled,
+              "Tried to measure GC time, but GC::Profiler was not enabled.")
           end
 
           @total_time_s

data/lib/new_relic/agent/vm/rubinius_vm.rb

@@ -18,8 +18,10 @@ module NewRelic
           snap.gc_runs = GC.count
 
           gc_stats = GC.stat[:gc]
-          snap.major_gc_count = gc_stats[:full][:count] if gc_stats[:full]
-          snap.minor_gc_count = gc_stats[:young][:count] if gc_stats[:young]
+          if gc_stats
+            snap.major_gc_count = gc_stats[:full][:count] if gc_stats[:full]
+            snap.minor_gc_count = gc_stats[:young][:count] if gc_stats[:young]
+          end
 
           snap.thread_count = Thread.list.size
         end

data/lib/new_relic/cli/commands/deployments.rb

@@ -8,6 +8,7 @@
 require 'yaml'
 require 'net/http'
 require 'rexml/document'
+require 'new_relic/agent/hostname'
 
 # We need to use the Control object but we don't want to load
 # the rails/merb environment.  The defined? clause is so that
@@ -43,7 +44,7 @@ class NewRelic::Cli::Deployments < NewRelic::Cli::Command
 
   def load_yaml_from_env(env)
     yaml = NewRelic::Agent::Configuration::YamlSource.new(NewRelic::Agent.config[:config_path], env)
-    NewRelic::Agent.config.replace_or_add_config(yaml, 1)
+    NewRelic::Agent.config.replace_or_add_config(yaml)
   end
 
   def setup_logging(env)
@@ -59,7 +60,7 @@ class NewRelic::Cli::Deployments < NewRelic::Cli::Command
       create_params = {}
       {
             :application_id => @appname,
-            :host => Socket.gethostname,
+            :host => NewRelic::Agent::Hostname.get,
             :description => @description,
             :user => @user,
             :revision => @revision,

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

@@ -7,9 +7,9 @@ module NewRelic
     module Frameworks
       # A control used when no framework is detected - the default.
       class Ruby < NewRelic::Control
-
         def env
-          @env ||= ENV['RUBY_ENV'] || ENV['RAILS_ENV'] || ENV['RACK_ENV'] || 'development'
+          @env ||= ENV['NEW_RELIC_ENV'] || ENV['RUBY_ENV'] ||
+                   ENV['RAILS_ENV']     || ENV['RACK_ENV'] || 'development'
         end
 
         def root
@@ -18,7 +18,6 @@ module NewRelic
 
         def init_config(options={})
         end
-
       end
     end
   end

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

@@ -2,22 +2,15 @@
 # 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/control/frameworks/ruby'
 module NewRelic
   class Control
     module Frameworks
       # Contains basic control logic for Sinatra
       class Sinatra < NewRelic::Control::Frameworks::Ruby
-
-        def env
-          @env ||= ENV['RACK_ENV'] || ENV['RAILS_ENV'] || 'development'
-        end
-
         def init_config(options={})
           super
         end
-
       end
     end
   end

data/lib/new_relic/control/instance_methods.rb

@@ -70,6 +70,7 @@ module NewRelic
         Module.send :include, NewRelic::Agent::MethodTracer
         init_config(options)
         NewRelic::Agent.agent = NewRelic::Agent::Agent.instance
+        NewRelic::Agent.agent.start_service_if_needed
         if Agent.config[:agent_enabled] && !NewRelic::Agent.instance.started?
           start_agent
           install_instrumentation
@@ -80,13 +81,10 @@ module NewRelic
 
       def configure_agent(env, options)
         manual = Agent::Configuration::ManualSource.new(options)
-        Agent.config.replace_or_add_config(manual, 1)
+        Agent.config.replace_or_add_config(manual)
 
         config_file_path = @config_file_override || Agent.config[:config_path]
-        Agent.config.replace_or_add_config(Agent::Configuration::YamlSource.new(config_file_path, env), 1)
-
-        Agent.config.remove_config(manual)
-        Agent.config.replace_or_add_config(Agent::Configuration::ManualSource.new(options), 1)
+        Agent.config.replace_or_add_config(Agent::Configuration::YamlSource.new(config_file_path, env))
       end
 
       # Install the real agent into the Agent module, and issue the start command.

data/lib/new_relic/json_wrapper.rb

@@ -59,6 +59,8 @@ module NewRelic
       case object
       when String
         normalize_string(object)
+      when Symbol
+        normalize_string(object.to_s)
       when Array
         return object if object.empty?
         result = object.map { |x| normalize(x) }

data/lib/new_relic/language_support.rb

@@ -73,7 +73,7 @@ module NewRelic::LanguageSupport
   end
 
   def gc_profiler_enabled?
-    if gc_profiler_usable? && ::GC::Profiler.enabled?
+    if gc_profiler_usable? && ::GC::Profiler.enabled? && !::NewRelic::Agent.config[:disable_gc_profiler]
       true
     else
       false

data/lib/new_relic/local_environment.rb

@@ -55,22 +55,6 @@ module NewRelic
       return nil
     end
 
-    # Sets the @mongrel instance variable if we can find a Mongrel::HttpServer
-    def mongrel
-      return @mongrel if @looked_for_mongrel
-      @looked_for_mongrel = true
-      if defined?(::Mongrel) && defined?(::Mongrel::HttpServer)
-        @mongrel = find_class_in_object_space(::Mongrel::HttpServer)
-      end
-      @mongrel
-    end
-
-    # Setter for testing
-    def mongrel=(m)
-      @looked_for_mongrel = true
-      @mongrel = m
-    end
-
     private
 
     def discover_dispatcher

data/lib/new_relic/metric_spec.rb

@@ -2,65 +2,37 @@
 # 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/internal_agent_error'
-
 # this struct uniquely defines a metric, optionally inside
 # the call scope of another metric
 class NewRelic::MetricSpec
-  attr_accessor   :name
-  attr_accessor   :scope
+  attr_reader   :name, :scope
 
   # the maximum length of a metric name or metric scope
   MAX_LENGTH = 255
   LENGTH_RANGE = (0...MAX_LENGTH)
-  # Need a "zero-arg" constructor so it can be instantiated from java (using
-  # jruby) for sending responses to ruby agents from the java collector.
-  #
-  def initialize(metric_name = '', metric_scope = nil)
-    self.name = (metric_name || '') && metric_name.to_s[LENGTH_RANGE]
-    if metric_scope
-      self.scope = metric_scope && metric_scope.to_s[LENGTH_RANGE]
-    else
-      self.scope = ''
-    end
-  end
-
-  class InvalidScopeSettingError < NewRelic::Agent::InternalAgentError
-    def initialize(name, scope)
-      super("Attempted to set scope for #{name} to #{scope.inspect}, ignoring.")
-    end
-  end
+  EMPTY_SCOPE = ''.freeze
 
-  def scope=(s)
-    if s.nil? || s == false
-      NewRelic::Agent.instance.error_collector.notice_agent_error(InvalidScopeSettingError.new(@name, s))
+  def initialize(metric_name='', metric_scope=nil)
+    @name = metric_name.to_s[LENGTH_RANGE]
+    if metric_scope
+      @scope = metric_scope.to_s[LENGTH_RANGE]
     else
-      @scope = s
+      @scope = EMPTY_SCOPE
     end
   end
 
-  # truncates the name and scope to the MAX_LENGTH
-  def truncate!
-    self.name = name[LENGTH_RANGE] if name && name.size > MAX_LENGTH
-    self.scope = scope[LENGTH_RANGE] if scope && scope.size > MAX_LENGTH
-  end
-
   def ==(o)
     self.eql?(o)
   end
 
   def eql? o
-    self.class == o.class &&
-    name.eql?(o.name) &&
-    # coerce scope to a string and compare
-     scope.to_s == o.scope.to_s
+    @name == o.name && @scope == o.scope
   end
 
   def hash
-    h = name.hash
-    h ^= scope.hash unless scope.nil?
-    h
+    @name.hash ^ @scope.hash
   end
+
   # return a new metric spec if the given regex
   # matches the name or scope.
   def sub(pattern, replacement, apply_to_scope = true)

data/lib/new_relic/noticed_error.rb

@@ -7,9 +7,8 @@ require 'new_relic/helper'
 # 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, :message,
-                :exception_class_name, :exception_class_constant
-  attr_reader :exception_id
+  attr_accessor :path, :timestamp, :params, :message, :exception_class_name
+  attr_reader   :exception_id, :is_internal
 
   STRIPPED_EXCEPTION_REPLACEMENT_MESSAGE = "Message removed by New Relic 'strip_exception_messages' setting"
 
@@ -19,7 +18,12 @@ class NewRelic::NoticedError
     @params = NewRelic::NoticedError.normalize_params(data)
 
     @exception_class_name = exception.is_a?(Exception) ? exception.class.name : 'Error'
-    @exception_class_constant = exception.class
+
+    # It's critical that we not hold onto the exception class constant in this
+    # class. These objects get serialized for Resque to a process that might
+    # not have the original exception class loaded, so do all processing now
+    # while we have the actual exception!
+    @is_internal = (exception.class < NewRelic::Agent::InternalAgentError)
 
     if exception.nil?
       @message = '<no message>'
@@ -43,7 +47,8 @@ class NewRelic::NoticedError
     @message = @message[0..4095] if @message.length > 4096
 
     # replace error message if enabled
-    if NewRelic::Agent.config[:'strip_exception_messages.enabled'] && !whitelisted?
+    if NewRelic::Agent.config[:'strip_exception_messages.enabled'] &&
+       !self.class.passes_message_whitelist(exception.class)
       @message = STRIPPED_EXCEPTION_REPLACEMENT_MESSAGE
     end
 
@@ -57,12 +62,6 @@ class NewRelic::NoticedError
     exception_class_name
   end
 
-  def whitelisted?
-    NewRelic::Agent.config.stripped_exceptions_whitelist.find do |klass|
-      exception_class_constant <= klass
-    end
-  end
-
   def ==(other)
     if other.respond_to?(:exception_id)
       exception_id == other.exception_id
@@ -71,6 +70,12 @@ class NewRelic::NoticedError
     end
   end
 
+  def self.passes_message_whitelist(exception_class)
+    NewRelic::Agent.config.stripped_exceptions_whitelist.any? do |klass|
+      exception_class <= klass
+    end
+  end
+
   include NewRelic::Coerce
 
   def to_collector_array(encoder=nil)

data/lib/new_relic/rack/agent_hooks.rb

@@ -3,7 +3,8 @@
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
 require 'new_relic/agent/event_listener'
-require 'new_relic/rack/transaction_reset'
+require 'new_relic/rack/agent_middleware'
+require 'new_relic/agent/instrumentation/middleware_proxy'
 
 module NewRelic::Rack
   # This middleware is used by the agent internally, and is usually injected
@@ -12,13 +13,7 @@ module NewRelic::Rack
   #
   # @api public
   #
-  class AgentHooks
-    def initialize(app, options = {})
-      @app = app
-    end
-
-    include TransactionReset
-
+  class AgentHooks < AgentMiddleware
     FIRED_FORMATS = {
       :before_call => "newrelic.agent_hooks_before_fired",
       :after_call  => "newrelic.agent_hooks_after_fired"
@@ -26,8 +21,7 @@ module NewRelic::Rack
 
     # method required by Rack interface
     # [status, headers, response]
-    def call(env)
-      ensure_transaction_reset(env)
+    def traced_call(env)
       notify(:before_call, env)
       result = @app.call(env)
       notify(:after_call, env, result)

data/lib/new_relic/rack/agent_middleware.rb

@@ -0,0 +1,31 @@
+# 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/transaction_state'
+require 'new_relic/agent/instrumentation/controller_instrumentation'
+require 'new_relic/agent/instrumentation/middleware_tracing'
+
+module NewRelic
+  module Rack
+    class AgentMiddleware
+      include Agent::Instrumentation::MiddlewareTracing
+
+      attr_reader :transaction_options, :category, :target
+
+      def initialize(app, options={})
+        @app = app
+        @category = :middleware
+        @target   = self
+        @transaction_options = {
+          :transaction_name => build_transaction_name
+        }
+      end
+
+      def build_transaction_name
+        prefix = ::NewRelic::Agent::Instrumentation::ControllerInstrumentation::TransactionNamer.prefix_for_category(nil, @category)
+        "#{prefix}#{self.class.name}/call"
+      end
+    end
+  end
+end

data/lib/new_relic/rack/browser_monitoring.rb

@@ -3,7 +3,8 @@
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
 require 'rack'
-require 'new_relic/rack/transaction_reset'
+require 'new_relic/rack/agent_middleware'
+require 'new_relic/agent/instrumentation/middleware_proxy'
 
 module NewRelic::Rack
   # This middleware is used by the agent for the Real user monitoring (RUM)
@@ -13,17 +14,8 @@ module NewRelic::Rack
   #
   # @api public
   #
-  class BrowserMonitoring
-
-    def initialize(app, options = {})
-      @app = app
-    end
-
-    include TransactionReset
-
-    # method required by Rack interface
-    def call(env)
-      ensure_transaction_reset(env)
+  class BrowserMonitoring < AgentMiddleware
+    def traced_call(env)
       result = @app.call(env)   # [status, headers, response]
 
       if (NewRelic::Agent.browser_timing_header != "") && should_instrument?(env, result[0], result[1])
@@ -89,6 +81,9 @@ module NewRelic::Rack
       end
 
       source
+    rescue => e
+      NewRelic::Agent.logger.debug "Skipping RUM instrumentation on exception.", e
+      nil
     end
 
     def gather_source(response)
@@ -134,5 +129,4 @@ module NewRelic::Rack
       end
     end
   end
-
 end

data/lib/new_relic/rack/developer_mode.rb

@@ -8,7 +8,8 @@ require 'rack/response'
 require 'rack/file'
 require 'new_relic/collection_helper'
 require 'new_relic/metric_parser/metric_parser'
-require 'new_relic/rack/transaction_reset'
+require 'new_relic/rack/agent_middleware'
+require 'new_relic/agent/instrumentation/middleware_proxy'
 
 module NewRelic
   module Rack
@@ -26,22 +27,24 @@ module NewRelic
     #
     # @api public
     #
-    class DeveloperMode
+    class DeveloperMode < AgentMiddleware
 
-      VIEW_PATH = File.expand_path('../../../../ui/views/', __FILE__)
+      VIEW_PATH   = File.expand_path('../../../../ui/views/'  , __FILE__)
       HELPER_PATH = File.expand_path('../../../../ui/helpers/', __FILE__)
       require File.join(HELPER_PATH, 'developer_mode_helper.rb')
 
 
       include NewRelic::DeveloperModeHelper
-      include TransactionReset
 
-      def initialize(app)
-        @app = app
+      class << self
+        attr_writer :profiling_enabled
       end
 
-      def call(env)
-        ensure_transaction_reset(env)
+      def self.profiling_enabled?
+        @profiling_enabled
+      end
+
+      def traced_call(env)
         return @app.call(env) unless /^\/newrelic/ =~ ::Rack::Request.new(env).path_info
         dup._call(env)
       end
@@ -70,8 +73,6 @@ module NewRelic
           show_sample_data
         when /explain_sql/
           explain_sql
-        when /show_source/
-          show_source
         when /^\/newrelic\/?$/
           index
         else
@@ -121,14 +122,9 @@ module NewRelic
         render(:explain_sql)
       end
 
-      PROFILE_CONFIG = { :'profiling.enabled' => true }
-
       def profile
-        if params['start'] == 'true'
-          NewRelic::Agent.config.apply_config(PROFILE_CONFIG) unless NewRelic::Agent.config[:'profiling.enabled']
-        else
-          NewRelic::Agent.config.remove_config(PROFILE_CONFIG) if NewRelic::Agent.config[:'profiling.enabled']
-        end
+        should_be_on = (params['start'] == 'true')
+        NewRelic::Rack::DeveloperMode.profiling_enabled = should_be_on
 
         index
       end
@@ -201,44 +197,6 @@ module NewRelic
         @segment
       end
 
-
-      # show the selected source file with the highlighted selected line
-      def show_source
-        @filename = params['file']
-        line_number = params['line'].to_i
-
-        if !File.readable?(@filename)
-          @source="<p>Unable to read #{@filename}.</p>"
-          return
-        end
-        begin
-          file = File.new(@filename, 'r')
-        rescue => e
-          @source="<p>Unable to access the source file #{@filename} (#{e.message}).</p>"
-          return
-        end
-        @source = ""
-
-        @source << "<pre>"
-        file.each_line do |line|
-          # place an anchor 6 lines above the selected line (if the line # < 6)
-          if file.lineno == line_number - 6
-            @source << "</pre><pre id = 'selected_line'>"
-            @source << line.rstrip
-            @source << "</pre><pre>"
-
-            # highlight the selected line
-          elsif file.lineno == line_number
-            @source << "</pre><pre class = 'selected_source_line'>"
-            @source << line.rstrip
-            @source << "</pre><pre>"
-          else
-            @source << line
-          end
-        end
-        render(:show_source)
-      end
-
       def show_sample_data
         get_sample
 
@@ -247,7 +205,7 @@ module NewRelic
         @request_params = @sample.params['request_params'] || {}
         @custom_params = @sample.params['custom_params'] || {}
 
-        controller_metric = @sample.root_segment.called_segments.first.metric_name
+        controller_metric = @sample.transaction_name
 
         metric_parser = NewRelic::MetricParser::MetricParser.for_metric_named controller_metric
         @sample_controller_name = metric_parser.controller_name
@@ -269,8 +227,7 @@ module NewRelic
           sample.params[:path] != nil
         end
 
-        return @samples = @samples.sort{|x,y| y.omit_segments_with('(Rails/Application Code Loading)|(Database/.*/.+ Columns)').duration <=>
-          x.omit_segments_with('(Rails/Application Code Loading)|(Database/.*/.+ Columns)').duration} if params['h']
+        return @samples = @samples.sort_by(&:duration).reverse                   if params['h']
         return @samples = @samples.sort{|x,y| x.params[:uri] <=> y.params[:uri]} if params['u']
         @samples = @samples.reverse
       end
@@ -281,7 +238,7 @@ module NewRelic
         sample_id = id.to_i
         @samples.each do |s|
           if s.sample_id == sample_id
-            @sample = stripped_sample(s)
+            @sample = s
             return
           end
         end