RuboCop - enable new cops, address new issues

.rubocop.yml

@@ -2,9 +2,9 @@ require:
   - rubocop-performance
 
 AllCops:
-  # Prevent RuboCop from exploding when it finds an older-than-2.4 .ruby-version
   TargetRubyVersion: 2.7
   Exclude: []
+  NewCops: enable
 
 Bundler/DuplicatedGem:
   Enabled: true
@@ -33,7 +33,7 @@ Bundler/InsecureProtocolSource:
 Bundler/OrderedGems:
   Enabled: false
 
-Gemspec/DateAssignment:
+Gemspec/DeprecatedAttributeAssignment:
   Enabled: true
 
 Gemspec/DuplicatedAssignment:
@@ -44,6 +44,9 @@ Gemspec/DuplicatedAssignment:
 Gemspec/OrderedDependencies:
   Enabled: false
 
+Gemspec/RequireMFA:
+  Enabled: false
+
 Gemspec/RequiredRubyVersion:
   Enabled: false
 
@@ -238,7 +241,7 @@ Layout/IndentationStyle:
 Layout/IndentationWidth:
   Enabled: true
   Width: 2
-  IgnoredPatterns: []
+  AllowedPatterns: []
 
 Layout/InitialIndentation:
   Enabled: true
@@ -1333,6 +1336,11 @@ Style/ExplicitBlockArgument:
 Style/ExponentialNotation:
   Enabled: false
 
+# TODO: MAJOR VERSION - Re-enalbe FetchEnvVar after dropping support for Ruby 2.2
+#                       Ruby 2.3+ allows for ENV.fetch('KEY') { default }
+Style/FetchEnvVar:
+  Enabled: false
+
 Style/FloatDivision:
   Enabled: false
 
@@ -1589,6 +1597,10 @@ Style/NumericPredicate:
 Style/OneLineConditional:
   Enabled: true
 
+# TODO: refactor the use of OpenStruct out of the unit tests and enable
+Style/OpenStructUse:
+  Enabled: false
+
 Style/OptionHash:
   Enabled: false
 

infinite_tracing/lib/infinite_tracing/transformer.rb

@@ -39,14 +39,14 @@ def safe_param_name value
       end
 
       def hash_to_attributes values
-        values.map do |key, value|
+        values.to_h do |key, value|
           begin
             [key, AttributeValue.new(safe_param_name(value) => value)]
           rescue => e
             NewRelic::Agent.logger.debug("Infinite tracing transformer error: #{e.inspect}")
             nil
           end
-        end.to_h
+        end
       end
     end
   end

infinite_tracing/newrelic-infinite_tracing.gemspec

@@ -70,7 +70,6 @@ Gem or plugin, hosted on https://github.com/newrelic/newrelic-ruby-agent/
 
   s.homepage = "https://github.com/newrelic/newrelic-ruby-agent/tree/main/infinite_tracing"
   s.require_paths = ["lib", "infinite_tracing"]
-  s.rubygems_version = Gem::VERSION
   s.summary = "New Relic Infinite Tracing for the Ruby agent"
 
   s.add_dependency 'newrelic_rpm', NewRelic::VERSION::STRING

lib/new_relic/agent/configuration/default_source.rb

@@ -96,11 +96,11 @@ def self.config_search_paths
               paths << File.join(NewRelic::Control.instance.root, "newrelic.yml.erb")
             end
 
-            if ENV["HOME"]
-              paths << File.join(ENV["HOME"], ".newrelic", "newrelic.yml")
-              paths << File.join(ENV["HOME"], "newrelic.yml")
-              paths << File.join(ENV["HOME"], ".newrelic", "newrelic.yml.erb")
-              paths << File.join(ENV["HOME"], "newrelic.yml.erb")
+            if Dir.home
+              paths << File.join(Dir.home, ".newrelic", "newrelic.yml")
+              paths << File.join(Dir.home, "newrelic.yml")
+              paths << File.join(Dir.home, ".newrelic", "newrelic.yml.erb")
+              paths << File.join(Dir.home, "newrelic.yml.erb")
             end
 
             # If we're packaged for warbler, we can tell from GEM_HOME
@@ -517,9 +517,9 @@ def self.enforce_fallback(allowed_values: nil, fallback: nil)
           :allowed_from_server => false,
           :transform => DefaultSource.method(:convert_to_regexp_list),
           :description => 'Specify an Array of Rake tasks to automatically instrument. ' \
-          'This configuration option converts the Array to a RegEx list. If you\'d like '\
-          'to allow all tasks by default, use `rake.tasks: [.+]`. No rake tasks will be '\
-          'instrumented unless they\'re added to this list. For more information, '\
+          'This configuration option converts the Array to a RegEx list. If you\'d like ' \
+          'to allow all tasks by default, use `rake.tasks: [.+]`. No rake tasks will be ' \
+          'instrumented unless they\'re added to this list. For more information, ' \
           'visit the (New Relic Rake Instrumentation docs)[/docs/apm/agents/ruby-agent/background-jobs/rake-instrumentation].'
         },
         :'rake.connect_timeout' => {

lib/new_relic/agent/instrumentation/sunspot.rb

@@ -11,8 +11,8 @@
 
   executes do
     ::NewRelic::Agent.logger.info 'Installing Rails Sunspot instrumentation'
-    deprecation_msg = 'The instrumentation for Sunspot is deprecated.' \
-      ' It will be removed in version 9.0.0.' \
+    deprecation_msg = 'The instrumentation for Sunspot is deprecated. ' \
+      'It will be removed in version 9.0.0.'
 
     ::NewRelic::Agent.logger.log_once(
       :warn,

lib/new_relic/agent/threading/thread_profile.rb

@@ -122,8 +122,8 @@ def to_collector_array(encoder)
         end
 
         def to_log_description
-          "#<ThreadProfile:#{object_id} "\
-            "@profile_id: #{profile_id} "\
+          "#<ThreadProfile:#{object_id} " \
+            "@profile_id: #{profile_id} " \
             "@command_arguments=#{@command_arguments.inspect}>"
         end
       end

lib/new_relic/dependency_detection.rb

@@ -156,8 +156,8 @@ def deprecated_disabled_configured?
 
       ::NewRelic::Agent.logger.debug("Not installing #{self.name} instrumentation because of configuration #{key}")
       ::NewRelic::Agent.logger.debug \
-        "[DEPRECATED] configuration #{key} for #{self.name} will be removed in the next major release." \
-        " Use `#{config_key}` with one of `#{VALID_CONFIG_VALUES.map(&:to_s).inspect}`"
+        "[DEPRECATED] configuration #{key} for #{self.name} will be removed in the next major release. " \
+        "Use `#{config_key}` with one of `#{VALID_CONFIG_VALUES.map(&:to_s).inspect}`"
 
       return true
     end

lib/new_relic/metric_data.rb

@@ -33,7 +33,7 @@ def metric_spec= new_spec
     end
 
     def hash
-      metric_spec.hash ^ stats.hash
+      [metric_spec, stats].hash
     end
 
     def to_json(*a)

lib/new_relic/metric_spec.rb

@@ -39,7 +39,7 @@ def eql? o
   end
 
   def hash
-    @name.hash ^ @scope.hash
+    [@name, @scope].hash
   end
 
   def to_s

newrelic_rpm.gemspec

@@ -45,7 +45,6 @@ https://github.com/newrelic/newrelic-ruby-agent/
 
   s.homepage = "https://github.com/newrelic/rpm"
   s.require_paths = ["lib"]
-  s.rubygems_version = Gem::VERSION
   s.summary = "New Relic Ruby Agent"
   s.add_development_dependency 'rake', '12.3.3'
   s.add_development_dependency 'rb-inotify', '0.9.10' # locked to support < Ruby 2.3 (and listen 3.0.8)

test/multiverse/lib/multiverse/suite.rb

@@ -63,7 +63,10 @@ def filter_file
 
     def clean_gemfiles(env_index)
       gemfiles = ["Gemfile.#{env_index}", "Gemfile.#{env_index}.lock"]
-      gemfiles.each { |f| File.delete(f) if File.exist?(f) }
+      gemfiles.each do |f|
+        next unless File.exist?(f)
+        File.delete(f)
+      end
     end
 
     def envfile_path
@@ -270,7 +273,7 @@ def generate_gemfile(gemfile_text, env_index, local = true)
       if verbose?
         puts "Ruby: #{RUBY_VERSION}  Platform: #{RUBY_PLATFORM} RubyGems: #{Gem::VERSION}"
         puts yellow("Gemfile.#{env_index} set to:")
-        puts File.open(gemfile).read
+        puts File.read(gemfile)
       end
     end
 

test/multiverse/suites/config_file_loading/config_file_loading_test.rb

@@ -96,11 +96,11 @@ def test_config_loads_from_newrelic_yml
   end
 
   def test_config_loads_from_home_newrelic_yml
-    assert_config_read_from(ENV['HOME'] + "/newrelic.yml")
+    assert_config_read_from(Dir.home + "/newrelic.yml")
   end
 
   def test_config_loads_from_home_dot_newrelic_newrelic_yml
-    assert_config_read_from(ENV['HOME'] + "/.newrelic/newrelic.yml")
+    assert_config_read_from(Dir.home + "/.newrelic/newrelic.yml")
   end
 
   def test_config_loads_from_config_path_option_to_manual_start

test/multiverse/suites/rails_prepend/newrelic_prepender/newrelic_prepender.gemspec

@@ -13,4 +13,5 @@ Gem::Specification.new do |spec|
     f.match(%r{^(test|spec|features)/})
   end
   spec.require_paths = ["lib"]
+  spec.metadata['rubygems_mfa_required'] = 'true'
 end

test/new_relic/agent/agent/connect_test.rb

@@ -167,7 +167,7 @@ def test_connect_memoizes_event_harvest_config
       }
     }
 
-    NewRelic::Agent.instance.service.stubs(:connect)\
+    NewRelic::Agent.instance.service.stubs(:connect) \
       # the stub connect service will return this canned response
       .returns({
         'agent_run_id' => 23,
@@ -180,7 +180,7 @@ def test_connect_memoizes_event_harvest_config
             'log_event_data' => 833
           }
         }
-      })\
+      }) \
       # every call to :connect should pass the same expected event_harvest_config payload
       .with { |value| value[:event_harvest_config] == expected_event_harvest_config_payload }
 

test/new_relic/agent/span_event_primitive_test.rb

@@ -101,7 +101,7 @@ def test_root_span_gets_dt_parent_attributes
           payload = nil
           external_segment = nil
           in_transaction('test_txn') do |txn|
-            external_segment = NewRelic::Agent::Tracer\
+            external_segment = NewRelic::Agent::Tracer \
               .start_external_request_segment library: "net/http",
                 uri: "http://docs.newrelic.com",
                 procedure: "GET"

test/new_relic/agent/span_events_test.rb

@@ -32,7 +32,7 @@ def test_span_ids_passed_in_payload_when_span_events_enabled
         payload = nil
         external_segment = nil
         transaction = in_transaction('test_txn') do |txn|
-          external_segment = NewRelic::Agent::Tracer\
+          external_segment = NewRelic::Agent::Tracer \
             .start_external_request_segment library: "net/http",
               uri: "http://docs.newrelic.com",
               procedure: "GET"
@@ -49,7 +49,7 @@ def test_parent_span_id_propagated_cross_process
         payload = nil
         external_segment = nil
         in_transaction('test_txn') do |txn|
-          external_segment = NewRelic::Agent::Tracer\
+          external_segment = NewRelic::Agent::Tracer \
             .start_external_request_segment library: "net/http",
               uri: "http://docs.newrelic.com",
               procedure: "GET"

test/performance/lib/performance/baseline.rb

@@ -28,9 +28,7 @@ def load!
     end
 
     def save!
-      File.open(PERSIST_PATH, "w") do |f|
-        f.write(JSON.dump(@results.map(&:to_h)))
-      end
+      File.write(PERSIST_PATH, JSON.dump(@results.map(&:to_h)))
     end
   end
 end