newrelic_rpm 9.1.0 → 9.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86b089be72e8fdf6af07082365c42ecfcbc6cc0c88df45cbac8238dca375af9c
-  data.tar.gz: e41f270e6d423755657678a0211cab7cb2a294d7f514d486b447b4c09c650fd7
+  metadata.gz: 1eb606235173b437a2991d23d5f23b7715ab8025263f134f11454dcadf0bac9e
+  data.tar.gz: 4e468d079bd47f57a7dd2185039dc15f29a139e278b5d133a5a0b08e301f85f0
 SHA512:
-  metadata.gz: f58684a973dd62ac5fb9b50309fd9ffc71ad2d14d2120902c8de8a3c1647abc99c376caeec6955708c5bbbc6989c687b753684523e02a0624dccc0a894285380
-  data.tar.gz: 4e6e538da76646d35f55af94bc037603cf3bb643396a21304ddc887d56d02802cd36a50aaaeafad03ea4c1f579248710919eff2e458b78d610c5820e219d8f34
+  metadata.gz: 11835787018b19326041e1f10f8a72befeb8ba9345e793ceb30e4cbd57b6ffa678da13f833fe05f17148b8beb6e9e77f4dc2ab7eda573ecc4aa62060e71ee05b
+  data.tar.gz: 1f0e60f9d9aef77edd656a6cc55b7e735cfbaf6a7006ed0724303b52d9cbb71bc740899de335ff45bece28f551bb0053a3077fee65863d5c355666c323150ac0

data/.rubocop.yml

@@ -6,7 +6,7 @@ require:
   # Default performance configurations: https://github.com/rubocop/rubocop-performance/blob/master/config/default.yml
   - rubocop-performance
   # Default rake configurations: https://github.com/rubocop/rubocop-rake/blob/master/config/default.yml
-  <%= '- rubocop-rake' if RUBY_VERSION >= '2.4.0' %>
+  - rubocop-rake
 
 AllCops:
   TargetRubyVersion: 2.7
@@ -239,10 +239,6 @@ Layout/ClosingParenthesisIndentation:
 Layout/CommentIndentation:
   Enabled: true
 
-# Disabling for now
-Layout/ConditionPosition:
-  Enabled: false
-
 Layout/DefEndAlignment:
   Enabled: true
   EnforcedStyleAlignWith: start_of_line
@@ -261,19 +257,9 @@ Layout/EmptyComment:
   AllowBorderComment: true
   AllowMarginComment: true
 
-# Disabling for now
-Layout/EmptyLineAfterMagicComment:
-  Enabled: false
-
 Layout/EmptyLineAfterMultilineCondition:
   Enabled: false
 
-# Disabling for now
-Layout/EmptyLineBetweenDefs:
-  Enabled: false
-  # AllowAdjacentOneLineDefs: false
-  # NumberOfEmptyLines: 1
-
 Layout/EmptyLines:
   Enabled: true
 
@@ -362,10 +348,6 @@ Layout/HashAlignment:
 Layout/HeredocArgumentClosingParenthesis:
   Enabled: false
 
-# Disabling for now
-Layout/HeredocIndentation:
-  Enabled: false
-
 Layout/IndentationConsistency:
   Enabled: true
   EnforcedStyle: normal
@@ -505,11 +487,6 @@ Layout/SpaceBeforeFirstArg:
 Layout/SpaceBeforeSemicolon:
   Enabled: true
 
-# Disabling for now
-Layout/SpaceInLambdaLiteral:
-  Enabled: false
-  # EnforcedStyle: require_no_space
-
 Layout/SpaceInsideArrayLiteralBrackets:
   Enabled: true
   EnforcedStyle: no_space
@@ -533,10 +510,6 @@ Layout/SpaceInsideParens:
   Enabled: true
   EnforcedStyle: no_space
 
-# Disabling for now
-Layout/SpaceInsidePercentLiteralDelimiters:
-  Enabled: false
-
 Layout/SpaceInsideRangeLiteral:
   Enabled: true
 
@@ -563,40 +536,24 @@ Lint/AmbiguousAssignment:
 Lint/AmbiguousBlockAssociation:
   Enabled: false
 
-# Disabling for now
-Lint/AmbiguousOperator:
-  Enabled: false
-
 Lint/AmbiguousOperatorPrecedence:
   Enabled: false
 
 Lint/AmbiguousRange:
   Enabled: false
 
-# Disabling for now
-Lint/AmbiguousRegexpLiteral:
-  Enabled: false
-
-# Disabling for now
 Lint/AssignmentInCondition:
   Enabled: false
-  # AllowSafeAssignment: true
 
 Lint/BigDecimalNew:
   Enabled: true
 
-# Disabling for now
 Lint/BinaryOperatorWithIdenticalOperands:
   Enabled: false
 
-# Disabling for now
-Lint/BooleanSymbol:
-  Enabled: false
-
 Lint/CircularArgumentReference:
   Enabled: true
 
-# Disabling for now
 Lint/ConstantDefinitionInBlock:
   Enabled: false
 
@@ -606,10 +563,6 @@ Lint/ConstantResolution:
 Lint/Debugger:
   Enabled: true
 
-# Disabling for now
-Lint/DeprecatedClassMethods:
-  Enabled: false
-
 Lint/DeprecatedConstants:
   Enabled: true
 
@@ -622,20 +575,12 @@ Lint/DisjunctiveAssignmentInConstructor:
 Lint/DuplicateBranch:
   Enabled: false
 
-# Disabling for now
-Lint/DuplicateCaseCondition:
-  Enabled: false
-
 Lint/DuplicateElsifCondition:
   Enabled: true
 
 Lint/DuplicateHashKey:
   Enabled: true
 
-# Disabling for now
-Lint/DuplicateMethods:
-  Enabled: false
-
 Lint/DuplicateRegexpCharacterClassElement:
   Enabled: true
 
@@ -660,11 +605,6 @@ Lint/EmptyClass:
 Lint/EmptyConditionalBody:
   Enabled: false
 
-# Disabling for now
-Lint/EmptyEnsure:
-  Enabled: false
-  # AutoCorrect: true
-
 Lint/EmptyExpression:
   Enabled: true
 
@@ -681,10 +621,6 @@ Lint/EmptyWhen:
   Enabled: true
   AllowComments: true
 
-# Disabling for now
-Lint/EnsureReturn:
-  Enabled: false
-
 Lint/ErbNewArguments:
   Enabled: true
 

data/.simplecov

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'securerandom'
 
 if ENV['CI']

data/Brewfile

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 brew 'elasticsearch'
 brew 'imagemagick'
 brew 'memcached'

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # New Relic Ruby Agent Release Notes
 
+## v9.2.0
+
+  Version 9.2.0 of the agent introduces some performance improvements for working with high numbers of nested actions, and deprecates instrumentation for the `memcached` and `memcache-client` gems (with `dalli` still being supported).
+
+- **Feature: Enhance performance for handling high numbers of nested actions**
+
+  With [Issue#1910](https://github.com/newrelic/newrelic-ruby-agent/issues/1910) community members [@parkerfinch](https://github.com/parkerfinch) and [@travisbell](https://github.com/travisbell) informed us of some CPU spikes and process hangs seen only when using the agent's thread instrumentation, which was enabled by default with v9.0. When thread instrumentation is enabled, instrumented actions taking place within threads are seen and reported on by the agent whereas they would have previously gone unnoticed. This is a great improvement to the agent's usefulness in an async context, and also makes it easier for higher numbers of nested actions to be observed. 
+  For example, if an instrumented background job framework (Sidekiq, Resque) kicks off a job that the agent notices and then that job in turn performs actions such as database queries that the agent also instruments, nested actions are seen. However, with very high (10,000+) numbers of actions nested within a single instrumented outer action, the agent would struggle to efficiently crunch through all of the collected data at the time when the outer action finished. 
+  The agent should now be much more efficient when any observed action with lots of nested actions is finished. Our performance testing was conducted with hundreds of thousands of nested actions taking place, and we hope that the benefits of thread tracing can now be enjoyed without any drawbacks. Thanks very much [@parkerfinch](https://github.com/parkerfinch) and [@travisbell](https://github.com/travisbell)! [PR#1927](https://github.com/newrelic/newrelic-ruby-agent/pull/1927)
+
+- **Feature: Deprecate memcached and memcache-client instrumentation**
+
+  Instrumentation for the memcached and memcache-client libraries is deprecated and will be removed during the next major release.
+
 ## v9.1.0
 
   Version 9.1.0 of the agent delivers support for two new [errors inbox](https://docs.newrelic.com/docs/errors-inbox/errors-inbox/) features: error fingerprinting and user tracking, identifies the Amazon Timestream data store, removes Distributed Tracing warnings from agent logs when using Sidekiq, fixes bugs, and is tested against the recently released JRuby 9.4.2.0.

data/Guardfile

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require './test/multiverse/lib/multiverse/bundler_patch'
 
 test_folders = Dir.glob('test/new_relic/*').select { |f| File.directory?(f) }

data/bin/newrelic

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
+
 # executes one of the commands in the new_relic/commands directory
 # pass the name of the command as an argument
 

data/bin/newrelic_cmd

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
+
 # This command has been renamed "newrelic"
 # executes one of the commands in the new_relic/commands directory
 # pass the name of the command as an argument

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

@@ -14,30 +14,6 @@ module NewRelic
         end
       end
 
-      # Combines potentially two properties into one.
-      # Given the example:
-      #    :disable_net_http and :prepend_net_instrumentation
-      #    if :disable_net_http is true, then returned value is "disabled"
-      #    if :prepend_net_instrumentation is false, then returned value is "chain"
-      #    otherwise, "auto" is returned.
-      #
-      # Intent is:
-      #     - if user sets disable_xxx property, then don't instrument
-      #     - if user set prepend to `false` then we use method_alias chaining
-      #     - auto, when returned means, try to use prepend unless conflicting gems discovered
-      #
-      def self.instrumentation_value_of(disable_key, prepend_key = nil)
-        proc do
-          if NewRelic::Agent.config[disable_key]
-            'disabled'
-          elsif prepend_key && !NewRelic::Agent.config[prepend_key]
-            'chain'
-          else
-            'auto'
-          end
-        end
-      end
-
       def self.instrumentation_value_from_boolean(key)
         proc do
           NewRelic::Agent.config[key] ? 'auto' : 'disabled'
@@ -1373,7 +1349,7 @@ module NewRelic
           :description => 'Controls auto-instrumentation of Grape at start up.  May be one of [auto|prepend|chain|disabled].'
         },
         :'instrumentation.grpc_client' => {
-          :default => instrumentation_value_of(:disable_grpc_client),
+          :default => 'auto',
           :documentation_default => 'auto',
           :public => true,
           :type => String,
@@ -1390,7 +1366,7 @@ module NewRelic
           :description => %Q(Specifies a list of hostname patterns separated by commas that will match gRPC hostnames that traffic is to be ignored by New Relic for. New Relic's gRPC client instrumentation will ignore traffic streamed to a host matching any of these patterns, and New Relic's gRPC server instrumentation will ignore traffic for a server running on a host whose hostname matches any of these patterns. By default, no traffic is ignored when gRPC instrumentation is itself enabled. For example, "private.com$,exception.*")
         },
         :'instrumentation.grpc_server' => {
-          :default => instrumentation_value_of(:disable_grpc_server),
+          :default => 'auto',
           :documentation_default => 'auto',
           :public => true,
           :type => String,
@@ -1443,7 +1419,7 @@ module NewRelic
           :description => 'Controls auto-instrumentation of memcached gem for Memcache at start up.  May be one of [auto|prepend|chain|disabled].'
         },
         :'instrumentation.memcache_client' => {
-          :default => instrumentation_value_of(:disable_memcache_client),
+          :default => 'auto',
           :documentation_default => 'auto',
           :public => true,
           :type => String,

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

@@ -27,9 +27,9 @@ DependencyDetection.defer do
         actions = [:authorize, :purchase, :credit, :void, :capture, :recurring, :store, :unstore, :update]
         actions.each do |operation|
           if implemented_methods.include?(operation)
-            add_method_tracer operation, [-> (*) { "ActiveMerchant/gateway/#{gateway_name}/#{operation}" },
-              -> (*) { "ActiveMerchant/gateway/#{gateway_name}" },
-              -> (*) { "ActiveMerchant/operation/#{operation}" }]
+            add_method_tracer operation, [->(*) { "ActiveMerchant/gateway/#{gateway_name}/#{operation}" },
+              ->(*) { "ActiveMerchant/gateway/#{gateway_name}" },
+              ->(*) { "ActiveMerchant/operation/#{operation}" }]
           end
         end
       end

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

@@ -3,7 +3,7 @@
 # frozen_string_literal: true
 
 module NewRelic::Agent::Instrumentation
-  module Bunny
+  module Bunny::Chain
     def self.instrument!
       ::Bunny::Exchange.class_eval do
         include NewRelic::Agent::Instrumentation::Bunny::Exchange

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

@@ -26,7 +26,7 @@ DependencyDetection.defer do
       prepend_instrument Bunny::Queue, NewRelic::Agent::Instrumentation::Bunny::Prepend::Queue
       prepend_instrument Bunny::Consumer, NewRelic::Agent::Instrumentation::Bunny::Prepend::Consumer
     else
-      chain_instrument NewRelic::Agent::Instrumentation::Bunny
+      chain_instrument NewRelic::Agent::Instrumentation::Bunny::Chain
     end
   end
 end

data/lib/new_relic/agent/instrumentation/delayed_job/chain.rb

@@ -1,6 +1,7 @@
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 # frozen_string_literal: true
+
 require_relative 'instrumentation'
 
 module NewRelic::Agent::Instrumentation

data/lib/new_relic/agent/instrumentation/elasticsearch/chain.rb

@@ -3,7 +3,7 @@
 # frozen_string_literal: true
 
 module NewRelic::Agent::Instrumentation
-  module Elasticsearch
+  module Elasticsearch::Chain
     def self.instrument!
       to_instrument = if ::Gem::Version.create(::Elasticsearch::VERSION) <
           ::Gem::Version.create('8.0.0')

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

@@ -1,6 +1,7 @@
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 # frozen_string_literal: true
+
 require_relative '../../datastores/nosql_obfuscator'
 
 module NewRelic::Agent::Instrumentation

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

@@ -25,7 +25,7 @@ DependencyDetection.defer do
     if use_prepend?
       prepend_instrument to_instrument, NewRelic::Agent::Instrumentation::Elasticsearch::Prepend
     else
-      chain_instrument NewRelic::Agent::Instrumentation::Elasticsearch
+      chain_instrument NewRelic::Agent::Instrumentation::Elasticsearch::Chain
     end
   end
 end

data/lib/new_relic/agent/instrumentation/fiber/chain.rb

@@ -3,7 +3,7 @@
 # frozen_string_literal: true
 
 module NewRelic::Agent::Instrumentation
-  module MonitoredFiber
+  module MonitoredFiber::Chain
     def self.instrument!
       ::Fiber.class_eval do
         include NewRelic::Agent::Instrumentation::MonitoredFiber

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

@@ -19,7 +19,7 @@ DependencyDetection.defer do
     if use_prepend?
       prepend_instrument Fiber, NewRelic::Agent::Instrumentation::MonitoredFiber::Prepend
     else
-      chain_instrument NewRelic::Agent::Instrumentation::MonitoredFiber
+      chain_instrument NewRelic::Agent::Instrumentation::MonitoredFiber::Chain
     end
   end
 end

data/lib/new_relic/agent/instrumentation/grpc/client/chain.rb

@@ -1,6 +1,6 @@
-# frozen_string_literal: true
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
 
 require_relative 'instrumentation'
 

data/lib/new_relic/agent/instrumentation/grpc/client/instrumentation.rb

@@ -1,6 +1,6 @@
-# frozen_string_literal: true
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
 
 require_relative 'request_wrapper'
 require_relative '../helper'

data/lib/new_relic/agent/instrumentation/grpc/client/prepend.rb

@@ -1,6 +1,6 @@
-# frozen_string_literal: true
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
 
 require_relative 'instrumentation'
 

data/lib/new_relic/agent/instrumentation/grpc/client/request_wrapper.rb

@@ -1,6 +1,6 @@
-# frozen_string_literal: true
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
 
 module NewRelic
   module Agent

data/lib/new_relic/agent/instrumentation/grpc/server/instrumentation.rb

@@ -1,6 +1,6 @@
-# frozen_string_literal: true
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
 
 require_relative '../helper'
 

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

@@ -1,6 +1,6 @@
-# frozen_string_literal: true
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
 
 require_relative 'grpc/client/chain'
 require_relative 'grpc/client/prepend'

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

@@ -1,6 +1,6 @@
-# frozen_string_literal: true
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
 
 require_relative 'grpc/server/chain'
 require_relative 'grpc/server/rpc_server_prepend'

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

@@ -58,7 +58,9 @@ module NewRelic
             end.class_eval do
               include NewRelic::Agent::Instrumentation::Memcache::Tracer
 
-              # TODO: Dalli - 3.1.0 renamed send_multiget to pipelined_get, but the method is otherwise the same
+              # TODO: MAJOR VERSION
+              # Dalli - 3.1.0 renamed send_multiget to pipelined_get, but the method is otherwise the same
+              # Once we no longer support Dalli < 3.1.0, remove this conditional logic
               if Gem::Version.new(::Dalli::VERSION) >= Gem::Version.new('3.1.0')
                 alias_method(:pipelined_get_without_newrelic_trace, :pipelined_get)
                 def pipelined_get(keys)

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

@@ -84,7 +84,9 @@ module NewRelic::Agent::Instrumentation
           extend Helper
           include NewRelic::Agent::Instrumentation::Memcache::Tracer
 
-          # TODO: Dalli - 3.1.0 renamed send_multiget to pipelined_get, but the method is otherwise the same
+          # TODO: MAJOR VERSION
+          # Dalli - 3.1.0 renamed send_multiget to pipelined_get, but the method is otherwise the same
+          # Once we no longer support Dalli < 3.1.0, remove this conditional logic
           if Gem::Version.new(::Dalli::VERSION) >= Gem::Version.new('3.1.0')
             def pipelined_get(keys)
               send_multiget_with_newrelic_tracing(keys) { super }

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

@@ -58,7 +58,7 @@ DependencyDetection.defer do
         prepend_instrument client_class, instrumenting_module, 'MemcachedDalli'
       end
     else
-      chain_instrument NewRelic::Agent::Instrumentation::Memcache::Dalli
+      chain_instrument NewRelic::Agent::Instrumentation::Memcache::Dalli, 'MemcachedDalli'
     end
   end
 end
@@ -81,7 +81,7 @@ DependencyDetection.defer do
         prepend_instrument client_class, instrumenting_module, 'MemcachedDalliCAS'
       end
     else
-      chain_instrument NewRelic::Agent::Instrumentation::Memcache::DalliCAS
+      chain_instrument NewRelic::Agent::Instrumentation::Memcache::DalliCAS, 'MemcachedDalliCAS'
     end
   end
 end

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

@@ -21,7 +21,7 @@ module NewRelic
           end
         end
 
-        ERROR_KEYS = %w[ writeErrors writeConcernError writeConcernErrors ].freeze
+        ERROR_KEYS = %w[writeErrors writeConcernError writeConcernErrors].freeze
 
         def error_key_present?(event)
           if reply = event.reply

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

@@ -1,6 +1,7 @@
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 # frozen_string_literal: true
+
 require_relative 'sidekiq/client'
 require_relative 'sidekiq/server'
 require_relative 'sidekiq/extensions/delayed_class'

data/lib/new_relic/agent/method_tracer.rb

@@ -134,7 +134,7 @@ module NewRelic
           #  Foo._nr_default_metric_name_code('bar') #=> "Custom/#{Foo.name}/bar"
           def _nr_default_metric_name(method_name)
             class_name = _nr_derived_class_name
-            -> (*) { "Custom/#{class_name}/#{method_name}" }
+            ->(*) { "Custom/#{class_name}/#{method_name}" }
           end
 
           # Checks to see if the method we are attempting to trace

data/lib/new_relic/agent/new_relic_service.rb

@@ -462,7 +462,6 @@ module NewRelic
              Net::HTTPRequestURITooLong,
              Net::HTTPUnsupportedMediaType,
              Net::HTTPExpectationFailed,
-             Net::HTTPUnsupportedMediaType,
              Net::HTTPRequestHeaderFieldsTooLarge
           handle_unrecoverable_server_exception(response, endpoint)
         when Net::HTTPConflict,

data/lib/new_relic/agent/sampler.rb

@@ -1,6 +1,7 @@
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 # frozen_string_literal: true
+
 #
 # A Sampler is used to capture meaningful metrics in a background thread
 # periodically.  They will be invoked about once a minute, each time the agent

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

@@ -2,7 +2,6 @@
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 # frozen_string_literal: true
 
-require 'new_relic/agent/range_extensions'
 require 'new_relic/agent/guid_generator'
 
 module NewRelic
@@ -105,38 +104,6 @@ module NewRelic
           @start_time.to_f..@end_time.to_f
         end
 
-        def timings_overlap?(timing1, timing2)
-          (timing1.first >= timing2.first && timing1.first <= timing2.last) ||
-            (timing2.first >= timing1.first && timing2.first <= timing1.last)
-        end
-
-        def merge_timings(timing1, timing2)
-          [([timing1.first, timing2.first].min),
-            ([timing1.last, timing2.last].max)]
-        end
-
-        # @children_timings is an array of array, with each inner array
-        # holding exactly 2 values, a child segment's start time and finish
-        # time (in that order). When it's time to record, these timings are
-        # converted into an array of range objects (using the same start and
-        # end values as the original array). Any two range objects that
-        # intersect and merged into a larger range. This checking for a
-        # intersections and merging of ranges is expensive, so the operation
-        # is only done at recording time.
-        def children_time_ranges
-          @children_time_ranges ||= begin
-            overlapped = @children_timings.each_with_object([]) do |timing, timings|
-              i = timings.index { |t| timings_overlap?(t, timing) }
-              if i
-                timings[i] = merge_timings(timing, timings[i])
-              else
-                timings << timing
-              end
-            end
-            overlapped.map { |t| Range.new(t.first, t.last) }
-          end
-        end
-
         def children_time_ranges?
           !@children_timings.empty?
         end
@@ -299,12 +266,6 @@ module NewRelic
         end
 
         def record_exclusive_duration
-          overlapping_duration = if children_time_ranges?
-            RangeExtensions.compute_overlap(time_range, children_time_ranges)
-          else
-            0.0
-          end
-
           @exclusive_duration = duration - children_time - overlapping_duration
           transaction.total_time += @exclusive_duration
           params[:exclusive_duration_millis] = @exclusive_duration * 1000 if transaction.async?
@@ -314,6 +275,51 @@ module NewRelic
           transaction.metrics
         end
 
+        def ranges_intersect?(r1, r2)
+          r1.begin > r2.begin ? r2.cover?(r1.begin) : r1.cover?(r2.begin)
+        end
+
+        def range_overlap(range)
+          return 0.0 unless ranges_intersect?(range, time_range)
+
+          [range.end, time_range.end].min - [range.begin, time_range.begin].max
+        end
+
+        # Child segments operating concurrently with this segment may have
+        # start and end times that overlap with this segment's own times. The
+        # amount of overlap needs to be removed from the `children_time` total
+        # when calculating an `@exclusive_duration` value to be added to the
+        # transaction's total time.
+        #
+        # If there aren't any child segments, return 0.0. Otherwise, take the
+        # `@children_timings` array of arrays (each array holds a child
+        # segment's start time and end time), sort it by the first elements
+        # (start times), and use the start and finish times to create Range
+        # objects. Combine all of the child segment ranges that overlap with
+        # one another into new bigger ranges. Then take those bigger ranges
+        # and calculate how much overlap there is between them and this
+        # segment's own time range. Keep a running sum of all of the overlap
+        # amounts and then return it.
+        def overlapping_duration
+          sum = 0.0
+          return sum unless children_time_ranges?
+
+          @children_timings.sort_by!(&:first)
+          range = Range.new(*@children_timings.first)
+          (1..(@children_timings.size - 1)).each do |i|
+            possible = Range.new(*@children_timings[i])
+
+            if ranges_intersect?(range, possible)
+              range = range.begin..possible.end
+            else
+              sum += range_overlap(range)
+              range = possible
+            end
+          end
+
+          sum += range_overlap(range)
+        end
+
         def transaction_state
           @transaction_state ||= if @transaction
             transaction.state

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

@@ -119,14 +119,13 @@ module NewRelic
         end
 
         def check_required_fields_present(payload)
-          if \
-            !payload.version.nil? &&
-                !payload.parent_account_id.nil? &&
-                !payload.parent_app_id.nil? &&
-                !payload.parent_type.nil? &&
-                (!payload.transaction_id.nil? || !payload.id.nil?) &&
-                !payload.trace_id.nil? &&
-                !payload.timestamp.nil?
+          if !payload.version.nil? &&
+              !payload.parent_account_id.nil? &&
+              !payload.parent_app_id.nil? &&
+              !payload.parent_type.nil? &&
+              (!payload.transaction_id.nil? || !payload.id.nil?) &&
+              !payload.trace_id.nil? &&
+              !payload.timestamp.nil?
 
             true
           else

data/lib/new_relic/version.rb

@@ -6,7 +6,7 @@
 module NewRelic
   module VERSION # :nodoc:
     MAJOR = 9
-    MINOR = 1
+    MINOR = 2
     TINY = 0
 
     STRING = "#{MAJOR}.#{MINOR}.#{TINY}"

data/lib/tasks/coverage_report.rake

@@ -1,6 +1,6 @@
-# frozen_string_literal: true
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
 
 if ENV['CI']
   namespace :coverage do

data/lib/tasks/instrumentation_generator/instrumentation.thor

@@ -97,14 +97,14 @@ class Instrumentation < Thor
 
   def config_block(name)
     <<~CONFIG
-        :'instrumentation.#{name.downcase}' => {
-          :default => 'auto',
-          :public => true,
-          :type => String,
-          :dynamic_name => true,
-          :allowed_from_server => false,
-          :description => 'Controls auto-instrumentation of the #{name} library at start up. May be one of [auto|prepend|chain|disabled].'
-        },
+      :'instrumentation.#{name.downcase}' => {
+        :default => 'auto',
+        :public => true,
+        :type => String,
+        :dynamic_name => true,
+        :allowed_from_server => false,
+        :description => 'Controls auto-instrumentation of the #{name} library at start up. May be one of [auto|prepend|chain|disabled].'
+      },
     CONFIG
   end
 

data/lib/tasks/instrumentation_generator/templates/chain.tt

@@ -3,7 +3,7 @@
 # frozen_string_literal: true
 
 module NewRelic::Agent::Instrumentation
-  module <%= @class_name %>
+  module <%= @class_name %>::Chain
     def self.instrument!
       ::<%= @class_name %>.class_eval do
         include NewRelic::Agent::Instrumentation::<%= @class_name %>

data/lib/tasks/instrumentation_generator/templates/dependency_detection.tt

@@ -23,7 +23,7 @@ DependencyDetection.defer do
     if use_prepend?
       prepend_instrument ::<%= @class_name %>, NewRelic::Agent::Instrumentation::<%= @class_name %>::Prepend
     else
-      chain_instrument NewRelic::Agent::Instrumentation::<%= @class_name %>
+      chain_instrument NewRelic::Agent::Instrumentation::<%= @class_name %>::Chain
     end
   end
 end

data/lib/tasks/multiverse.rb

@@ -1,6 +1,7 @@
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 # frozen_string_literal: true
+
 #
 # Rake task for running Ruby agent multiverse tests. This file may be required
 # from third party gems. It is also used by the agent itself to run multiverse.

data/lib/tasks/newrelic.rb

@@ -1,6 +1,7 @@
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 # frozen_string_literal: true
+
 #
 # If you are looking to instrument rake tasks in a Rails environment, but the
 # task doesn't depend on :environment, this task may be included to ensure that

data/newrelic.yml

@@ -545,7 +545,7 @@ common: &default_settings
   # slow_sql.enabled: false
 
   # If true, the agent collects explain plans in slow SQL queries. If this setting
-  # is omitted, the transaction_tracer.explain.enabled setting will be applied as
+  # is omitted, the transaction_tracer.explain_enabled setting will be applied as
   # the default setting for explain plans in slow SQL as well.
   # slow_sql.explain_enabled: false
 
@@ -639,13 +639,13 @@ common: &default_settings
   # transaction_tracer.enabled: true
 
   # Threshold (in seconds) above which the agent will collect explain plans.
-  # Relevant only when explain.enabled is true.
+  # Relevant only when explain_enabled is true.
   # transaction_tracer.explain_threshold: 0.5
 
   # If true, enables the collection of explain plans in transaction traces.
   # This setting will also apply to explain plans in slow SQL traces if
   # slow_sql.explain enabled is not set separately.
-  # transaction_tracer.explain.enabled:  true
+  # transaction_tracer.explain_enabled:  true
 
   # Maximum number of transaction trace nodes to record in a single transaction
   # trace.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 9.1.0
+  version: 9.2.0
 platform: ruby
 authors:
 - Tanna McClure
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-30 00:00:00.000000000 Z
+date: 2023-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -83,6 +83,76 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 12.3.3
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.44.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.44.1
+- !ruby/object:Gem::Dependency
+  name: rubocop-ast
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.24.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.24.1
+- !ruby/object:Gem::Dependency
+  name: rubocop-minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.27.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.27.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.16.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.16.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -439,7 +509,6 @@ files:
 - lib/new_relic/agent/pipe_service.rb
 - lib/new_relic/agent/prepend_supportability.rb
 - lib/new_relic/agent/priority_sampled_buffer.rb
-- lib/new_relic/agent/range_extensions.rb
 - lib/new_relic/agent/rules_engine.rb
 - lib/new_relic/agent/rules_engine/replacement_rule.rb
 - lib/new_relic/agent/rules_engine/segment_terms_rule.rb
@@ -600,7 +669,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: New Relic Ruby Agent

data/lib/new_relic/agent/range_extensions.rb

@@ -1,27 +0,0 @@
-# This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
-# frozen_string_literal: true
-
-module NewRelic
-  module Agent
-    module RangeExtensions
-      module_function
-
-      def intersects?(r1, r2)
-        r1.begin > r2.begin ? r2.cover?(r1.begin) : r1.cover?(r2.begin)
-      end
-
-      # Computes the amount of overlap between range and an array of ranges.
-      # For efficiency, it assumes that range intersects with each of the
-      # ranges in the ranges array.
-      def compute_overlap(range, ranges)
-        ranges.inject(0) do |memo, other|
-          next memo unless intersects?(range, other)
-
-          memo += ([range.end, other.end].min) -
-            ([range.begin, other.begin].max)
-        end
-      end
-    end
-  end
-end