newrelic_rpm 3.6.0.83 → 3.6.1.85.beta

data/lib/new_relic/agent/transaction_sampler.rb

@@ -15,6 +15,7 @@ module NewRelic
 
       # Module defining methods stubbed out when the agent is disabled
       module Shim #:nodoc:
+        def notice_transaction(*args); end
         def notice_first_scope_push(*args); end
         def notice_push_scope(*args); end
         def notice_pop_scope(*args); end
@@ -94,12 +95,14 @@ module NewRelic
       #
       # Note that in developer mode, this captures a stacktrace for
       # the beginning of each segment, which can be fairly slow
-      def notice_push_scope(scope, time=Time.now)
+      def notice_push_scope(time=Time.now)
         return unless builder
 
-        builder.trace_entry(scope, time.to_f)
+        segment = builder.trace_entry(time.to_f)
 
         capture_segment_trace if Agent.config[:developer_mode]
+
+        return segment
       end
 
       # in developer mode, capture the stack trace with the segment.
@@ -120,12 +123,6 @@ module NewRelic
         end
       end
 
-      # Rename the latest scope's segment in the builder to +new_name+.
-      def rename_scope_segment( new_name )
-        return unless builder
-        builder.rename_current_segment( new_name )
-      end
-
       # Defaults to zero, otherwise delegated to the transaction
       # sample builder
       def scope_depth
@@ -149,18 +146,19 @@ module NewRelic
       #
       # It sets various instance variables to the finished sample,
       # depending on which settings are active. See `store_sample`
-      def notice_scope_empty(time=Time.now)
+      def notice_scope_empty(txn, time=Time.now, gc_time=nil)
         last_builder = builder
+        last_builder.set_transaction_name(txn.name) if enabled? && last_builder
+
         return unless last_builder
 
-        last_builder.finish_trace(time.to_f)
+        last_builder.finish_trace(time.to_f, txn.custom_parameters)
         clear_builder
         return if last_builder.ignored?
 
         @samples_lock.synchronize do
-          # NB this instance variable may be used elsewhere, it's not
-          # just a side effect
           @last_sample = last_builder.sample
+          @last_sample.set_custom_param(:gc_time, gc_time) if gc_time
           store_sample(@last_sample)
         end
       end
@@ -234,10 +232,10 @@ module NewRelic
         end
       end
 
-      # Delegates to the builder to store the path, uri, and
+      # Delegates to the builder to store the uri, and
       # parameters if the sampler is active
-      def notice_transaction(path, uri=nil, params={})
-        builder.set_transaction_info(path, uri, params) if enabled? && builder
+      def notice_transaction(uri=nil, params={})
+        builder.set_transaction_info(uri, params) if enabled? && builder
       end
 
       # Tells the builder to ignore a transaction, if we are currently

data/lib/new_relic/agent/uri_util.rb

@@ -0,0 +1,35 @@
+# -*- ruby -*-
+# 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 module includes utilities for manipulating URIs, particularly from the
+# context of Net::HTTP requests. We don't always have direct access to the full
+# URI from our instrumentation points in Net::HTTP, and we want to filter out
+# some URI parts before saving URIs from instrumented calls - logic for that
+# lives here.
+
+module NewRelic
+  module Agent
+    module URIUtil
+      def self.uri_from_connection_and_request(http, request)
+        parsed = case request.path
+        when /^https?:\/\//
+          URI(request.path)
+        else
+          scheme = http.use_ssl? ? 'https' : 'http'
+          URI("#{scheme}://#{http.address}:#{http.port}#{request.path}")
+        end
+      end
+
+      def self.filtered_uri_for(http, request)
+        parsed = uri_from_connection_and_request(http, request)
+        parsed.user = nil
+        parsed.password = nil
+        parsed.query = nil
+        parsed.fragment = nil
+        parsed.to_s
+      end
+    end
+  end
+end

data/lib/new_relic/agent.rb

@@ -64,7 +64,7 @@ module NewRelic
   module Agent
     extend self
     extend Forwardable
-    
+
     require 'new_relic/version'
     require 'new_relic/local_environment'
     require 'new_relic/metrics'
@@ -98,6 +98,8 @@ module NewRelic
     require 'new_relic/agent/transaction_info'
     require 'new_relic/agent/configuration'
     require 'new_relic/agent/rules_engine'
+    require 'new_relic/agent/uri_util'
+    require 'new_relic/agent/system_info'
 
     require 'new_relic/agent/instrumentation/controller_instrumentation'
 
@@ -341,7 +343,7 @@ module NewRelic
     # any.  Only affects the transaction started on this thread once
     # it has started and before it has completed.
     def abort_transaction!
-      NewRelic::Agent::Instrumentation::MetricFrame.abort_transaction!
+      Transaction.abort_transaction!
     end
 
     # Yield to the block without collecting any metrics or traces in
@@ -361,13 +363,13 @@ module NewRelic
       untraced = Thread.current[:newrelic_untraced]
       untraced.nil? || 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?
@@ -402,16 +404,16 @@ module NewRelic
     # Anything left over is treated as custom params.
     #
     def notice_error(exception, options={})
-      NewRelic::Agent::Instrumentation::MetricFrame.notice_error(exception, options)
+      Transaction.notice_error(exception, options)
     end
 
     # Add parameters to the current transaction trace (and traced error if any)
     # on the call stack.
     #
     def add_custom_parameters(params)
-      NewRelic::Agent::Instrumentation::MetricFrame.add_custom_parameters(params)
+      Transaction.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.
@@ -422,7 +424,48 @@ module NewRelic
     # * <tt>:product</tt> => product name or level
     #
     def set_user_attributes(attributes)
-      NewRelic::Agent::Instrumentation::MetricFrame.set_user_attributes(attributes)
+      Transaction.set_user_attributes(attributes)
+    end
+
+    # Set the name of the current running transaction.  The agent will
+    # apply a reasonable default based on framework routing, but in
+    # cases where this is insufficient, this can be used to manually
+    # control the name of the transaction.
+    # The category of transaction can be specified via the +:category+ option:
+    #
+    # * <tt>:category => :controller</tt> indicates that this is a
+    #   controller action and will appear with all the other actions.
+    # * <tt>:category => :task</tt> indicates that this is a
+    #   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
+    #   have more than one potential transaction in the #call.
+    # * <tt>:category => :uri</tt> indicates that this is a
+    #   web transaction whose name is a normalized URI, where  'normalized'
+    #   means the URI does not have any elements with data in them such
+    #   as in many REST URIs.
+    #
+    # The default category is the same as the running transaction.
+    #
+    # @api public
+    def set_transaction_name(name, options={})
+      if Transaction.current
+        namer = Instrumentation::ControllerInstrumentation::TransactionNamer.new(self)
+        Transaction.current.type = options[:category] if options[:category]
+        Transaction.current.name = "#{namer.category_name(options[:category])}/#{name}"
+      end
+    end
+
+    # Get the name of the current running transaction.  This is useful if you
+    # want to modify the default name.
+    #
+    # @api public
+    def get_transaction_name
+      if Transaction.current
+        namer = Instrumentation::ControllerInstrumentation::TransactionNamer.new(self)
+        Transaction.current.name.sub(Regexp.new("\\A#{Regexp.escape(namer.category_name)}/"), '')
+      end
     end
 
     # The #add_request_parameters method is aliased to #add_custom_parameters
@@ -438,8 +481,8 @@ module NewRelic
     # * <tt>method</tt> is the name of the finder method or other
     #   method to identify the operation with.
     def with_database_metric_name(model, method, &block)
-      if frame = NewRelic::Agent::Instrumentation::MetricFrame.current
-        frame.with_database_metric_name(model, method, &block)
+      if txn = Transaction.current
+        txn.with_database_metric_name(model, method, &block)
       else
         yield
       end
@@ -486,7 +529,7 @@ module NewRelic
     def browser_timing_footer
       agent.browser_timing_footer
     end
-    
+
     def_delegator :'NewRelic::Agent::PipeChannelManager', :register_report_channel
   end
 end

data/lib/new_relic/build.rb

@@ -1,2 +1,2 @@
-# GITSHA: 9e91cdd0ed32baa14e6ea1b82f80ce89bf1991b3
-module NewRelic; module VERSION; BUILD='83'; end; end
+# GITSHA: bbab5a90983473b31328da7b2339ea57a0a548f6
+module NewRelic; module VERSION; BUILD='85.beta'; end; end

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

@@ -59,7 +59,6 @@ module NewRelic
             # is running, if it thinks it's a rake task, or if the agent_enabled is false.
             ::NewRelic::Agent.logger.info("New Relic Agent not running.")
           else
-            ::NewRelic::Agent.logger.info("Starting the New Relic Agent.")
             install_developer_mode(rails_config) if Agent.config[:developer_mode]
             install_browser_monitoring(rails_config)
             install_agent_hooks(rails_config)

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

@@ -34,6 +34,8 @@ module NewRelic
 
         def add_error_collector_middleware
           rails_config.middleware.use NewRelic::Rack::ErrorCollector
+        rescue => e
+          NewRelic::Agent.logger.debug("Error encountered installing ErrorCollector: #{e}")
         end
 
         def vendor_root

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

@@ -14,10 +14,6 @@ module NewRelic
           end
         end
 
-        def add_error_collector_middleware
-          # rails_config.middleware.use NewRelic::Rack::ErrorCollector
-        end
-
         def append_plugin_list
           # Rails 4 does not allow plugins
         end

data/lib/new_relic/control/instance_methods.rb

@@ -49,7 +49,11 @@ module NewRelic
       # init_config({}) which is called one or more times.
       #
       def init_plugin(options={})
-        yaml = Agent::Configuration::YamlSource.new(@config_file_path, options[:env] || env)
+        env = options[:env] || self.env
+        Agent.logger.info("Starting the New Relic agent in #{env.inspect} environment.")
+        Agent.logger.info("To prevent agent startup add a NEWRELIC_ENABLE=false environment variable or modify the #{env.inspect} section of your newrelic.yml.")
+
+        yaml = Agent::Configuration::YamlSource.new(@config_file_path, env)
         Agent.config.replace_or_add_config(yaml, 1)
 
         Agent.config.replace_or_add_config(Agent::Configuration::ManualSource.new(options), 1)
@@ -114,24 +118,6 @@ module NewRelic
 
       protected
 
-      # Append framework specific environment information for uploading to
-      # the server for change detection.  Override in subclasses
-      def append_environment_info; end
-
-      # Asks bundler to tell us which gemspecs are loaded in the
-      # current process
-      def bundler_gem_list
-        if defined?(Bundler) && Bundler.instance_eval do @load end
-          Bundler.load.specs.map do |spec|
-            version = (spec.respond_to?(:version) && spec.version)
-            spec.name + (version ? "(#{version})" : "")
-          end
-        else
-          []
-        end
-      end
-
-
       def initialize(local_env, config_file_override=nil)
         @local_env = local_env
         @instrumentation_files = []

data/lib/new_relic/control/server_methods.rb

@@ -53,6 +53,8 @@ module NewRelic
         # 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]
+        # 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"
         ip = resolve_ip_address(host)
 

data/lib/new_relic/environment_report.rb

@@ -64,40 +64,10 @@ module NewRelic
     report_on('Ruby patchlevel'){ RUBY_PATCHLEVEL.to_s }
     report_on('JRuby version') { JRUBY_VERSION }
     report_on('Java VM version') { ENV_JAVA['java.vm.version']}
-    report_on 'Processors' do
-      cpuinfo = ''
-      proc_file = '/proc/cpuinfo'
-      File.open(proc_file) do |f|
-        loop do
-          begin
-            cpuinfo << f.read_nonblock(4096).strip
-          rescue EOFError
-            break
-          rescue Errno::EWOULDBLOCK, Errno::EAGAIN
-            cpuinfo = ''
-            break # don't select file handle, just give up
-          end
-        end
-      end
-      processors = cpuinfo.split("\n").select {|line| line =~ /^processor\s*:/ }.size
-
-      if processors == 0
-        processors = nil # assume there is at least one processor
-        ::NewRelic::Agent.logger.warn("Cannot determine the number of processors in #{proc_file}")
-      end
-      processors
-    end
-    report_on 'Arch' do
-      arch = `uname -p`
-      arch = ENV['PROCESSOR_ARCHITECTURE'] if arch == ''
-      arch
-    end
-    report_on('OS version'){ `uname -v` }
-    report_on('OS') do
-      os = `uname -s`
-      os = ENV['OS'] if os == ''
-      os
-    end
+    report_on('Processors') { SystemInfo.processor_count }
+    report_on('Arch') { SystemInfo.processor_arch }
+    report_on('OS version') { SystemInfo.os_version }
+    report_on('OS') { SystemInfo.ruby_os_identifier }
     report_on 'Database adapter' do
       ActiveRecord::Base.configurations[NewRelic::Control.instance.env]['adapter']
     end

data/lib/new_relic/latest_changes.rb

@@ -25,7 +25,7 @@ EOS
           version_count += 1
         end
         break if version_count >= 2
-        changes << line.sub(/^  /, "").chomp
+        changes << line.sub(/^  \* /, "* ").chomp
       end
 
       changes << footer

data/lib/new_relic/local_environment.rb

@@ -25,9 +25,6 @@ module NewRelic
 
     # used to distinguish instances of a dispatcher from each other, may be nil
     attr_writer :dispatcher_instance_id
-    # The number of cpus, if detected, or nil - many platforms do not
-    # support this :(
-    attr_reader :processors
 
     def initialize
       # Extend self with any any submodules of LocalEnvironment.  These can override
@@ -38,9 +35,6 @@ module NewRelic
       end
 
       discover_dispatcher
-      @gems = Set.new
-      @plugins = Set.new
-      @config = Hash.new
     end
 
 

data/lib/new_relic/metric_spec.rb

@@ -15,9 +15,9 @@ class NewRelic::MetricSpec
   # jruby) for sending responses to ruby agents from the java collector.
   #
   def initialize(metric_name = '', metric_scope = nil)
-    self.name = (metric_name || '') && metric_name[LENGTH_RANGE]
+    self.name = (metric_name || '') && metric_name.to_s[LENGTH_RANGE]
     if metric_scope
-      self.scope = metric_scope && metric_scope[LENGTH_RANGE]
+      self.scope = metric_scope && metric_scope.to_s[LENGTH_RANGE]
     else
       self.scope = ''
     end

data/lib/new_relic/rack/error_collector.rb

@@ -23,10 +23,12 @@ module NewRelic::Rack
           {'error' => warning}
         end
 
-        NewRelic::Agent.instance.error_collector.notice_error(exception,
-                                                              :uri => request.path,
-                                                          :referer => request.referer,
-                                                   :request_params => params)
+        transaction_name = NewRelic::Agent::TransactionInfo.get.transaction.name
+        NewRelic::Agent::Transaction.notice_error(exception,
+                                                  :uri => request.path,
+                                                  :referer => request.referer,
+                                                  :metric => transaction_name,
+                                                  :request_params => params)
       end
       raise exception
     end

data/lib/new_relic/transaction_sample.rb

@@ -62,6 +62,11 @@ module NewRelic
       JSON.dump(self.to_array)
     end
 
+    def set_custom_param(name, value)
+      @params[:custom_params] ||= {}
+      @params[:custom_params][name] = value
+    end
+
     include NewRelic::Coerce
 
     def to_array
@@ -91,7 +96,8 @@ module NewRelic
       @root_segment.path_string
     end
 
-    def create_segment(relative_timestamp, metric_name, segment_id = nil)
+    # relative_timestamp is seconds since the start of the transaction
+    def create_segment(relative_timestamp, metric_name=nil, segment_id = nil)
       raise TypeError.new("Frozen Transaction Sample") if frozen?
       @params[:segment_count] += 1
       @segment_count += 1

data/lib/new_relic/version.rb

@@ -12,7 +12,7 @@ module NewRelic
 
     MAJOR = 3
     MINOR = 6
-    TINY  = 0
+    TINY  = 1
 
     begin
       require File.join(File.dirname(__FILE__), 'build')

data/lib/newrelic_rpm.rb

@@ -32,7 +32,7 @@ if defined?(Merb) && defined?(Merb::BootLoader)
     end
   end
 elsif defined? Rails
-  if Rails.respond_to?(:version) && Rails.version > '3'
+  if Rails::VERSION::MAJOR.to_i >= 3
     module NewRelic
       class Railtie < Rails::Railtie
 
@@ -42,7 +42,7 @@ elsif defined? Rails
       end
     end
   else
-    # After verison 2.0 of Rails we can access the configuration directly.
+    # After version 2.0 of Rails we can access the configuration directly.
     # We need it to add dev mode routes after initialization finished.
     config = nil
     config = Rails.configuration if Rails.respond_to?(:configuration)

data/newrelic.yml

@@ -1,7 +1,7 @@
 #
-# 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.
+# This file configures the New Relic Agent.  New Relic monitors
+# Ruby, Java, .NET, PHP, and Python applications with deep visibility and low overhead.
+# For more information, visit www.newrelic.com.
 #
 # Generated <%= Time.now.strftime('%B %d, %Y') %>, for version <%= NewRelic::VERSION::STRING %>
 #
@@ -17,11 +17,11 @@ common: &default_settings
   # New Relic service.
   license_key: '<%= license_key %>'
 
-  # Agent Enabled (Rails Only)
+  # Agent Enabled (Ruby/Rails Only)
   # Use this setting to force the agent to run or not run.
   # Default is 'auto' which means the agent will install and run only
   # if a valid dispatcher such as Mongrel is running.  This prevents
-  # it from running with Rake or the console. Set to false to
+  # it from running with Rake or the console.  Set to false to
   # completely turn the agent off regardless of the other settings.
   # Valid values are true, false and auto.
   #
@@ -47,7 +47,7 @@ common: &default_settings
   # When "true", the agent collects performance data about your
   # 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').
+  # environment below. (formerly called 'enabled')
   monitor_mode: true
 
   # Developer mode should be off in every environment but
@@ -85,7 +85,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 service.
+  # Proxy settings for connecting to the New Relic server.
   #
   # If a proxy is used, the host setting is required.  Other settings
   # are optional. Default port is 8080.
@@ -108,11 +108,11 @@ common: &default_settings
   # Rails: the RoR filter_parameter_logging excludes parameters
   # Java: create a config setting called "ignored_params" and set it to
   #     a comma separated list of HTTP parameter names.
-  #     ex: ignored_params: credit_card, ssn, password 
+  #     ex: ignored_params: credit_card, ssn, password
   capture_params: false
 
   # Transaction tracer captures deep information about slow
-  # transactions and sends this to the service once a
+  # transactions and sends this to the New Relic service once a
   # minute. Included in the transaction is the exact call sequence of
   # the transactions including any SQL statements issued.
   transaction_tracer:
@@ -125,9 +125,9 @@ common: &default_settings
     # 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
-    # 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.
+    # New Relic. 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
@@ -138,7 +138,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 the current stack trace. This is
+    # then capture and send to New Relic the current stack trace. This is
     # helpful for pinpointing where long SQL calls originate from.
     stack_trace_threshold: 0.500
 
@@ -147,12 +147,12 @@ common: &default_settings
     # set to false when using other adapters.
     # explain_enabled: true
 
-    # Threshold for query execution time below which query plans will not
+    # Threshold for query execution time below which query plans will
     # not be captured.  Relevant only when `explain_enabled` is true.
     # explain_threshold: 0.5
 
   # Error collector captures information about uncaught exceptions and
-  # sends them to the service for viewing.
+  # sends them to New Relic for viewing
   error_collector:
 
     # Error collector is enabled by default. Set this to false to turn
@@ -166,9 +166,9 @@ common: &default_settings
     capture_source: true
 
     # To stop specific errors from reporting to New Relic, set this property
-    # to comma separated values.  Default is to ignore routing errors
+    # to comma-separated values.  Default is to ignore routing errors,
     # which are how 404's get triggered.
-    ignore_errors: ActionController::RoutingError
+    ignore_errors: "ActionController::RoutingError,Sinatra::NotFound"
 
   # If you're interested in capturing memcache keys as though they
   # were SQL uncomment this flag. Note that this does increase
@@ -178,10 +178,10 @@ common: &default_settings
 
 # Application Environments
 # ------------------------------------------
-# Environment specific settings are in this section.
-# For Rails applications, RAILS_ENV is used to determine the environment
+# Environment-specific settings are in this section.
+# For Rails applications, RAILS_ENV is used to determine the environment.
 # For Java applications, pass -Dnewrelic.environment <environment> to set
-# the environment
+# the environment.
 
 # NOTE if your application has other named environments, you should
 # provide newrelic configuration settings for these environments here.

data/test/config/test_control.rb

@@ -6,8 +6,8 @@ require 'new_relic/control/frameworks/rails'
 require 'new_relic/control/frameworks/rails3'
 require 'new_relic/control/frameworks/rails4'
 
-if defined?(::Rails) && ::Rails.respond_to?(:version)
-  parent_class = case ::Rails.version.to_i
+if defined?(::Rails)
+  parent_class = case ::Rails::VERSION::MAJOR.to_i
   when 4
     NewRelic::Control::Frameworks::Rails4
   when 3

data/test/multiverse/suites/agent_only/audit_log_test.rb

@@ -91,7 +91,7 @@ class AuditLogTest < Test::Unit::TestCase
       agent.sql_sampler.notice_sql("select * from test",
                                     "Database/test/select",
                                     nil, 1.5)
-      agent.sql_sampler.notice_scope_empty
+      agent.sql_sampler.notice_scope_empty('txn')
       agent.send(:harvest_and_send_slowest_sql)
     end
     $collector.agent_data.each do |req|

data/test/multiverse/suites/agent_only/cross_application_tracing_test.rb

@@ -52,9 +52,7 @@ class CrossProcessTest < Test::Unit::TestCase
   def test_cross_app_writes_out_information
     get '/', nil, {'X-NewRelic-ID' => Base64.encode64('1#234')}
     assert_not_nil last_response.headers["X-NewRelic-App-Data"]
-
     metric = NewRelic::Agent.instance.stats_engine.lookup_stats('ClientApplication/1#234/all')
     assert_equal 1, metric.call_count
   end
 end
-

data/test/multiverse/suites/agent_only/logging_test.rb

@@ -36,7 +36,7 @@ class LoggingTest < Test::Unit::TestCase
   def test_logs_missing_dispatcher
     running_agent_writes_to_log(
       {:dispatcher => ''},
-      "No dispatcher detected")
+      "No known dispatcher detected")
   end
 
   def test_logs_raw_sql_warning