newrelic_rpm 8.15.0 → 9.6.0

data/newrelic_rpm.gemspec

@@ -6,28 +6,29 @@ 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.2.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_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.licenses = ['Apache-2.0']
-  s.description = <<-EOS
-New Relic is a performance management system, developed by New Relic,
-Inc (http://www.newrelic.com).  New Relic provides you with deep
-information about the performance of your web application as it runs
-in production. The New Relic Ruby agent is dual-purposed as a either a
-Gem or plugin, hosted on
-https://github.com/newrelic/newrelic-ruby-agent/
+  s.description = <<~EOS
+    New Relic is a performance management system, developed by New Relic,
+    Inc (http://www.newrelic.com).  New Relic provides you with deep
+    information about the performance of your web application as it runs
+    in production. The New Relic Ruby agent is dual-purposed as a either a
+    Gem or plugin, hosted on
+    https://github.com/newrelic/newrelic-ruby-agent/
   EOS
-  s.email = "support@newrelic.com"
+  s.email = 'support@newrelic.com'
+  # TODO: MAJOR VERSION - remove newrelic_cmd, deprecated since version 2.13
   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,30 +36,40 @@ https://github.com/newrelic/newrelic-ruby-agent/
     '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)}) }
-  build_file_path = 'lib/new_relic/build.rb'
-  file_list << build_file_path if File.exist?(build_file_path)
+  reject_list = File.read(File.expand_path('../.build_ignore', __FILE__)).split("\n")
+  file_list = `git ls-files -z`.split("\x0").reject { |f| reject_list.any? { |rf| f.start_with?(rf) } }
+  # test/agent_helper.rb is a requirement for the NewRelic::Agent.require_test_helper public API
+  test_helper_path = 'test/agent_helper.rb'
+  file_list << test_helper_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/newrelic-ruby-agent'
+  s.require_paths = ['lib']
+  s.summary = 'New Relic Ruby Agent'
+
+  s.add_dependency 'base64'
+
   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
   s.add_development_dependency 'minitest', "#{RUBY_VERSION >= '2.7.0' ? '5.3.3' : '4.7.5'}"
   s.add_development_dependency 'minitest-stub-const', '0.6'
   s.add_development_dependency 'mocha', '~> 1.16'
-  s.add_development_dependency 'pry' unless ENV['CI']
+  s.add_development_dependency 'pry' if ENV['ENABLE_PRY']
+  s.add_development_dependency 'rack'
   s.add_development_dependency 'rake', '12.3.3'
-  s.add_development_dependency 'rubocop' unless ENV['CI'] && RUBY_VERSION < '3.0.0'
-  s.add_development_dependency 'rubocop-minitest' unless ENV['CI'] && RUBY_VERSION < '3.0.0'
-  s.add_development_dependency 'rubocop-performance' unless ENV['CI'] && RUBY_VERSION < '3.0.0'
-  s.add_development_dependency 'rubocop-rake' unless ENV['CI'] && RUBY_VERSION < '3.0.0'
+
+  s.add_development_dependency 'rubocop', '1.54' unless ENV['CI'] && RUBY_VERSION < '3.0.0'
+  s.add_development_dependency 'rubocop-ast', '1.28.1' unless ENV['CI'] && RUBY_VERSION < '3.0.0'
+  s.add_development_dependency 'rubocop-minitest', '0.27.0' unless ENV['CI'] && RUBY_VERSION < '3.0.0'
+  s.add_development_dependency 'rubocop-performance', '1.16.0' unless ENV['CI'] && RUBY_VERSION < '3.0.0'
+  s.add_development_dependency 'rubocop-rake', '0.6.0' unless ENV['CI'] && RUBY_VERSION < '3.0.0'
+
   s.add_development_dependency 'simplecov' if RUBY_VERSION >= '2.7.0'
   s.add_development_dependency 'thor' unless ENV['CI']
-  s.add_development_dependency 'yard', "#{RUBY_VERSION < '2.3.0' ? '0.9.26' : '> 0.9.26'}"
+  s.add_development_dependency 'warning'
+  s.add_development_dependency 'yard'
 end

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 #{test_file} because Rails >= #{min_rails_version} is unavailable"
+    puts "Skipping tests in #{File.basename(test_file)} because Rails >= #{min_rails_version} is unavailable" if ENV['VERBOSE_TEST_OUTPUT']
   end
 end