newrelic_rpm 6.9.0.363 → 6.10.0.364

data/lib/new_relic/agent/logging.rb

@@ -74,7 +74,7 @@ module NewRelic
           end
 
           message << COMMA
-          message << QUOTE << TIMESTAMP_KEY << QUOTE << COLON << time.to_f.to_s
+          message << QUOTE << TIMESTAMP_KEY << QUOTE << COLON << (time.to_f * 1000).round.to_s
           message << CLOSING_BRACE << NEWLINE
         end
 

data/lib/new_relic/agent/method_tracer_helpers.rb

@@ -27,7 +27,7 @@ module NewRelic
         end
 
         begin
-          yield
+          Tracer.capture_segment_error(segment) { yield }
         ensure
           segment.finish if segment
         end

data/lib/new_relic/agent/noticible_error.rb

@@ -0,0 +1,22 @@
+# 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.
+# frozen_string_literal: true
+
+module NewRelic
+  module Agent
+
+    # This class is used for instrumentations that have exceptions or error classes
+    # not derived from Ruby's usual Exception or StandardError or in situations
+    # where we do not have such Exception object to work with.
+    class NoticibleError
+      attr_reader :class_name, :message
+
+      def initialize class_name, message
+        @class_name = class_name
+        @message = message
+      end
+    end
+
+  end
+end

data/lib/new_relic/agent/span_event_primitive.rb

@@ -1,6 +1,7 @@
 # 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.
+# frozen_string_literal: true
 
 # This module builds the data structures necessary to create a Span
 # event for a segment.
@@ -15,43 +16,52 @@ module NewRelic
       extend self
 
       # Strings for static keys of the event structure
-      ELLIPSIS             = '...'.freeze
-      TYPE_KEY             = 'type'.freeze
-      TRACE_ID_KEY         = 'traceId'.freeze
-      GUID_KEY             = 'guid'.freeze
-      PARENT_ID_KEY        = 'parentId'.freeze
-      GRANDPARENT_ID_KEY   = 'grandparentId'.freeze
-      TRANSACTION_ID_KEY   = 'transactionId'.freeze
-      SAMPLED_KEY          = 'sampled'.freeze
-      PRIORITY_KEY         = 'priority'.freeze
-      TIMESTAMP_KEY        = 'timestamp'.freeze
-      DURATION_KEY         = 'duration'.freeze
-      NAME_KEY             = 'name'.freeze
-      CATEGORY_KEY         = 'category'.freeze
-      HTTP_URL_KEY         = 'http.url'.freeze
-      HTTP_METHOD_KEY      = 'http.method'.freeze
-      COMPONENT_KEY        = 'component'.freeze
-      DB_INSTANCE_KEY      = 'db.instance'.freeze
-      DB_STATEMENT_KEY     = 'db.statement'.freeze
-      PEER_ADDRESS_KEY     = 'peer.address'.freeze
-      PEER_HOSTNAME_KEY    = 'peer.hostname'.freeze
-      SPAN_KIND_KEY        = 'span.kind'.freeze
-      ENTRY_POINT_KEY      = 'nr.entryPoint'.freeze
-      TRUSTED_PARENT_KEY   = "trustedParentId".freeze
-      TRACING_VENDORS_KEY  = "tracingVendors".freeze
+      ELLIPSIS             = '...'
+      TYPE_KEY             = 'type'
+      TRACE_ID_KEY         = 'traceId'
+      GUID_KEY             = 'guid'
+      PARENT_ID_KEY        = 'parentId'
+      GRANDPARENT_ID_KEY   = 'grandparentId'
+      TRANSACTION_ID_KEY   = 'transactionId'
+      SAMPLED_KEY          = 'sampled'
+      PRIORITY_KEY         = 'priority'
+      TIMESTAMP_KEY        = 'timestamp'
+      DURATION_KEY         = 'duration'
+      NAME_KEY             = 'name'
+      CATEGORY_KEY         = 'category'
+      HTTP_URL_KEY         = 'http.url'
+      HTTP_METHOD_KEY      = 'http.method'
+      HTTP_STATUS_CODE_KEY = 'http.statusCode'
+      COMPONENT_KEY        = 'component'
+      DB_INSTANCE_KEY      = 'db.instance'
+      DB_STATEMENT_KEY     = 'db.statement'
+      PEER_ADDRESS_KEY     = 'peer.address'
+      PEER_HOSTNAME_KEY    = 'peer.hostname'
+      SPAN_KIND_KEY        = 'span.kind'
+      ENTRY_POINT_KEY      = 'nr.entryPoint'
+      TRUSTED_PARENT_KEY   = "trustedParentId"
+      TRACING_VENDORS_KEY  = "tracingVendors"
 
       # Strings for static values of the event structure
-      EVENT_TYPE         = 'Span'.freeze
-      GENERIC_CATEGORY   = 'generic'.freeze
-      HTTP_CATEGORY      = 'http'.freeze
-      DATASTORE_CATEGORY = 'datastore'.freeze
-      CLIENT             = 'client'.freeze
+      EVENT_TYPE         = 'Span'
+      GENERIC_CATEGORY   = 'generic'
+      HTTP_CATEGORY      = 'http'
+      DATASTORE_CATEGORY = 'datastore'
+      CLIENT             = 'client'
+
+      # Builds a Hash of error attributes as well as the Span ID when
+      # an error is present.  Otherwise, returns nil when no error present.
+      def error_attributes segment
+        return if Agent.config[:high_security] || !segment.noticed_error
+        segment.noticed_error.build_error_attributes
+        segment.noticed_error_attributes
+      end
 
       def for_segment segment
         intrinsics = intrinsics_for(segment)
         intrinsics[CATEGORY_KEY] = GENERIC_CATEGORY
 
-        [intrinsics, custom_attributes(segment.attributes), NewRelic::EMPTY_HASH]
+        [intrinsics, custom_attributes(segment.attributes), error_attributes(segment) || NewRelic::EMPTY_HASH]
       end
 
       def for_external_request_segment segment
@@ -59,10 +69,11 @@ module NewRelic
 
         intrinsics[COMPONENT_KEY]   = segment.library
         intrinsics[HTTP_METHOD_KEY] = segment.procedure
+        intrinsics[HTTP_STATUS_CODE_KEY] = segment.http_status_code if segment.http_status_code
         intrinsics[CATEGORY_KEY]    = HTTP_CATEGORY
         intrinsics[SPAN_KIND_KEY]   = CLIENT
 
-        agent_attributes = {}
+        agent_attributes = error_attributes(segment) || {}
 
         if allowed?(HTTP_URL_KEY)
           agent_attributes[HTTP_URL_KEY] = truncate(segment.uri)
@@ -78,7 +89,7 @@ module NewRelic
         intrinsics[SPAN_KIND_KEY] = CLIENT
         intrinsics[CATEGORY_KEY] = DATASTORE_CATEGORY
 
-        agent_attributes = {}
+        agent_attributes = error_attributes(segment) || {}
 
         if segment.database_name && allowed?(DB_INSTANCE_KEY)
           agent_attributes[DB_INSTANCE_KEY] = truncate(segment.database_name)

data/lib/new_relic/agent/tracer.rb

@@ -102,9 +102,9 @@ module NewRelic
             # only wrap the yield to be absolutely sure we don't report agent
             # problems as app errors
             yield
-          rescue => e
-            current_transaction.notice_error(e)
-            raise e
+          rescue => exception
+            current_transaction.notice_error(exception)
+            raise
           ensure
             finishable.finish if finishable
           end
@@ -157,8 +157,8 @@ module NewRelic
 
         rescue ArgumentError
           raise
-        rescue => e
-          log_error('start_transaction_or_segment', e)
+        rescue => exception
+          log_error('start_transaction_or_segment', exception)
         end
 
         # Takes name or partial_name and a category.
@@ -190,8 +190,8 @@ module NewRelic
                                             options)
         rescue ArgumentError
           raise
-        rescue => e
-          log_error('start_transaction', e)
+        rescue => exception
+          log_error('start_transaction', exception)
         end
 
         def create_distributed_trace_payload
@@ -251,8 +251,8 @@ module NewRelic
 
         rescue ArgumentError
           raise
-        rescue => e
-          log_error('start_segment', e)
+        rescue => exception
+          log_error('start_segment', exception)
         end
 
         UNKNOWN = "Unknown".freeze
@@ -310,8 +310,8 @@ module NewRelic
 
         rescue ArgumentError
           raise
-        rescue => e
-          log_error('start_datastore_segment', e)
+        rescue => exception
+          log_error('start_datastore_segment', exception)
         end
 
         # Creates and starts an external request segment using the
@@ -357,8 +357,23 @@ module NewRelic
 
         rescue ArgumentError
           raise
-        rescue => e
-          log_error('start_external_request_segment', e)
+        rescue => exception
+          log_error('start_external_request_segment', exception)
+        end
+
+        # Will potentially capture and notice an error at the
+        # segment that was executing when error occurred.
+        # if passed +segment+ is something that doesn't 
+        # respond to +notice_segment_error+ then this method
+        # is effectively just a yield to the given &block
+        def capture_segment_error segment
+          return unless block_given?
+          yield
+        rescue => exception
+          if segment && segment.is_a?(Transaction::AbstractSegment)
+            segment.notice_error exception
+          end
+          raise
         end
 
         # For New Relic internal use only.
@@ -390,8 +405,8 @@ module NewRelic
 
         rescue ArgumentError
           raise
-        rescue => e
-          log_error('start_datastore_segment', e)
+        rescue => exception
+          log_error('start_datastore_segment', exception)
         end
 
         # This method should only be used by Tracer for access to the

data/lib/new_relic/agent/transaction.rb

@@ -1,6 +1,7 @@
 # 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.
+# frozen_string_literal: true
 
 require 'new_relic/agent/instrumentation/queue_time'
 require 'new_relic/agent/transaction_metrics'
@@ -23,22 +24,36 @@ module NewRelic
       include Tracing
 
       # for nested transactions
-      SUBTRANSACTION_PREFIX        = 'Nested/'.freeze
-      CONTROLLER_PREFIX            = 'Controller/'.freeze
-      MIDDLEWARE_PREFIX            = 'Middleware/Rack/'.freeze
-      TASK_PREFIX                  = 'OtherTransaction/Background/'.freeze
-      RAKE_PREFIX                  = 'OtherTransaction/Rake/'.freeze
-      MESSAGE_PREFIX               = 'OtherTransaction/Message/'.freeze
-      RACK_PREFIX                  = 'Controller/Rack/'.freeze
-      SINATRA_PREFIX               = 'Controller/Sinatra/'.freeze
-      GRAPE_PREFIX                 = 'Controller/Grape/'.freeze
-      ACTION_CABLE_PREFIX          = 'Controller/ActionCable/'.freeze
-      OTHER_TRANSACTION_PREFIX     = 'OtherTransaction/'.freeze
+      NESTED_TRANSACTION_PREFIX    = "Nested/"
+      CONTROLLER_PREFIX            = "Controller/"
+      MIDDLEWARE_PREFIX            = "Middleware/Rack/"
+      OTHER_TRANSACTION_PREFIX     = "OtherTransaction/"
+      TASK_PREFIX                  = "#{OTHER_TRANSACTION_PREFIX}Background/"
+      RAKE_PREFIX                  = "#{OTHER_TRANSACTION_PREFIX}Rake/"
+      MESSAGE_PREFIX               = "#{OTHER_TRANSACTION_PREFIX}Message/"
+      RACK_PREFIX                  = "#{CONTROLLER_PREFIX}Rack/"
+      SINATRA_PREFIX               = "#{CONTROLLER_PREFIX}Sinatra/"
+      GRAPE_PREFIX                 = "#{CONTROLLER_PREFIX}Grape/"
+      ACTION_CABLE_PREFIX          = "#{CONTROLLER_PREFIX}ActionCable/"
 
       WEB_TRANSACTION_CATEGORIES   = [:web, :controller, :uri, :rack, :sinatra, :grape, :middleware, :action_cable].freeze
       TRANSACTION_NAMING_SOURCES   = [:child, :api].freeze
 
-      MIDDLEWARE_SUMMARY_METRICS   = ['Middleware/all'.freeze].freeze
+      MIDDLEWARE_SUMMARY_METRICS   = ["Middleware/all"].freeze
+      WEB_SUMMARY_METRIC           = "HttpDispatcher"
+      OTHER_SUMMARY_METRIC         = "#{OTHER_TRANSACTION_PREFIX}all"
+      QUEUE_TIME_METRIC            = "WebFrontend/QueueTime"
+
+      APDEX_S                       = "S"
+      APDEX_T                       = "T"
+      APDEX_F                       = "F"
+      APDEX_ALL_METRIC              = "ApdexAll"
+      APDEX_METRIC                  = "Apdex"
+      APDEX_OTHER_METRIC            = "ApdexOther"
+      APDEX_TXN_METRIC_PREFIX       = "Apdex/"
+      APDEX_OTHER_TXN_METRIC_PREFIX = "ApdexOther/Transaction/"
+
+      JRUBY_CPU_TIME_ERROR = "Error calculating JRuby CPU Time"
 
       # reference to the transaction state managing this transaction
       attr_accessor :state
@@ -136,23 +151,22 @@ module NewRelic
 
       def self.nested_transaction_name(name)
         if name.start_with?(CONTROLLER_PREFIX) || name.start_with?(OTHER_TRANSACTION_PREFIX)
-          "#{SUBTRANSACTION_PREFIX}#{name}"
+          "#{NESTED_TRANSACTION_PREFIX}#{name}"
         else
           name
         end
       end
 
-      # Indicate that you don't want to keep the currently saved transaction
-      # information
-      def self.abort_transaction! #THREAD_LOCAL_ACCESS
-        txn = Tracer.current_transaction
-        txn.abort_transaction! if txn
+      # discards the currently saved transaction information
+      def self.abort_transaction!
+        if txn = Tracer.current_transaction
+          txn.abort_transaction!
+        end
       end
 
       # See NewRelic::Agent.notice_error for options and commentary
-      def self.notice_error(e, options={}) #THREAD_LOCAL_ACCESS
-        txn = Tracer.current_transaction
-        if txn
+      def self.notice_error(e, options={})
+        if txn = Tracer.current_transaction
           txn.notice_error(e, options)
         elsif NewRelic::Agent.instance
           NewRelic::Agent.instance.error_collector.notice_error(e, options)
@@ -446,9 +460,9 @@ module NewRelic
 
         nest_initial_segment if nesting_max_depth == 1
         nested_name = self.class.nested_transaction_name options[:transaction_name]
-        result = create_segment nested_name
+        segment = create_segment nested_name
         set_default_transaction_name(options[:transaction_name], category)
-        result
+        segment
       end
 
       def nest_initial_segment
@@ -462,9 +476,6 @@ module NewRelic
         @ignore_trace = true
       end
 
-      WEB_SUMMARY_METRIC   = 'HttpDispatcher'.freeze
-      OTHER_SUMMARY_METRIC = 'OtherTransaction/all'.freeze
-
       def summary_metrics
         if @frozen_name.start_with?(CONTROLLER_PREFIX)
           [WEB_SUMMARY_METRIC]
@@ -666,10 +677,6 @@ module NewRelic
         info[4]
       end
 
-      APDEX_S = 'S'.freeze
-      APDEX_T = 'T'.freeze
-      APDEX_F = 'F'.freeze
-
       def append_apdex_perf_zone(payload)
         if recording_web_transaction?
           bucket = apdex_bucket(duration, apdex_t)
@@ -708,13 +715,21 @@ module NewRelic
           options[:metric]     = best_name
           options[:attributes] = @attributes
 
-          error_recorded = !!agent.error_collector.notice_error(exception, options) || error_recorded
+          span_id = options.delete :span_id
+          error_recorded = !!agent.error_collector.notice_error(exception, options, span_id) || error_recorded
         end
         payload[:error] = error_recorded if payload
       end
 
       # Do not call this.  Invoke the class method instead.
       def notice_error(error, options={}) # :nodoc:
+
+        # Only the last error is kept
+        if @current_segment
+          @current_segment.notice_error error, expected: options[:expected]
+          options[:span_id] = @current_segment.guid
+        end
+
         if @exceptions[error]
           @exceptions[error].merge! options
         else
@@ -726,8 +741,6 @@ module NewRelic
         agent.transaction_event_recorder.record payload
       end
 
-      QUEUE_TIME_METRIC = 'WebFrontend/QueueTime'.freeze
-
       def queue_time
         @apdex_start ? @start_time - @apdex_start : 0
       end
@@ -743,17 +756,9 @@ module NewRelic
         end
       end
 
-      APDEX_ALL_METRIC   = 'ApdexAll'.freeze
-
-      APDEX_METRIC       = 'Apdex'.freeze
-      APDEX_OTHER_METRIC = 'ApdexOther'.freeze
-
-      APDEX_TXN_METRIC_PREFIX       = 'Apdex/'.freeze
-      APDEX_OTHER_TXN_METRIC_PREFIX = 'ApdexOther/Transaction/'.freeze
-
       def had_error_affecting_apdex?
         @exceptions.each do |exception, options|
-          ignored        = NewRelic::Agent.instance.error_collector.error_is_ignored?(exception)
+          ignored = NewRelic::Agent.instance.error_collector.error_is_ignored?(exception)
           expected = options[:expected]
 
           return true unless ignored || expected
@@ -892,7 +897,6 @@ module NewRelic
         p.stime + p.utime
       end
 
-      JRUBY_CPU_TIME_ERROR = "Error calculating JRuby CPU Time".freeze
       def jruby_cpu_time
         return nil unless @@java_classes_loaded
         threadMBean = Java::JavaLangManagement::ManagementFactory.getThreadMXBean()

data/lib/new_relic/agent/transaction/abstract_segment.rb

@@ -23,6 +23,7 @@ module NewRelic
         attr_reader :start_time, :end_time, :duration, :exclusive_duration, :guid
         attr_accessor :name, :parent, :children_time, :transaction
         attr_writer :record_metrics, :record_scoped_metric, :record_on_finish
+        attr_reader :noticed_error
 
         def initialize name=nil, start_time=nil
           @name = name
@@ -42,6 +43,7 @@ module NewRelic
           @record_metrics = true
           @record_scoped_metric = true
           @record_on_finish = false
+          @noticed_error = nil
         end
 
         def start
@@ -119,6 +121,30 @@ module NewRelic
         def transaction_assigned
         end
 
+        def set_noticed_error noticed_error
+          if @noticed_error
+            NewRelic::Agent.logger.debug \
+              "Segment: #{name} overwriting previously noticed " \
+              "error: #{@noticed_error.inspect} with: #{noticed_error.inspect}"
+          end
+          @noticed_error = noticed_error
+        end
+
+        def notice_error exception, options={}
+          if Agent.config[:high_security]
+            NewRelic::Agent.logger.debug \
+              "Segment: #{name} ignores notice_error for " \
+              "error: #{exception.inspect} because :high_security is enabled"
+          else
+            NewRelic::Agent.instance.error_collector.notice_segment_error self, exception, options
+          end
+        end
+
+        def noticed_error_attributes
+          return unless @noticed_error
+          @noticed_error.attributes_from_notice_error
+        end
+
         protected
 
         attr_writer :range_recorded