newrelic_rpm 4.6.0.338 → 4.7.0.339

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f0dcf7789c565bfbc24cc8b1c65ec3d3b05d715
-  data.tar.gz: 50ba88cad5a895adafc8c4923143b30f0d85f1e1
+  metadata.gz: aabe09622c53b4daace84facb8f8ada18fc60744
+  data.tar.gz: 743c735df3aec5ee4dc31a861039835143e45fd2
 SHA512:
-  metadata.gz: 98acebde2bc526125b36318ccd71e94dec996adb273894e25b38497ba3e4fe3b62d86613c5dc2d8cef198e0c83084584e8b7b5205002bb79155dbca323f3615c
-  data.tar.gz: 8d0f588e0b0c40b4398f2cee2a4d3d30d6f0022a584713c0f068d1546c2d975bc624e93b77c318cb94cbd4f59ecac0611e6f10c7d7fac04e5d15a197854f1d01
+  metadata.gz: fc9a023f05c6fc816622fad43aa920619c7acf14c49dbfbe5ec9513056f11da6a6ab56d343cfcc2f73ed484e156bc3ca535a7162530197228200b0d102503d5a
+  data.tar.gz: 7added760ccb67756285381503e6d4e7e6411bf61e2a6c0814a22465beda1516d8ddce1d2c5de8403b27b3413211ccf20c4f43ae287389dc179500d60a919490

data/CHANGELOG.md

@@ -1,5 +1,66 @@
 # New Relic Ruby Agent Release Notes #
 
+  ## v4.7.0 ##
+
+  * Expected Error API
+
+  The agent now sends up `error.expected` as an intrinsic attribute on error
+  events and error traces. When you pass `expected: true` to the `notice_error`
+  method, both Insights and APM will indicate that the error is expected.
+
+  * Typhoeus Hydra Instrumentation
+
+  The agent now has request level visibility for HTTP requests made using
+  Typhoeus Hydra.
+
+  * Total Time Metrics are Recorded
+
+  The agent now records Total Time metrics. In an application where segments
+  execute concurrently, the total time can exceed the wall-clock time for a
+  transaction. Users of the new Typhoeus Hydra instrumentation will notice
+  this as changes on the overview page. Immediately after upgrading there
+  will be an alert in the APM dashboard that states: "There are both old and
+  new time metrics for this time window". This indicates that during that time
+  window, some transactions report the total time metrics, while others do not.
+  The message will go away after waiting for enough time to elapse and / or
+  updating the time window.
+
+  * Add `:message` category to `set_transaction_name` public API method
+
+  The agent now permits the `:message` category to be passed into the public
+  API method `set_transaction_name`, which will enable the transaction to be
+  displayed as a messaging transaction.
+
+  * Create `prepend_active_record_instrumentation` config option
+
+  Users may now set the `prepend_active_record_instrumentation` option in
+  their agent config to install Active Record 3 or 4 instrumentation using
+  `Module.prepend` rather than `alias_method`.
+
+  * Use Lazy load hooks for `ActionController::Base` and `ActionController::API`
+
+  The agent now uses lazy load hooks to hook on `ActionController::Base` and
+  `ActionController::API`. Thanks Edouard Chin for the contribution!
+
+  * Use Lazy load hooks for `ActiveRecord::Base` and `ActiveRecord::Relation`
+
+  The agent uses lazy load hooks when recording supportability metrics
+  for `ActiveRecord::Base` and `ActiveRecord::Relation`. Thanks Joseph Haig
+  for the contribution!
+
+  * Check that `Rails::VERSION` is defined instead of just `Rails`
+
+  The agent now checks that `Rails::VERSION` is defined since there are cases
+  where `Rails` is defined but `Rails::VERSION` is not. Thanks to Alex Riedler
+  and nilsding for the contribution!
+
+  * Support fast RPC/direct reply-to in RabbitMQ
+
+  The agent can now handle the pseudo-queue 'amq.rabbitmq.reply-to' in its
+  Bunny instrumentation. Previously, using fast RPC led to a `NoMethodError`
+  because the reply-to queue was expected to be a `Queue` object instead of
+  a string.
+
 ## v4.6.0 ##
 
   * Public API for External Requests

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

@@ -676,6 +676,13 @@ module NewRelic
           :allowed_from_server => false,
           :description => 'If <code>true</code>, disables active record instrumentation.'
         },
+        :prepend_active_record_instrumentation => {
+          :default => false,
+          :public => true,
+          :type => Boolean,
+          :allowed_from_server => false,
+          :description => 'If <code>true</code>, uses Module.prepend rather than alias_method for ActiveRecord instrumentation.'
+        },
         :disable_data_mapper => {
           :default => false,
           :public => true,

data/lib/new_relic/agent/datastores.rb

@@ -47,7 +47,10 @@ module NewRelic
             alias_method method_name_without_newrelic, method_name
 
             define_method(method_name) do |*args, &blk|
-              segment = NewRelic::Agent::Transaction.start_datastore_segment(product, operation)
+              segment = NewRelic::Agent::Transaction.start_datastore_segment(
+                product: product,
+                operation: operation
+              )
               begin
                 send(method_name_without_newrelic, *args, &blk)
               ensure
@@ -109,7 +112,11 @@ module NewRelic
 
         return yield unless operation
 
-        segment = NewRelic::Agent::Transaction.start_datastore_segment(product, operation, collection)
+        segment = NewRelic::Agent::Transaction.start_datastore_segment(
+          product: product,
+          operation: operation,
+          collection: collection
+        )
 
         begin
           result = yield

data/lib/new_relic/agent/error_collector.rb

@@ -183,7 +183,7 @@ module NewRelic
 
       # extracts a stack trace from the exception for debugging purposes
       def extract_stack_trace(exception)
-        actual_exception = if defined?(Rails) && Rails::VERSION::MAJOR < 5
+        actual_exception = if defined?(Rails::VERSION::MAJOR) && Rails::VERSION::MAJOR < 5
                              sense_method(exception, :original_exception) || exception
                            else
                              exception
@@ -199,7 +199,7 @@ module NewRelic
 
         state = ::NewRelic::Agent::TransactionState.tl_get
 
-        unless options.delete(:expected)
+        unless options[:expected]
           increment_error_count!(state, exception, options)
         end
 
@@ -227,6 +227,8 @@ module NewRelic
         noticed_error.line_number = sense_method(exception, :line_number)
         noticed_error.stack_trace = extract_stack_trace(exception)
 
+        noticed_error.expected = !! options.delete(:expected)
+
         noticed_error.attributes_from_notice_error = options.delete(:custom_params) || {}
 
         # Any options that are passed to notice_error which aren't known keys

data/lib/new_relic/agent/external.rb

@@ -32,7 +32,11 @@ module NewRelic
 
         ::NewRelic::Agent.record_api_supportability_metric(:start_segment)
 
-        ::NewRelic::Agent::Transaction.start_external_request_segment(library, uri, procedure)
+        ::NewRelic::Agent::Transaction.start_external_request_segment(
+          library: library,
+          uri: uri,
+          procedure: procedure
+        )
       end
 
       NON_HTTP_CAT_ID_HEADER  = 'NewRelicID'.freeze

data/lib/new_relic/agent/http_clients/excon_wrappers.rb

@@ -70,7 +70,9 @@ module NewRelic
         end
 
         def uri
-          URI.parse("#{@scheme}://#{host}:#{@port}#{@path}")
+          ::NewRelic::Agent::HTTPClients::URIUtil.parse_and_normalize_url(
+            "#{@scheme}://#{host}:#{@port}#{@path}"
+            )
         end
       end
     end

data/lib/new_relic/agent/http_clients/net_http_wrappers.rb

@@ -47,10 +47,12 @@ module NewRelic
         def uri
           case @request.path
           when /^https?:\/\//
-            URI(@request.path)
+            ::NewRelic::Agent::HTTPClients::URIUtil.parse_and_normalize_url(@request.path)
           else
             scheme = @connection.use_ssl? ? 'https' : 'http'
-            URI("#{scheme}://#{@connection.address}:#{@connection.port}#{@request.path}")
+            ::NewRelic::Agent::HTTPClients::URIUtil.parse_and_normalize_url(
+              "#{scheme}://#{@connection.address}:#{@connection.port}#{@request.path}"
+              )
           end
         end
       end

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

@@ -46,7 +46,7 @@ module NewRelic
         end
 
         def start_recording_metrics event
-          event.payload[:segment] = Transaction.start_segment metric_name_from_event(event)
+          event.payload[:segment] = Transaction.start_segment name: metric_name_from_event(event)
         end
 
         def stop_recording_metrics event

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

@@ -14,7 +14,7 @@ module NewRelic
           event = RenderEvent.new(name, Time.now, nil, id, payload)
           push_event(event)
           if state.is_execution_traced? && event.recordable?
-            event.segment = NewRelic::Agent::Transaction.start_segment event.metric_name
+            event.segment = NewRelic::Agent::Transaction.start_segment name: event.metric_name
           end
         rescue => e
           log_notification_error(e, name, 'start')

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

@@ -2,6 +2,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_prepend'
+
 module NewRelic
   module Agent
     module Instrumentation
@@ -18,7 +20,12 @@ module NewRelic
 
         def self.insert_instrumentation
           if defined?(::ActiveRecord::VERSION::MAJOR) && ::ActiveRecord::VERSION::MAJOR.to_i >= 3
-            ::NewRelic::Agent::Instrumentation::ActiveRecordHelper.instrument_additional_methods
+            if ::NewRelic::Agent.config[:prepend_active_record_instrumentation]
+              ::ActiveRecord::Base.prepend ::NewRelic::Agent::Instrumentation::ActiveRecordPrepend::BaseExtensions
+              ::ActiveRecord::Relation.prepend ::NewRelic::Agent::Instrumentation::ActiveRecordPrepend::RelationExtensions
+            else
+              ::NewRelic::Agent::Instrumentation::ActiveRecordHelper.instrument_additional_methods
+            end
           end
 
           ::ActiveRecord::ConnectionAdapters::AbstractAdapter.module_eval do
@@ -60,7 +67,14 @@ module NewRelic
             database = @config && @config[:database]
           end
 
-          segment = NewRelic::Agent::Transaction.start_datastore_segment(product, operation, collection, host, port_path_or_id, database)
+          segment = NewRelic::Agent::Transaction.start_datastore_segment(
+            product: product,
+            operation: operation,
+            collection: collection,
+            host: host,
+            port_path_or_id: port_path_or_id,
+            database_name: database
+          )
           segment._notice_sql(sql, @config, EXPLAINER)
 
           begin
@@ -94,7 +108,7 @@ DependencyDetection.defer do
   executes do
     require 'new_relic/agent/instrumentation/active_record_helper'
 
-    if defined?(::Rails) && ::Rails::VERSION::MAJOR.to_i == 3
+    if defined?(::Rails::VERSION::MAJOR) && ::Rails::VERSION::MAJOR.to_i == 3
       ActiveSupport.on_load(:active_record) do
         ::NewRelic::Agent::Instrumentation::ActiveRecord.insert_instrumentation
       end

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

@@ -1,6 +1,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.
+
+require 'new_relic/agent/instrumentation/active_record_prepend'
 require 'new_relic/agent/instrumentation/active_record_subscriber'
 require 'new_relic/agent/prepend_supportability'
 
@@ -28,7 +30,13 @@ DependencyDetection.defer do
 
     ActiveSupport.on_load(:active_record) do
       ::NewRelic::Agent::PrependSupportability.record_metrics_for(::ActiveRecord::Base, ::ActiveRecord::Relation)
-      ::NewRelic::Agent::Instrumentation::ActiveRecordHelper.instrument_additional_methods
+
+      if NewRelic::Agent.config[:prepend_active_record_instrumentation]
+        ::ActiveRecord::Base.prepend ::NewRelic::Agent::Instrumentation::ActiveRecordPrepend::BaseExtensions
+        ::ActiveRecord::Relation.prepend ::NewRelic::Agent::Instrumentation::ActiveRecordPrepend::RelationExtensions
+      else
+        ::NewRelic::Agent::Instrumentation::ActiveRecordHelper.instrument_additional_methods
+      end
     end
   end
 end

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

@@ -1,64 +1,9 @@
 # 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'
-require 'new_relic/agent/prepend_supportability'
-
-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
+require 'new_relic/agent/instrumentation/active_record_subscriber'
+require 'new_relic/agent/instrumentation/active_record_prepend'
 
 DependencyDetection.defer do
   named :active_record_5
@@ -79,14 +24,13 @@ DependencyDetection.defer do
   end
 
   executes do
-    ::NewRelic::Agent::PrependSupportability.record_metrics_for(::ActiveRecord::Base, ::ActiveRecord::Relation)
-
     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
+      ::NewRelic::Agent::PrependSupportability.record_metrics_for(::ActiveRecord::Base, ::ActiveRecord::Relation)
+      ::ActiveRecord::Base.prepend ::NewRelic::Agent::Instrumentation::ActiveRecordPrepend::BaseExtensions
+      ::ActiveRecord::Relation.prepend ::NewRelic::Agent::Instrumentation::ActiveRecordPrepend::RelationExtensions
     end
   end
 end

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

@@ -0,0 +1,61 @@
+# 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/prepend_supportability'
+
+module NewRelic
+  module Agent
+    module Instrumentation
+      module ActiveRecordPrepend
+        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

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

@@ -104,13 +104,15 @@ DependencyDetection.defer do
 
         def call *args
           delivery_info, message_properties, _ = args
+          queue_name = queue.respond_to?(:name) ? queue.name : queue
+
           NewRelic::Agent::Messaging.wrap_amqp_consume_transaction(
             library: NewRelic::Agent::Instrumentation::Bunny::LIBRARY,
             destination_name: NewRelic::Agent::Instrumentation::Bunny.exchange_name(delivery_info.exchange),
             delivery_info: delivery_info,
             message_properties: message_properties,
             exchange_type: NewRelic::Agent::Instrumentation::Bunny.exchange_type(delivery_info, channel),
-            queue_name: queue.name) do
+            queue_name: queue_name) do
 
             call_without_new_relic(*args)
           end

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

@@ -241,6 +241,7 @@ module NewRelic
             when :grape         then ::NewRelic::Agent::Transaction::GRAPE_PREFIX
             when :rake          then ::NewRelic::Agent::Transaction::RAKE_PREFIX
             when :action_cable  then ::NewRelic::Agent::Transaction::ACTION_CABLE_PREFIX
+            when :message       then ::NewRelic::Agent::Transaction::MESSAGE_PREFIX
             else "#{category.to_s}/" # for internal use only
             end
           end