newrelic_rpm 9.0.0 → 9.2.0

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.
@@ -39,12 +40,14 @@ require_relative 'helpers/removers'
 include Removers
 
 namespace :test do
-  desc "Run functional test suite for New Relic"
+  desc 'Run functional test suite for New Relic'
   task :multiverse, [:suite, :param1, :param2, :param3, :param4] => ['multiverse:env'] do |_, args|
     Multiverse::Runner.run(args.suite, Multiverse::Runner.parse_args(args))
   end
 
   namespace :multiverse do
+    # task :prerequisites
+
     task :env do
       # ENV['SUITES_DIRECTORY'] = File.expand_path('../../test/multiverse/suites', __FILE__)
       require File.expand_path('../../../test/multiverse/lib/multiverse', __FILE__)
@@ -56,22 +59,26 @@ namespace :test do
       remove_generated_gemfile_lockfiles
     end
 
-    desc "Clean cached gemfiles from Bundler.bundle_path"
+    desc 'Clean cached gemfiles from Bundler.bundle_path'
     task :clean_gemfile_cache do
       glob = File.expand_path('multiverse-cache/Gemfile.*.lock', Bundler.bundle_path)
       File.delete(*Dir[glob])
     end
 
-    desc "Test the multiverse testing framework by executing tests in test/multiverse/test. Get meta with it."
+    desc 'Test the multiverse testing framework by executing tests in test/multiverse/test. Get meta with it.'
     task :self, [:suite, :mode] do |_, args|
-      args.with_defaults(:suite => "", :mode => "")
-      puts ("Testing the multiverse testing framework...")
+      args.with_defaults(:suite => '', :mode => '')
+      puts ('Testing the multiverse testing framework...')
       test_files = FileList['test/multiverse/test/*_test.rb']
-      ruby test_files.join(" ")
+      ruby test_files.join(' ')
     end
 
     task :prime, [:suite] => [:env] do |_, args|
       Multiverse::Runner.prime(args.suite, Multiverse::Runner.parse_args(args))
     end
+
+    task :gem_manifest => :env do
+      Multiverse::GemManifest.new.report
+    end
   end
 end

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/lib/tasks/tests.rake

@@ -13,19 +13,19 @@ end
 if defined? Rake::TestTask
   namespace :test do
     tasks = Rake.application.top_level_tasks
-    ENV["TESTOPTS"] ||= ""
-    if tasks.any? { |t| t.include?("verbose") }
-      ENV["TESTOPTS"] += " -v"
+    ENV['TESTOPTS'] ||= ''
+    if tasks.any? { |t| t.include?('verbose') }
+      ENV['TESTOPTS'] += ' -v'
     end
     if seed = look_for_seed(tasks)
-      ENV["TESTOPTS"] += " --" + seed
+      ENV['TESTOPTS'] += ' --' + seed
     end
 
     agent_home = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
 
     Rake::TestTask.new(:newrelic) do |t|
-      file_pattern = ENV["file"]
-      file_pattern = file_pattern.split(",").map { |f| "#{agent_home}/#{f}".gsub("//", "/") } if file_pattern
+      file_pattern = ENV['file']
+      file_pattern = file_pattern.split(',').map { |f| "#{agent_home}/#{f}".gsub('//', '/') } if file_pattern
       file_pattern ||= "#{agent_home}/test/new_relic/**/*_test.rb"
 
       t.libs << "#{agent_home}/test"

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.

data/newrelic_rpm.gemspec

@@ -6,11 +6,11 @@ require 'new_relic/version'
 require 'new_relic/latest_changes'
 
 Gem::Specification.new do |s|
-  s.name = "newrelic_rpm"
+  s.name = 'newrelic_rpm'
   s.version = NewRelic::VERSION::STRING
   s.required_ruby_version = '>= 2.4.0'
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to?(:required_rubygems_version=)
-  s.authors = ["Tanna McClure", "Kayla Reopelle", "James Bunch", "Hannah Ramadan"]
+  s.required_rubygems_version = Gem::Requirement.new('> 1.3.1') if s.respond_to?(:required_rubygems_version=)
+  s.authors = ['Tanna McClure', 'Kayla Reopelle', 'James Bunch', 'Hannah Ramadan']
   s.licenses = ['Apache-2.0']
   s.description = <<~EOS
     New Relic is a performance management system, developed by New Relic,
@@ -20,14 +20,14 @@ Gem::Specification.new do |s|
     Gem or plugin, hosted on
     https://github.com/newrelic/newrelic-ruby-agent/
   EOS
-  s.email = "support@newrelic.com"
+  s.email = 'support@newrelic.com'
   s.executables = %w[newrelic_cmd newrelic nrdebug]
   s.extra_rdoc_files = [
-    "CHANGELOG.md",
-    "LICENSE",
-    "README.md",
-    "CONTRIBUTING.md",
-    "newrelic.yml"
+    'CHANGELOG.md',
+    'LICENSE',
+    'README.md',
+    'CONTRIBUTING.md',
+    'newrelic.yml'
   ]
 
   s.metadata = {
@@ -35,7 +35,7 @@ Gem::Specification.new do |s|
     'changelog_uri' => 'https://github.com/newrelic/newrelic-ruby-agent/blob/main/CHANGELOG.md',
     'documentation_uri' => 'https://docs.newrelic.com/docs/agents/ruby-agent',
     'source_code_uri' => 'https://github.com/newrelic/newrelic-ruby-agent',
-    "homepage_uri" => "https://newrelic.com/ruby"
+    'homepage_uri' => 'https://newrelic.com/ruby'
   }
 
   file_list = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|infinite_tracing|\.github)/(?!agent_helper.rb)}) }
@@ -43,9 +43,9 @@ Gem::Specification.new do |s|
   file_list << build_file_path if File.exist?(build_file_path)
   s.files = file_list
 
-  s.homepage = "https://github.com/newrelic/rpm"
-  s.require_paths = ["lib"]
-  s.summary = "New Relic Ruby Agent"
+  s.homepage = 'https://github.com/newrelic/rpm'
+  s.require_paths = ['lib']
+  s.summary = 'New Relic Ruby Agent'
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'feedjira', '3.2.1' unless ENV['CI'] || RUBY_VERSION < '2.5' # for Gabby
   s.add_development_dependency 'httparty' unless ENV['CI'] # for perf tests and Gabby

data/test/agent_helper.rb

@@ -111,7 +111,8 @@ end
 def assert_log_contains(log, message)
   lines = log.array
 
-  assert (lines.any? { |line| line.match(message) })
+  assert (lines.any? { |line| line.match(message) }),
+    "Could not find message. Log contained: #{lines.join("\n")}"
 end
 
 def assert_audit_log_contains(audit_log_contents, needle)
@@ -147,7 +148,7 @@ def assert_audit_log_contains_object(audit_log_contents, o, format = :json)
     end
   when NilClass
 
-    assert_audit_log_contains(audit_log_contents, format == :json ? "null" : "nil")
+    assert_audit_log_contains(audit_log_contents, format == :json ? 'null' : 'nil')
   else
     assert_audit_log_contains(audit_log_contents, o.inspect)
   end
@@ -182,7 +183,7 @@ def _normalize_metric_expectations(expectations)
 end
 
 def dump_stats(stats)
-  str = String.new("  Call count:           #{stats.call_count}\n")
+  str = +"  Call count:           #{stats.call_count}\n"
   str << "  Total call time:      #{stats.total_call_time}\n"
   str << "  Total exclusive time: #{stats.total_exclusive_time}\n"
   str << "  Min call time:        #{stats.min_call_time}\n"
@@ -379,8 +380,8 @@ end
 #   in_transaction('foobar', :category => :controller) { ... }
 #
 def in_transaction(*args, &blk)
-  opts = args.last && args.last.is_a?(Hash) ? args.pop : {}
-  category = (opts && opts.delete(:category)) || :other
+  opts = args.last&.is_a?(Hash) ? args.pop : {}
+  category = (opts&.delete(:category)) || :other
 
   # At least one test passes `:transaction_name => nil`, so handle it gently
   name = opts.key?(:transaction_name) ? opts.delete(:transaction_name) : args.first || 'dummy'
@@ -434,10 +435,10 @@ def capture_segment_with_error
     segment_with_error = nil
     with_segment do |segment|
       segment_with_error = segment
-      raise "oops!"
+      raise 'oops!'
     end
   rescue Exception => exception
-    assert segment_with_error, "expected to have a segment_with_error"
+    assert segment_with_error, 'expected to have a segment_with_error'
     build_deferred_error_attributes(segment_with_error)
     return segment_with_error, exception
   end
@@ -476,7 +477,7 @@ end
 def last_transaction_trace_request_params
   agent_attributes = attributes_for(last_transaction_trace, :agent)
   agent_attributes.inject({}) do |memo, (key, value)|
-    memo[key] = value if key.to_s.start_with?("request.parameters.")
+    memo[key] = value if key.to_s.start_with?('request.parameters.')
     memo
   end
 end
@@ -671,7 +672,7 @@ def undefine_constant(constant_symbol)
   const_str = constant_symbol.to_s
   parent = get_parent(const_str)
   const_name = const_str.gsub(/.*::/, '')
-  return yield unless parent && parent.constants.include?(const_name.to_sym)
+  return yield unless parent&.constants&.include?(const_name.to_sym)
 
   removed_constant = parent.send(:remove_const, const_name)
   yield
@@ -693,13 +694,13 @@ ensure
 end
 
 def create_agent_command(args = {})
-  NewRelic::Agent::Commands::AgentCommand.new([-1, {"name" => "command_name", "arguments" => args}])
+  NewRelic::Agent::Commands::AgentCommand.new([-1, {'name' => 'command_name', 'arguments' => args}])
 end
 
 def wait_for_backtrace_service_poll(opts = {})
   defaults = {
     :timeout => 10.0,
-    :service => NewRelic::Agent.agent.agent_command_router.backtrace_service,
+    :service => NewRelic::Agent.agent.instance_variable_get(:@agent_command_router).backtrace_service,
     :iterations => 1
   }
   opts = defaults.merge(opts)
@@ -729,7 +730,7 @@ def with_array_logger(level = :info)
   override_logger = Logger.new(logdev)
 
   with_config(config) do
-    NewRelic::Agent.logger = NewRelic::Agent::AgentLogger.new("", override_logger)
+    NewRelic::Agent.logger = NewRelic::Agent::AgentLogger.new('', override_logger)
     yield
   end
 
@@ -876,7 +877,7 @@ def load_cross_agent_test(name)
 end
 
 def each_cross_agent_test(options)
-  options = {:dir => nil, :pattern => "*"}.update(options)
+  options = {:dir => nil, :pattern => '*'}.update(options)
   path = File.join([cross_agent_tests_dir, options[:dir], options[:pattern]].compact)
   Dir.glob(path).each { |file| yield(file) }
 end
@@ -891,7 +892,7 @@ def assert_event_attributes(event, test_name, expected_attributes, non_expected_
     incorrect_attributes << name unless actual_value == expected_value
   end
 
-  msg = String.new("Found missing or incorrect attribute values in #{test_name}:\n")
+  msg = +"Found missing or incorrect attribute values in #{test_name}:\n"
 
   incorrect_attributes.each do |name|
     msg << "  #{name}: expected = #{expected_attributes[name].inspect}, actual = #{event_attrs[name].inspect}\n"
@@ -930,10 +931,10 @@ def message_for_status_code(code)
   end
 
   case code
-  when 200 then "OK"
-  when 404 then "Not Found"
-  when 403 then "Forbidden"
-  else "Unknown"
+  when 200 then 'OK'
+  when 404 then 'Not Found'
+  when 403 then 'Forbidden'
+  else 'Unknown'
   end
 end
 
@@ -942,7 +943,7 @@ end
 # a "status_code" may be passed in the headers to alter the HTTP Status Code
 # that is wrapped in the response.
 def mock_http_response(headers, wrap_it = true)
-  status_code = (headers.delete("status_code") || 200).to_i
+  status_code = (headers.delete('status_code') || 200).to_i
   net_http_resp = Net::HTTPResponse.new(1.0, status_code, message_for_status_code(status_code))
   headers.each do |key, value|
     net_http_resp.add_field(key.to_s, value)
@@ -966,7 +967,7 @@ end
 def assert_segment_noticed_error(txn, segment_name, error_classes, error_message)
   error_segment = txn.segments.reverse.detect { |s| s.noticed_error }
 
-  assert error_segment, "Expected at least one segment with a noticed_error"
+  assert error_segment, 'Expected at least one segment with a noticed_error'
 
   assert_match_or_equal segment_name, error_segment.name
 
@@ -977,15 +978,15 @@ def assert_segment_noticed_error(txn, segment_name, error_classes, error_message
 end
 
 def assert_transaction_noticed_error(txn, error_classes)
-  refute_empty txn.exceptions, "Expected transaction to notice the error"
+  refute_empty txn.exceptions, 'Expected transaction to notice the error'
   assert_match_or_equal error_classes, txn.exceptions.keys.first.class.name
 end
 
 def refute_transaction_noticed_error(txn, error_class)
   error_segment = txn.segments.reverse.detect { |s| s.noticed_error }
 
-  assert error_segment, "Expected at least one segment with a noticed_error"
-  assert_empty txn.exceptions, "Expected transaction to NOT notice any segment errors"
+  assert error_segment, 'Expected at least one segment with a noticed_error'
+  assert_empty txn.exceptions, 'Expected transaction to NOT notice any segment errors'
 end
 
 def refute_raises(*exp)
@@ -1021,6 +1022,6 @@ def defer_testing_to_min_supported_rails(test_file, min_rails_version, supports_
 
     yield
   else
-    puts "Skipping tests in #{File.basename(test_file)} because Rails >= #{min_rails_version} is unavailable" if ENV["VERBOSE_TEST_OUTPUT"]
+    puts "Skipping tests in #{File.basename(test_file)} because Rails >= #{min_rails_version} is unavailable" if ENV['VERBOSE_TEST_OUTPUT']
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 9.0.0
+  version: 9.2.0
 platform: ruby
 authors:
 - Tanna McClure
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-21 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