newrelic_rpm 3.17.1.326 → 3.17.2.327

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

@@ -15,7 +15,11 @@ module NewRelic
         end
       end
 
-      class Boolean; end
+      class Boolean
+        def self.===(o)
+          TrueClass === o or FalseClass === o
+        end
+      end
 
       class DefaultSource
         attr_reader :defaults
@@ -329,7 +333,7 @@ module NewRelic
           :default => 8080,
           :allow_nil => true,
           :public => true,
-          :type => Fixnum,
+          :type => Integer,
           :allowed_from_server => false,
           :description => 'Defines a port for communicating with the New Relic <a href="https://docs.newrelic.com/docs/apm/new-relic-apm/getting-started/glossary#collector">collector</a> via a proxy server.'
         },
@@ -432,7 +436,7 @@ module NewRelic
         :'rake.connect_timeout' => {
           :default => 10,
           :public => true,
-          :type => Fixnum,
+          :type => Integer,
           :allowed_from_server => false,
           :description => 'Timeout for waiting on connect to complete before a rake task'
         },
@@ -483,14 +487,14 @@ module NewRelic
         :port => {
           :default => DefaultSource.port,
           :public => false,
-          :type => Fixnum,
+          :type => Integer,
           :allowed_from_server => false,
           :description => 'Port for the New Relic data collection service.'
         },
         :api_port => {
           :default => value_of(:port),
           :public => false,
-          :type => Fixnum,
+          :type => Integer,
           :allowed_from_server => false,
           :description => 'Port for the New Relic API host.'
         },
@@ -511,7 +515,7 @@ module NewRelic
         :post_size_limit => {
           :default => 2 * 1024 * 1024, # 2MB
           :public => false,
-          :type => Fixnum,
+          :type => Integer,
           :allowed_from_server => true,
           :description => 'Maximum number of bytes to send to the New Relic data collection service.'
         },
@@ -539,7 +543,7 @@ module NewRelic
         :timeout => {
           :default => 2 * 60, # 2 minutes
           :public => true,
-          :type => Fixnum,
+          :type => Integer,
           :allowed_from_server => false,
           :description => 'Defines the maximum number of seconds the agent should spend attempting to connect to the collector.'
         },
@@ -553,14 +557,14 @@ module NewRelic
         :data_report_period => {
           :default => 60,
           :public => false,
-          :type => Fixnum,
+          :type => Integer,
           :allowed_from_server => true,
           :description => 'Number of seconds betwixt connections to the New Relic data collection service. Note that transaction events have a separate report period, specified by data_report_periods.analytic_event_data.'
         },
         :'data_report_periods.analytic_event_data' => {
           :default => 60,
           :public => false,
-          :type => Fixnum,
+          :type => Integer,
           :dynamic_name => true,
           :allowed_from_server => true,
           :description => 'Number of seconds between connections to the New Relic data collection service for sending transaction event data.'
@@ -857,7 +861,7 @@ module NewRelic
         :'transaction_tracer.limit_segments' => {
           :default => 4000,
           :public => true,
-          :type => Fixnum,
+          :type => Integer,
           :allowed_from_server => true,
           :description => 'Maximum number of transaction trace nodes to record in a single transaction trace.'
         },
@@ -979,7 +983,7 @@ module NewRelic
         :'error_collector.max_event_samples_stored' => {
           :default => 100,
           :public => true,
-          :type => Fixnum,
+          :type => Integer,
           :allowed_from_server => true,
           :description => 'Defines the maximum number of <a href="https://docs.newrelic.com/docs/insights/new-relic-insights/decorating-events/error-event-default-attributes-insights">TransactionError events</a> sent to Insights per harvest cycle.'
         },
@@ -1152,7 +1156,7 @@ module NewRelic
         :'xray_session.max_samples' => {
           :default => 10,
           :public => false,
-          :type => Fixnum,
+          :type => Integer,
           :allowed_from_server => true,
           :description => 'Maximum number of transaction traces to buffer for active X-Ray sessions'
         },
@@ -1180,7 +1184,7 @@ module NewRelic
         :'analytics_events.max_samples_stored' => {
           :default => 1200,
           :public => true,
-          :type => Fixnum,
+          :type => Integer,
           :allowed_from_server => true,
           :description => 'Defines the maximum number of request events reported from a single harvest.'
         },
@@ -1246,6 +1250,14 @@ module NewRelic
           :allowed_from_server => false,
           :description  => 'If <code>true</code>, disables instrumentation for ActiveRecord 4.'
         },
+        :disable_active_record_5 => {
+          :default      => false,
+          :public       => true,
+          :type         => Boolean,
+          :dynamic_name => true,
+          :allowed_from_server => false,
+          :description  => 'If <code>true</code>, disables instrumentation for ActiveRecord 5.'
+        },
         :disable_curb => {
           :default      => false,
           :public       => true,
@@ -1387,7 +1399,7 @@ module NewRelic
         :keep_alive_timeout => {
           :default      => 60,
           :public       => false,
-          :type         => Fixnum,
+          :type         => Integer,
           :allowed_from_server => true,
           :description  => 'Timeout for keep alive on TCP connection to collector if supported by Ruby version. Only used in conjunction when aggressive_keepalive is enabled.'
         },
@@ -1410,14 +1422,14 @@ module NewRelic
         :'synthetics.traces_limit' => {
           :default      => 20,
           :public       => false,
-          :type         => Fixnum,
+          :type         => Integer,
           :allowed_from_server => true,
           :description  => 'Maximum number of synthetics transaction traces to hold for a given harvest'
         },
         :'synthetics.events_limit' => {
           :default      => 200,
           :public       => false,
-          :type         => Fixnum,
+          :type         => Integer,
           :allowed_from_server => true,
           :description  => 'Maximum number of synthetics transaction events to hold for a given harvest'
         },
@@ -1431,7 +1443,7 @@ module NewRelic
         :'custom_insights_events.max_samples_stored' => {
           :default      => 1000,
           :public       => true,
-          :type         => Fixnum,
+          :type         => Integer,
           :allowed_from_server => true,
           :description  => 'Specify a maximum number of custom Insights events to buffer in memory at a time.',
           :dynamic_name => true
@@ -1591,7 +1603,7 @@ module NewRelic
           :default     => nil,
           :allow_nil   => true,
           :public      => false,
-          :type        => Fixnum,
+          :type        => Integer,
           :allowed_from_server => false,
           :description => 'The total number of hyper-threaded execution contexts available.'
         },
@@ -1599,7 +1611,7 @@ module NewRelic
           :default     => nil,
           :allow_nil   => true,
           :public      => false,
-          :type        => Fixnum,
+          :type        => Integer,
           :allowed_from_server => false,
           :description => 'This value represents the total amount of memory available to the host (not the process), in mebibytes (1024 squared or 1,048,576 bytes).'
         },

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

@@ -82,7 +82,7 @@ module NewRelic
 
           if type == String
             self[config_key] = value
-          elsif type == Fixnum
+          elsif type == Integer
             self[config_key] = value.to_i
           elsif type == Float
             self[config_key] = value.to_f

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

@@ -9,7 +9,7 @@ DependencyDetection.defer do
   depends_on do
     defined?(::ActiveRecord) && defined?(::ActiveRecord::Base) &&
       defined?(::ActiveRecord::VERSION) &&
-      ::ActiveRecord::VERSION::MAJOR.to_i >= 4
+      ::ActiveRecord::VERSION::MAJOR.to_i == 4
   end
 
   depends_on do
@@ -18,7 +18,7 @@ DependencyDetection.defer do
   end
 
   executes do
-    ::NewRelic::Agent.logger.info 'Installing ActiveRecord 4+ instrumentation'
+    ::NewRelic::Agent.logger.info 'Installing ActiveRecord 4 instrumentation'
   end
 
   executes do

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

@@ -0,0 +1,89 @@
+# 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/instrumentation/active_record_subscriber'
+
+module NewRelic
+  module Agent
+    module Instrumentation
+      module ActiveRecord
+        ACTIVE_RECORD = "ActiveRecord".freeze
+
+        module BaseExtensions
+          def save(*args, &blk)
+            ::NewRelic::Agent.with_database_metric_name(self.class.name, nil, ACTIVE_RECORD) do
+              super
+            end
+          end
+
+          def save!(*args, &blk)
+            ::NewRelic::Agent.with_database_metric_name(self.class.name, nil, ACTIVE_RECORD) do
+              super
+            end
+          end
+        end
+
+        module RelationExtensions
+          def update_all(*args, &blk)
+            ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
+              super
+            end
+          end
+
+          def delete_all(*args, &blk)
+            ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
+              super
+            end
+          end
+
+          def destroy_all(*args, &blk)
+            ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
+              super
+            end
+          end
+
+          def calculate(*args, &blk)
+            ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
+              super
+            end
+          end
+
+          def pluck(*args, &blk)
+            ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
+              super
+            end
+          end
+        end
+      end
+    end
+  end
+end
+
+DependencyDetection.defer do
+  named :active_record_5
+
+  depends_on do
+    defined?(::ActiveRecord) && defined?(::ActiveRecord::Base) &&
+      defined?(::ActiveRecord::VERSION) &&
+      ::ActiveRecord::VERSION::MAJOR.to_i == 5
+  end
+
+  depends_on do
+    !NewRelic::Agent.config[:disable_activerecord_instrumentation] &&
+      !NewRelic::Agent::Instrumentation::ActiveRecordSubscriber.subscribed?
+  end
+
+  executes do
+    ::NewRelic::Agent.logger.info 'Installing ActiveRecord 5 instrumentation'
+  end
+
+  executes do
+    ActiveSupport::Notifications.subscribe('sql.active_record',
+      NewRelic::Agent::Instrumentation::ActiveRecordSubscriber.new)
+
+    ActiveSupport.on_load(:active_record) do
+      ::ActiveRecord::Base.prepend ::NewRelic::Agent::Instrumentation::ActiveRecord::BaseExtensions
+      ::ActiveRecord::Relation.prepend ::NewRelic::Agent::Instrumentation::ActiveRecord::RelationExtensions
+    end
+  end
+end

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

@@ -224,6 +224,7 @@ module NewRelic
           DEFAULT = "default".freeze unless defined?(DEFAULT)
           UNKNOWN = "unknown".freeze unless defined?(UNKNOWN)
           SLASH = "/".freeze unless defined?(SLASH)
+          LOCALHOST = "localhost".freeze unless defined?(LOCALHOST)
 
           def host(config)
             return UNKNOWN unless config
@@ -231,10 +232,9 @@ module NewRelic
             configured_value  = config[:host]
             adapter = PRODUCT_SYMBOLS[config[:adapter]]
             if configured_value.nil? ||
-              Hostname.local?(configured_value) ||
               postgres_unix_domain_socket_case?(configured_value, adapter)
 
-              Hostname.get
+              LOCALHOST
             elsif configured_value.empty?
               UNKNOWN
             else
@@ -256,7 +256,7 @@ module NewRelic
               DEFAULT
             elsif config[:port].nil?
               DATASTORE_DEFAULT_PORTS[adapter] || DEFAULT
-            elsif config[:port].is_a?(Fixnum) || config[:port].to_i != 0
+            elsif config[:port].is_a?(Integer) || config[:port].to_i != 0
               config[:port].to_s
             else
               UNKNOWN

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

@@ -384,7 +384,7 @@ module NewRelic
             opts[:request]
           # in a Rails app
           elsif self.respond_to?(:request)
-            self.request
+            self.request rescue nil
           end
         end
 
@@ -426,7 +426,7 @@ module NewRelic
         def create_transaction_options(trace_options, category, state)
           txn_options = {}
           txn_options[:request]   = trace_options[:request]
-          txn_options[:request] ||= request if respond_to?(:request)
+          txn_options[:request] ||= request if respond_to?(:request) rescue nil
           # params should have been filtered before calling perform_action_with_newrelic_trace
           txn_options[:filtered_params] = trace_options[:params]
           txn_options[:transaction_name] = TransactionNamer.name_for(nil, self, category, trace_options)

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

@@ -137,6 +137,8 @@ module NewRelic
 
             begin
               self.send("#{method_name}_without_newrelic", *args, &blk)
+            rescue ::DataObjects::ConnectionError => e
+              raise
             rescue ::DataObjects::SQLError => e
               e.uri.gsub!(PASSWORD_REGEX, AMPERSAND) if e.uri.include?(PASSWORD_PARAM)
 

data/lib/new_relic/agent/instrumentation/memcache/dalli.rb

@@ -15,6 +15,7 @@ module NewRelic
           DATASTORE_INSTANCES_SUPPORTED_VERSION = ::NewRelic::VersionNumber.new '2.6.4'
           SLASH = '/'.freeze
           UNKNOWN = 'unknown'.freeze
+          LOCALHOST = 'localhost'.freeze
 
           def supports_datastore_instances?
             DATASTORE_INSTANCES_SUPPORTED_VERSION <= ::Dalli::VERSION
@@ -95,17 +96,18 @@ module NewRelic
           end
 
           def assign_instance_to segment, server
+            host = port_path_or_id = nil
             if server.hostname.start_with? SLASH
-              segment.host = ::NewRelic::Agent::Hostname.get
-              segment.port_path_or_id = server.hostname
+              host = LOCALHOST
+              port_path_or_id = server.hostname
             else
-              segment.host = ::NewRelic::Agent::Hostname.get_external server.hostname
-              segment.port_path_or_id = server.port
+              host = server.hostname
+              port_path_or_id = server.port
             end
+            segment.set_instance_info host, port_path_or_id
           rescue => e
             ::NewRelic::Agent.logger.debug "Failed to retrieve memcached instance info: #{e.message}"
-            segment.host = UNKNOWN
-            segment.port_path_or_id = UNKNOWN
+            segment.set_instance_info UNKNOWN, UNKNOWN
           end
 
         end

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

@@ -67,12 +67,13 @@ module NewRelic
         end
 
         UNKNOWN = "unknown".freeze
+        LOCALHOST = "localhost".freeze
 
         def host_from_address(address)
           if unix_domain_socket? address.host
-            Hostname.get
+            LOCALHOST
           else
-            Hostname.get_external address.host
+            address.host
           end
         rescue => e
           NewRelic::Agent.logger.debug "Failed to retrieve Mongo host: #{e}"

data/lib/new_relic/agent/instrumentation/rails5/action_controller.rb

@@ -12,7 +12,7 @@ DependencyDetection.defer do
   end
 
   depends_on do
-    defined?(ActionController) && defined?(ActionController::Base)
+    defined?(ActionController) && (defined?(ActionController::Base) || defined?(ActionController::API))
   end
 
   executes do
@@ -20,9 +20,18 @@ DependencyDetection.defer do
   end
 
   executes do
-    class ActionController::Base
-      include NewRelic::Agent::Instrumentation::ControllerInstrumentation
+    if defined?(ActionController::Base)
+      class ActionController::Base
+        include NewRelic::Agent::Instrumentation::ControllerInstrumentation
+      end
     end
+
+    if defined?(ActionController::API)
+      class ActionController::API
+        include NewRelic::Agent::Instrumentation::ControllerInstrumentation
+      end
+    end
+
     NewRelic::Agent::Instrumentation::ActionControllerSubscriber \
       .subscribe(/^process_action.action_controller$/)
   end

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

@@ -12,9 +12,10 @@ module NewRelic
         extend self
 
         UNKNOWN = "unknown".freeze
+        LOCALHOST = "localhost".freeze
 
         def host_for(client)
-          client.path ? NewRelic::Agent::Hostname.get : NewRelic::Agent::Hostname.get_external(client.host)
+          client.path ? LOCALHOST : client.host
         rescue => e
           NewRelic::Agent.logger.debug "Failed to retrieve Redis host: #{e}"
           UNKNOWN