newrelic_rpm 9.1.0 → 9.2.1

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/tracer.rb

@@ -424,7 +424,7 @@ module NewRelic
           current_txn = ::Thread.current[:newrelic_tracer_state]&.current_transaction if ::Thread.current[:newrelic_tracer_state]&.is_execution_traced?
           proc do
             begin
-              if current_txn
+              if current_txn && !current_txn.finished?
                 NewRelic::Agent::Tracer.state.current_transaction = current_txn
                 current_txn.async = true
                 segment_name += "/Thread#{::Thread.current.object_id}/Fiber#{::Fiber.current.object_id}" if NewRelic::Agent.config[:'thread_ids_enabled']

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/agent/transaction/tracing.rb

@@ -29,6 +29,12 @@ module NewRelic
           else
             segment.record_on_finish = true
             ::NewRelic::Agent.logger.debug("Segment limit of #{segment_limit} reached, ceasing collection.")
+
+            if finished?
+              ::NewRelic::Agent.logger.debug("Transaction #{best_name} has finished but segments still being created, resetting state.")
+              NewRelic::Agent::Tracer.state.reset
+              NewRelic::Agent.record_metric('Supportability/Transaction/SegmentLimitReachedAfterFinished/ResetState', 1)
+            end
           end
           segment.transaction_assigned
         end

data/lib/new_relic/agent/transaction.rb

@@ -439,6 +439,10 @@ module NewRelic
         segments.first
       end
 
+      def finished?
+        initial_segment.finished?
+      end
+
       def create_initial_segment(options = {})
         segment = create_segment(@default_name, options)
         segment.record_scoped_metric = false

data/lib/new_relic/control/instrumentation.rb

@@ -62,7 +62,6 @@ module NewRelic
           File.join(instrumentation_path, app.to_s, '*.rb')
         @instrumentation_files.each { |pattern| load_instrumentation_files(pattern) }
         DependencyDetection.detect!
-        ruby_deprecation
         rails_32_deprecation
         ::NewRelic::Agent.logger.info('Finished instrumentation')
       end
@@ -81,19 +80,6 @@ module NewRelic
       )
     end
 
-    def ruby_deprecation
-      return unless RUBY_VERSION < '2.4.0'
-
-      deprecation_msg = 'The Ruby Agent is dropping support for Rubies below 2.4 ' \
-        'in version 9.0.0. Please upgrade your Ruby version to continue receiving support. ' \
-
-      ::NewRelic::Agent.logger.log_once(
-        :warn,
-        :deprecated_ruby_version,
-        deprecation_msg
-      )
-    end
-
     include Instrumentation
   end
 end

data/lib/new_relic/dependency_detection.rb

@@ -179,6 +179,15 @@ module DependencyDetection
       return valid_value
     end
 
+    # update any :auto config value to be either :prepend or :chain after auto
+    # determination has selected one of those to use
+    def update_config_value(use_prepend)
+      if config_key && auto_configured?
+        NewRelic::Agent.config.instance_variable_get(:@cache)[config_key] = use_prepend ? :prepend : :chain
+      end
+      use_prepend
+    end
+
     def config_value
       return AUTO_CONFIG_VALUE unless config_key
 
@@ -202,7 +211,7 @@ module DependencyDetection
     end
 
     def use_prepend?
-      prepend_configured? || (auto_configured? && !prepend_conflicts?)
+      update_config_value(prepend_configured? || (auto_configured? && !prepend_conflicts?))
     end
 
     def prepend_conflicts?

data/lib/new_relic/version.rb

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

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

@@ -352,7 +352,7 @@ common: &default_settings
 
   # Controls auto-instrumentation of Excon at start up.
   # May be one of [enabled|disabled].
-  # instrumentation.excon: auto
+  # instrumentation.excon: enabled
 
   # Controls auto-instrumentation of Grape at start up.
   # May be one of [auto|prepend|chain|disabled].
@@ -388,7 +388,7 @@ common: &default_settings
 
   # Controls auto-instrumentation of Mongo at start up.
   # May be one of [enabled|disabled].
-  # instrumentation.mongo: auto
+  # instrumentation.mongo: enabled
 
   # Controls auto-instrumentation of Net::HTTP at start up.
   # May be one of [auto|prepend|chain|disabled].
@@ -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.1
 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-05-01 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