newrelic_rpm 5.0.0.342 → 5.1.0.344

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10c4b8fa117aaa061a4e13071bfa6a568e03dc27b4d9a75040cbf9c5b0772749
-  data.tar.gz: 1536ab0db32670d6f604cd9c662d1b7633366e77957051e8ace104df942ed97d
+  metadata.gz: 542ac1ce1a083c278c83f047f78ab8b3c8810a0916c87f83894a1f923d0a3fd2
+  data.tar.gz: 4e1eb213e1a4dac5877552f15e971bdf1b5005d2fb208a5364a8e1e59b9d25a0
 SHA512:
-  metadata.gz: aff7fb607ba79d6f8707a8c4f99bee62dc32c87df71a8809517ed1e29ba57760f0991c241d56816dfc50af99aad98bd918f82d97365cc36882962973efe12551
-  data.tar.gz: 8f2c281d13b955a25d9b7717ed248d5dc3a230e1e42ebf4fd25ad010253cfe42ba7692b288e2d093b9cd64a84d56d7a3edc1d274207ad01402c1ea36cc62af1a
+  metadata.gz: eaf4583a69257f2e22aaae8a6148a5b38d130f83e9585fd69b70ddaf6696e18d7da0a814e7d0046fa6fc6d1afd23f591f961194b56c3da4d86c97cc9d975da4e
+  data.tar.gz: 49de5e3b35b731ef61835a2f3fed0a82fcf7ff9af97db695c829cd3936b19bd7ecf1087ff69c5a755a743f203a1efec8c070d4587737e0419e364116bd827121

data/CHANGELOG.md

@@ -1,5 +1,59 @@
 # New Relic Ruby Agent Release Notes #
 
+  ## v5.1.0 ##
+
+  * Rails 5.2 support
+
+    The Ruby agent has been validated against the latest release of
+    Ruby on Rails!
+
+  * Support for newer libraries and frameworks
+
+    We have updated the multiverse suite to test the agent against
+    current versions of several frameworks.
+
+  * Add `custom_attributes.enabled` configuration option
+
+    This option is enabled by default. When it's disabled, custom
+    attributes will not be transmitted on transaction events or error
+    events.
+
+  * Fix Grape load order dependency
+
+    The agent will now choose the correct name for Grape transactions
+    even if the customer's app loads the agent before Grape. Thanks
+    to Daniel Doubrovkine for the contribution!
+
+  * Add `webpacker:compile` to blacklisted tasks
+
+    `webpacker:compile` is commonly used for compiling assets. It has
+    been added to `AUTOSTART_BLACKLISTED_RAKE_TASKS` in the default
+    configuration. Thanks to Claudio B. for the contribution!
+
+  * Make browser instrumentation W3C-compliant
+
+    `type="text/javascript"` is optional for the `<script>` tag under
+    W3C. The `type` attribute has now been removed from browser
+    instrumentation. Thanks to Spharian for the contribution!
+
+  * Deferred `add_method_tracer` calls
+
+    If a third-party library calls `add_method_tracer` before the
+    agent has finished starting, we now queue these calls and run them
+    when it's safe to do so (rather than skipping them and logging a
+    warning).
+
+  * Bugfix for Resque `around` / `before` hooks
+
+    In rare cases, the agent was not instrumenting Resque `around` and
+    `before` hooks. This version fixes the error.
+
+  * Truncation of long stack traces
+
+    Occasionally, long stack traces would cause complications sending
+    data to New Relic. This version truncates long traces to 50 frames
+    (split evenly between the top and bottom of the trace).
+
   ## v5.0.0 ##
 
   * SSL connections to New Relic are now mandatory

data/README.md

@@ -130,9 +130,6 @@ If you can't find what you're looking for there, reach out to us on our [support
 site](http://support.newrelic.com/) or our [community forum](http://forum.newrelic.com)
 and we'll be happy to help you.
 
-Also available is community support on IRC: we generally use #newrelic
-on irc.freenode.net
-
 Find a bug? Contact us via [support.newrelic.com](http://support.newrelic.com/),
 or email support@newrelic.com.
 

data/lib/new_relic/agent.rb

@@ -99,6 +99,8 @@ module NewRelic
 
     @agent = nil
     @logger = nil
+    @tracer_lock = Mutex.new
+    @tracer_queue = []
 
     # The singleton Agent instance.  Used internally.
     def agent #:nodoc:
@@ -110,6 +112,7 @@ module NewRelic
 
     def agent=(new_instance)#:nodoc:
       @agent = new_instance
+      add_deferred_method_tracers_now
     end
 
     alias instance agent #:nodoc:
@@ -124,6 +127,30 @@ module NewRelic
       @logger = log
     end
 
+    # A third-party class may call add_method_tracer before the agent
+    # is initialized; these methods enable us to defer these calls
+    # until we have started up and can process them.
+    #
+    def add_or_defer_method_tracer(receiver, method_name, metric_name_code, options)
+      @tracer_lock.synchronize do
+        if @agent
+          receiver.send(:_add_method_tracer_now, method_name, metric_name_code, options)
+        else
+          @tracer_queue << [receiver, method_name, metric_name_code, options]
+        end
+      end
+    end
+
+    def add_deferred_method_tracers_now
+      @tracer_lock.synchronize do
+        @tracer_queue.each do |receiver, method_name, metric_name_code, options|
+          receiver.send(:_add_method_tracer_now, method_name, metric_name_code, options)
+        end
+
+        @tracer_queue = []
+      end
+    end
+
     def config
       @config ||= Configuration::Manager.new
     end

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

@@ -251,7 +251,8 @@ module NewRelic
         'test:uncommitted',
         'time:zones:all',
         'tmp:clear',
-        'tmp:create'
+        'tmp:create',
+        'webpacker:compile'
       ].join(',').freeze
 
       DEFAULTS = {
@@ -804,7 +805,16 @@ module NewRelic
           :public => true,
           :type => String,
           :allowed_from_server => true,
-          :description => 'Obfuscation level for SQL queries reported in transaction trace nodes. Valid options are <code>obfuscated</code>, <code>raw</code>, or <code>none</code>.'
+          :description => 'Obfuscation level for SQL queries reported in transaction trace nodes.</p>
+
+  <p>By default, this is set to <code>obfuscated</code>, which strips out the numeric and string literals.</p>
+
+  <ul>
+    <li>If you do not want the agent to capture query information, set this to <code>none</code>.</li>
+    <li>If you want the agent to capture all query information in its original form, set this to <code>raw</code>.</li>
+    <li>When you enable <a href="/docs/agents/manage-apm-agents/configuration/high-security-mode">high security mode</a>, this is automatically set to <code>obfuscated</code>.</li>
+  </ul>
+  <p>' # Doc generator will wrap this in <p>...</p>
         },
         :'transaction_tracer.record_redis_arguments' => {
           :default => false,
@@ -1568,6 +1578,13 @@ module NewRelic
           :transform    => DefaultSource.method(:convert_to_list),
           :description => 'Prefix of attributes to include in browser monitoring. Allows <code>*</code> as wildcard at end.'
         },
+        :'custom_attributes.enabled' => {
+          :default     => true,
+          :public      => true,
+          :type        => Boolean,
+          :allowed_from_server => false,
+          :description => 'If <code>false</code>, custom attributes will not be sent on Insights events.'
+        },
         :'utilization.detect_aws' => {
           :default     => true,
           :public      => true,

data/lib/new_relic/agent/distributed_trace_payload.rb

@@ -78,7 +78,6 @@ module NewRelic
           payload.sampled = transaction.sampled?
           payload.priority = transaction.priority
           payload.parent_id = transaction.parent_id
-          payload.grandparent_id = transaction.grandparent_id
 
           payload
         end
@@ -97,8 +96,7 @@ module NewRelic
           payload.trace_id          = payload_data[TRACE_ID_KEY]
           payload.sampled           = payload_data[SAMPLED_KEY]
           payload.priority          = payload_data[PRIORITY_KEY]
-          payload.parent_id         = payload_data[ID_KEY]        # Our parent ID is the caller's GUID
-          payload.grandparent_id    = payload_data[PARENT_ID_KEY] # Our grandparent ID is the caller's parent ID
+          payload.parent_id         = payload_data[PARENT_ID_KEY]
 
           payload
         end
@@ -138,7 +136,6 @@ module NewRelic
                     :sampled,
                     :priority,
                     :parent_id,
-                    :grandparent_id,
                     :timestamp
 
       alias_method :sampled?, :sampled
@@ -184,8 +181,8 @@ module NewRelic
         transaction_payload[GUID_INTRINSIC_KEY] = transaction.guid
         transaction_payload[TRACE_ID_INTRINSIC_KEY] = trace_id
         transaction_payload[TRIP_ID_INTRINSIC_KEY] = trace_id
-        transaction_payload[PARENT_ID_INTRINSIC_KEY] = parent_id if parent_id
-        transaction_payload[GRANDPARENT_ID_INTRINSIC_KEY] = grandparent_id if grandparent_id
+        transaction_payload[PARENT_ID_INTRINSIC_KEY] = transaction.parent_id if transaction.parent_id
+        transaction_payload[GRANDPARENT_ID_INTRINSIC_KEY] = transaction.grandparent_id if transaction.grandparent_id
       end
     end
   end

data/lib/new_relic/agent/error_collector.rb

@@ -13,6 +13,9 @@ module NewRelic
       # made configurable in the future. This is a tradeoff between
       # memory and data retention
       MAX_ERROR_QUEUE_LENGTH = 20
+      # Maximum number of frames in backtraces. May be made configurable
+      # in the future.
+      MAX_BACKTRACE_FRAMES = 50
       EXCEPTION_TAG_IVAR = :'@__nr_seen_exception'
 
       attr_reader :error_trace_aggregator, :error_event_aggregator
@@ -213,6 +216,19 @@ module NewRelic
         nil
       end
 
+      def truncate_trace(trace, keep_frames=MAX_BACKTRACE_FRAMES)
+        return trace if trace.length < keep_frames || trace.length == 0
+
+        # If keep_frames is odd, we will split things up favoring the top of the trace
+        keep_top = (keep_frames / 2.0).ceil
+        keep_bottom = (keep_frames / 2.0).floor
+
+        truncate_frames = trace.length - keep_frames
+
+        truncated_trace = trace[0...keep_top].concat(["<truncated #{truncate_frames.to_s} additional frames>"]).concat(trace[-keep_bottom..-1])
+        truncated_trace
+      end
+
       EMPTY_STRING = ''.freeze
 
       def create_noticed_error(exception, options)
@@ -225,7 +241,7 @@ module NewRelic
 
         noticed_error.file_name   = sense_method(exception, :file_name)
         noticed_error.line_number = sense_method(exception, :line_number)
-        noticed_error.stack_trace = extract_stack_trace(exception)
+        noticed_error.stack_trace = truncate_trace(extract_stack_trace(exception))
 
         noticed_error.expected = !! options.delete(:expected)
 

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

@@ -31,6 +31,11 @@ DependencyDetection.defer do
       ::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
+
+      if ::ActiveRecord::VERSION::MINOR.to_i == 1 &&
+         ::ActiveRecord::VERSION::TINY.to_i >= 6
+        ::ActiveRecord::Base.prepend ::NewRelic::Agent::Instrumentation::ActiveRecordPrepend::BaseExtensions516
+      end
     end
   end
 end

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

@@ -24,6 +24,19 @@ module NewRelic
           end
         end
 
+        module BaseExtensions516
+          # In ActiveRecord v5.0.0 through v5.1.5, touch() will call
+          # update_all() and cause us to record a transaction.
+          # Starting in v5.1.6, this call no longer happens. We'll
+          # have to set the database metrics explicitly now.
+          #
+          def touch(*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
@@ -58,4 +71,4 @@ module NewRelic
       end
     end
   end
-end
+end

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

@@ -30,35 +30,33 @@ module NewRelic
           Transaction.set_default_transaction_name(txn_name, :grape, node_name)
         end
 
-        if defined?(Grape::VERSION) && Gem::Version.new(::Grape::VERSION) >= Gem::Version.new("0.16.0")
-          def name_for_transaction(route, class_name, version)
-            action_name = route.path.sub(FORMAT_REGEX, EMPTY_STRING)
-            method_name = route.request_method
-            version ||= route.version
-
-            # defaulting does not set rack.env['api.version'] and route.version may return Array
-            #
-            version = version.join(PIPE_STRING) if Array === version
-
-            if version
-              action_name = action_name.sub(VERSION_REGEX, EMPTY_STRING)
-              "#{class_name}-#{version}#{action_name} (#{method_name})"
-            else
-              "#{class_name}#{action_name} (#{method_name})"
-            end
+        def name_for_transaction(route, class_name, version)
+          action_name = route.path.sub(FORMAT_REGEX, EMPTY_STRING)
+          method_name = route.request_method
+          version ||= route.version
+
+          # defaulting does not set rack.env['api.version'] and route.version may return Array
+          #
+          version = version.join(PIPE_STRING) if Array === version
+
+          if version
+            action_name = action_name.sub(VERSION_REGEX, EMPTY_STRING)
+            "#{class_name}-#{version}#{action_name} (#{method_name})"
+          else
+            "#{class_name}#{action_name} (#{method_name})"
           end
-        else
-          def name_for_transaction(route, class_name, version)
-            action_name = route.route_path.sub(FORMAT_REGEX, EMPTY_STRING)
-            method_name = route.route_method
-            version ||= route.route_version
-
-            if version
-              action_name = action_name.sub(VERSION_REGEX, EMPTY_STRING)
-              "#{class_name}-#{version}#{action_name} (#{method_name})"
-            else
-              "#{class_name}#{action_name} (#{method_name})"
-            end
+        end
+
+        def name_for_transaction_deprecated(route, class_name, version)
+          action_name = route.route_path.sub(FORMAT_REGEX, EMPTY_STRING)
+          method_name = route.route_method
+          version ||= route.route_version
+
+          if version
+            action_name = action_name.sub(VERSION_REGEX, EMPTY_STRING)
+            "#{class_name}-#{version}#{action_name} (#{method_name})"
+          else
+            "#{class_name}#{action_name} (#{method_name})"
           end
         end
 
@@ -109,6 +107,13 @@ DependencyDetection.defer do
   end
 
   def instrument_call
+    if defined?(Grape::VERSION) && Gem::Version.new(::Grape::VERSION) >= Gem::Version.new("0.16.0")
+      ::NewRelic::Agent::Instrumentation::GrapeInstrumentation.send :remove_method, :name_for_transaction_deprecated
+    else
+      ::NewRelic::Agent::Instrumentation::GrapeInstrumentation.send :remove_method, :name_for_transaction
+      ::NewRelic::Agent::Instrumentation::GrapeInstrumentation.send :alias_method, :name_for_transaction, :name_for_transaction_deprecated
+    end
+
     ::Grape::API.class_eval do
       def call_with_new_relic(env)
         begin
@@ -130,5 +135,4 @@ DependencyDetection.defer do
       alias_method :call, :call_with_new_relic
     end
   end
-
 end

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

@@ -22,52 +22,33 @@ DependencyDetection.defer do
   end
 
   executes do
-    module Resque
-      module Plugins
-        module NewRelicInstrumentation
-          include NewRelic::Agent::Instrumentation::ControllerInstrumentation
+    module ::Resque
+      class Job
+        include NewRelic::Agent::Instrumentation::ControllerInstrumentation
 
-          def around_perform_with_monitoring(*args)
-            begin
-              perform_action_with_newrelic_trace(
-                :name => 'perform',
-                :class_name => self.name,
-                :category => 'OtherTransaction/ResqueJob') do
+        alias_method :perform_without_instrumentation, :perform
 
-                NewRelic::Agent::Transaction.merge_untrusted_agent_attributes(args, :'job.resque.args',
-                  NewRelic::Agent::AttributeFilter::DST_NONE)
+        def perform
+          begin
+            perform_action_with_newrelic_trace(
+              :name => 'perform',
+              :class_name => self.payload_class,
+              :category => 'OtherTransaction/ResqueJob') do
 
-                yield(*args)
-              end
-            ensure
-              NewRelic::Agent.agent.flush_pipe_data
-            end
-          end
-        end
-      end
-    end
+              NewRelic::Agent::Transaction.merge_untrusted_agent_attributes(
+                args,
+                :'job.resque.args',
+                NewRelic::Agent::AttributeFilter::DST_NONE)
 
-    module NewRelic
-      module Agent
-        module Instrumentation
-          module ResqueInstrumentationInstaller
-            def payload_class
-              klass = super
-              klass.instance_eval do
-                extend ::Resque::Plugins::NewRelicInstrumentation
-              end
+              perform_without_instrumentation
             end
+          ensure
+            NewRelic::Agent.agent.flush_pipe_data
           end
         end
       end
     end
 
-    ::Resque::Job.class_eval do
-      def self.new(*args)
-        super(*args).extend NewRelic::Agent::Instrumentation::ResqueInstrumentationInstaller
-      end
-    end
-
     if NewRelic::LanguageSupport.can_fork?
       ::Resque.before_first_fork do
         NewRelic::Agent.manual_start(:dispatcher   => :resque,

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

@@ -39,7 +39,6 @@ DependencyDetection.defer do
       end
 
       Sequel::Model.plugin :newrelic_instrumentation
-
     else
 
       NewRelic::Agent.logger.info "Sequel instrumentation requires at least version 3.37.0."

data/lib/new_relic/agent/javascript_instrumentor.rb

@@ -104,7 +104,7 @@ module NewRelic
       end
 
       def browser_timing_loader
-        html_safe_if_needed("\n<script type=\"text/javascript\">#{Agent.config[:js_agent_loader]}</script>")
+        html_safe_if_needed("\n<script>#{Agent.config[:js_agent_loader]}</script>")
       end
 
       def browser_timing_config(state)
@@ -114,7 +114,7 @@ module NewRelic
         txn.freeze_name_and_execute_if_not_ignored do
           data = data_for_js_agent(state)
           json = ::JSON.dump(data)
-          return html_safe_if_needed("\n<script type=\"text/javascript\">window.NREUM||(NREUM={});NREUM.info=#{json}</script>")
+          return html_safe_if_needed("\n<script>window.NREUM||(NREUM={});NREUM.info=#{json}</script>")
         end
 
         ''

data/lib/new_relic/agent/method_tracer.rb

@@ -291,7 +291,27 @@ module NewRelic
         #
         # @api public
         #
-        def add_method_tracer(method_name, metric_name_code=nil, options = {})
+        def add_method_tracer(method_name, metric_name_code = nil, options = {})
+          ::NewRelic::Agent.add_or_defer_method_tracer(self, method_name, metric_name_code, options)
+        end
+
+        # For tests only because tracers must be removed in reverse-order
+        # from when they were added, or else other tracers that were added to the same method
+        # may get removed as well.
+        def remove_method_tracer(method_name, metric_name_code) # :nodoc:
+          return unless Agent.config[:agent_enabled]
+          if method_defined? "#{_traced_method_name(method_name, metric_name_code)}"
+            alias_method method_name, "#{_untraced_method_name(method_name, metric_name_code)}"
+            undef_method "#{_traced_method_name(method_name, metric_name_code)}"
+            ::NewRelic::Agent.logger.debug("removed method tracer #{method_name} #{metric_name_code}\n")
+          else
+            raise "No tracer for '#{metric_name_code}' on method '#{method_name}'"
+          end
+        end
+
+        private
+
+        def _add_method_tracer_now(method_name, metric_name_code, options)
           NewRelic::Agent.record_api_supportability_metric(:add_method_tracer)
 
           return unless newrelic_method_exists?(method_name)
@@ -308,24 +328,9 @@ module NewRelic
           send visibility, method_name
           send visibility, _traced_method_name(method_name, metric_name_code)
           ::NewRelic::Agent.logger.debug("Traced method: class = #{derived_class_name},"+
-                    "method = #{method_name}, "+
-                    "metric = '#{metric_name_code}'")
-        end
-
-        # For tests only because tracers must be removed in reverse-order
-        # from when they were added, or else other tracers that were added to the same method
-        # may get removed as well.
-        def remove_method_tracer(method_name, metric_name_code) # :nodoc:
-          return unless Agent.config[:agent_enabled]
-          if method_defined? "#{_traced_method_name(method_name, metric_name_code)}"
-            alias_method method_name, "#{_untraced_method_name(method_name, metric_name_code)}"
-            undef_method "#{_traced_method_name(method_name, metric_name_code)}"
-            ::NewRelic::Agent.logger.debug("removed method tracer #{method_name} #{metric_name_code}\n")
-          else
-            raise "No tracer for '#{metric_name_code}' on method '#{method_name}'"
-          end
+                                         "method = #{method_name}, "+
+                                         "metric = '#{metric_name_code}'")
         end
-        private
 
         # given a method and a metric, this method returns the
         # untraced alias of the method name

data/lib/new_relic/agent/transaction.rb

@@ -566,6 +566,7 @@ module NewRelic
         record_apdex(state, end_time) unless ignore_apdex?
         record_queue_time
         record_client_application_metric state
+        record_distributed_tracing_metrics
 
         record_exceptions
         record_transaction_event

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

@@ -57,6 +57,7 @@ module NewRelic
         end
 
         def merge_custom_attributes(other)
+          return unless Agent.config[:'custom_attributes.enabled']
           return if other.empty?
           AttributeProcessing.flatten_and_coerce(other) do |k, v|
             add_custom_attribute(k, v)

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

@@ -172,6 +172,66 @@ module NewRelic
             self.priority = payload.priority if payload.priority
           end
         end
+
+        ALL_SUFFIX = "all".freeze
+        ALL_WEB_SUFFIX = "allWeb".freeze
+        ALL_OTHER_SUFFIX = "allOther".freeze
+
+        def transaction_type_suffix
+          if Transaction.recording_web_transaction?
+            ALL_WEB_SUFFIX
+          else
+            ALL_OTHER_SUFFIX
+          end
+        end
+
+        def record_distributed_tracing_metrics
+          return unless Agent.config[:'distributed_tracing.enabled']
+
+          record_caller_by_duration_metrics
+          record_transport_duration_metrics
+          record_errors_by_caller_metrics
+        end
+
+        DURATION_BY_CALLER_UNKOWN_PREFIX = "DurationByCaller/Unknown/Unknown/Unknown/Unknown".freeze
+
+        def record_caller_by_duration_metrics
+          prefix = if distributed_trace?
+            payload = distributed_trace_payload
+            "DurationByCaller/#{payload.parent_type}/#{payload.parent_account_id}/#{payload.parent_app_id}/#{payload.caller_transport_type}"
+          else
+            DURATION_BY_CALLER_UNKOWN_PREFIX
+          end
+
+          metrics.record_unscoped "#{prefix}/#{ALL_SUFFIX}",              duration
+          metrics.record_unscoped "#{prefix}/#{transaction_type_suffix}", duration
+        end
+
+        def record_transport_duration_metrics
+          return unless distributed_trace?
+
+          payload = distributed_trace_payload
+          prefix = "TransportDuration/#{payload.parent_type}/#{payload.parent_account_id}/#{payload.parent_app_id}/#{payload.caller_transport_type}"
+
+          metrics.record_unscoped "#{prefix}/#{ALL_SUFFIX}",              transport_duration
+          metrics.record_unscoped "#{prefix}/#{transaction_type_suffix}", transport_duration
+        end
+
+        ERRORS_BY_CALLER_UNKOWN_PREFIX = "ErrorsByCaller/Unknown/Unknown/Unknown/Unknown".freeze
+
+        def record_errors_by_caller_metrics
+          return unless exceptions.size > 0
+
+          prefix = if distributed_trace?
+            payload = distributed_trace_payload
+            "ErrorsByCaller/#{payload.parent_type}/#{payload.parent_account_id}/#{payload.parent_app_id}/#{payload.caller_transport_type}"
+          else
+            ERRORS_BY_CALLER_UNKOWN_PREFIX
+          end
+
+          metrics.record_unscoped "#{prefix}/#{ALL_SUFFIX}",              1
+          metrics.record_unscoped "#{prefix}/#{transaction_type_suffix}", 1
+        end
       end
     end
   end

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

@@ -176,7 +176,6 @@ module NewRelic
 
         def record_metrics
           add_unscoped_metrics
-          record_distributed_tracing_metrics if Agent.config[:'distributed_tracing.enabled']
           super
         end
 
@@ -244,61 +243,6 @@ module NewRelic
           end
         end
 
-        ALL_SUFFIX = "all".freeze
-        ALL_WEB_SUFFIX = "allWeb".freeze
-        ALL_OTHER_SUFFIX = "allOther".freeze
-
-        def transaction_type_suffix
-          if Transaction.recording_web_transaction?
-            ALL_WEB_SUFFIX
-          else
-            ALL_OTHER_SUFFIX
-          end
-        end
-
-        def record_distributed_tracing_metrics
-          add_caller_by_duration_metrics
-          record_transport_duration_metrics
-          record_errors_by_caller_metrics
-        end
-
-        DURATION_BY_CALLER_UNKOWN_PREFIX = "DurationByCaller/Unknown/Unknown/Unknown/Unknown".freeze
-
-        def add_caller_by_duration_metrics
-          prefix = if transaction.distributed_trace?
-            payload = transaction.distributed_trace_payload
-            "DurationByCaller/#{payload.parent_type}/#{payload.parent_account_id}/#{payload.parent_app_id}/transport"
-          else
-            DURATION_BY_CALLER_UNKOWN_PREFIX
-          end
-
-          @unscoped_metrics << "#{prefix}/#{ALL_SUFFIX}"
-          @unscoped_metrics << "#{prefix}/#{transaction_type_suffix}"
-        end
-
-        def record_transport_duration_metrics
-          return unless transaction.distributed_trace?
-          payload = transaction.distributed_trace_payload
-          prefix = "TransportDuration/#{payload.parent_type}/#{payload.parent_account_id}/#{payload.parent_app_id}/transport"
-          metric_cache.record_unscoped "#{prefix}/#{ALL_SUFFIX}", transaction.transport_duration
-          metric_cache.record_unscoped "#{prefix}/#{transaction_type_suffix}", transaction.transport_duration
-        end
-
-        ERRORS_BY_CALLER_UNKOWN_PREFIX = "ErrorsByCaller/Unknown/Unknown/Unknown/Unknown".freeze
-
-        def record_errors_by_caller_metrics
-          return unless transaction.exceptions.size > 0
-          prefix = if transaction.distributed_trace?
-            payload = transaction.distributed_trace_payload
-            "ErrorsByCaller/#{payload.parent_type}/#{payload.parent_account_id}/#{payload.parent_app_id}/transport"
-          else
-            ERRORS_BY_CALLER_UNKOWN_PREFIX
-          end
-
-          NewRelic::Agent.increment_metric "#{prefix}/#{ALL_SUFFIX}"
-          NewRelic::Agent.increment_metric "#{prefix}/#{transaction_type_suffix}"
-        end
-
         def update_segment_name
           if @app_data
             @name = "ExternalTransaction/#{host}/#{cross_process_id}/#{cross_process_transaction_name}"

data/lib/new_relic/version.rb

@@ -11,7 +11,7 @@ module NewRelic
     end
 
     MAJOR = 5
-    MINOR = 0
+    MINOR = 1
     TINY  = 0
 
     begin

data/newrelic_rpm.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.version = NewRelic::VERSION::STRING
   s.required_ruby_version = '>= 2.0.0'
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
-  s.authors = [ "Matthew Wear", "Chris Pine", "Erin Dees" ]
+  s.authors = [ "Matthew Wear", "Chris Pine", "Erin Dees", "Rachel Klein" ]
   s.date = Time.now.strftime('%Y-%m-%d')
   s.licenses    = ['New Relic']
   s.description = <<-EOS

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 5.0.0.342
+  version: 5.1.0.344
 platform: ruby
 authors:
 - Matthew Wear
 - Chris Pine
 - Erin Dees
+- Rachel Klein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-20 00:00:00.000000000 Z
+date: 2018-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -483,7 +484,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: New Relic Ruby Agent