Merge pull request #3385 from ydah/bump-rubocop

Bump rubocop and related plugin versions

Author: hannahramadan

.rubocop.yml

@@ -1,6 +1,6 @@
 inherit_from: .rubocop_todo.yml
 
-require:
+plugins:
   # Default minitest configurations: https://github.com/rubocop/rubocop-minitest/blob/master/config/default.yml
   - rubocop-minitest
   # Default performance configurations: https://github.com/rubocop/rubocop-performance/blob/master/config/default.yml
@@ -861,7 +861,7 @@ Naming/MethodName:
 Naming/MethodParameterName:
   Enabled: false
 
-Naming/PredicateName:
+Naming/PredicatePrefix:
   Enabled: false
 
 Naming/RescuedExceptionsVariableName:

.rubocop_todo.yml

@@ -1,57 +1,216 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2023-10-26 22:54:31 UTC using RuboCop version 1.54.0.
+# on 2025-12-25 19:00:23 UTC using RuboCop version 1.81.7.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 31
-# Configuration parameters: EnforcedStyle, AllowedGems, Include.
+# Offense count: 33
+# Configuration parameters: EnforcedStyle, AllowedGems.
 # SupportedStyles: Gemfile, gems.rb, gemspec
-# Include: **/*.gemspec, **/Gemfile, **/gems.rb
 Gemspec/DevelopmentDependencies:
   Exclude:
     - 'infinite_tracing/newrelic-infinite_tracing.gemspec'
     - 'newrelic_rpm.gemspec'
 
-# Offense count: 443
+# Offense count: 3
+# This cop supports safe autocorrection (--autocorrect).
+Layout/EmptyLineAfterMagicComment:
+  Exclude:
+    - 'test/performance/rails_app/config/initializers/cors.rb'
+    - 'test/performance/rails_app/config/initializers/inflections.rb'
+    - 'test/performance/rails_app/db/seeds.rb'
+
+# Offense count: 50
+# This cop supports safe autocorrection (--autocorrect).
+Layout/EmptyLinesAfterModuleInclusion:
+  Enabled: false
+
+# Offense count: 25
+# This cop supports safe autocorrection (--autocorrect).
+Layout/EmptyLinesAroundMethodBody:
+  Exclude:
+    - 'lib/new_relic/agent.rb'
+    - 'lib/new_relic/agent/distributed_tracing/trace_context.rb'
+    - 'lib/new_relic/agent/distributed_tracing/trace_context_payload.rb'
+    - 'lib/new_relic/agent/instrumentation/grpc/client/chain.rb'
+    - 'lib/new_relic/agent/instrumentation/grpc/client/prepend.rb'
+    - 'lib/new_relic/agent/messaging.rb'
+    - 'lib/new_relic/agent/method_tracer.rb'
+    - 'lib/new_relic/agent/tracer.rb'
+    - 'lib/new_relic/agent/transaction/message_broker_segment.rb'
+
+# Offense count: 2
+Lint/LiteralAssignmentInCondition:
+  Exclude:
+    - 'test/multiverse/suites/rake/rake_test.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Lint/RedundantCopDisableDirective:
+  Exclude:
+    - 'test/performance/lib/performance/console_reporter.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Lint/RedundantTypeConversion:
+  Exclude:
+    - 'test/multiverse/suites/agent_only/encoding_handling_test.rb'
+
+# Offense count: 2
+Lint/SharedMutableDefault:
+  Exclude:
+    - 'lib/new_relic/agent/instrumentation/roda/ignorer.rb'
+    - 'lib/new_relic/agent/instrumentation/sinatra/ignorer.rb'
+
+# Offense count: 21
+Lint/UselessConstantScoping:
+  Exclude:
+    - 'infinite_tracing/lib/infinite_tracing/transformer.rb'
+    - 'lib/new_relic/agent/agent_logger.rb'
+    - 'lib/new_relic/agent/database.rb'
+    - 'lib/new_relic/agent/instrumentation/action_cable_subscriber.rb'
+    - 'lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb'
+    - 'lib/new_relic/agent/samplers/delayed_job_sampler.rb'
+    - 'lib/new_relic/agent/transaction/datastore_segment.rb'
+    - 'lib/new_relic/agent/transaction/tracing.rb'
+    - 'lib/new_relic/agent/utilization/vendor.rb'
+    - 'test/new_relic/agent/distributed_tracing/distributed_tracing_cross_agent_test.rb'
+    - 'test/new_relic/agent/distributed_tracing/trace_context_cross_agent_test.rb'
+    - 'test/new_relic/agent/transaction_sampler_test.rb'
+    - 'test/new_relic/newrelicyml_test.rb'
+
+# Offense count: 523
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
-  Max: 40
+  Max: 87
+
+# Offense count: 17
+# This cop supports safe autocorrection (--autocorrect).
+Minitest/AssertInstanceOf:
+  Exclude:
+    - 'test/multiverse/suites/elasticsearch/elasticsearch_instrumentation_test.rb'
+    - 'test/multiverse/suites/opensearch/opensearch_instrumentation_test.rb'
+    - 'test/new_relic/agent/configuration/manager_test.rb'
+    - 'test/new_relic/agent/llm/llm_event_test.rb'
+    - 'test/new_relic/agent/sampler_collection_test.rb'
+    - 'test/new_relic/agent/stats_engine/gc_profiler_test.rb'
+    - 'test/new_relic/agent/transaction/trace_node_test.rb'
+    - 'test/new_relic/collection_helper_test.rb'
+    - 'test/new_relic/noticed_error_test.rb'
+
+# Offense count: 16
+# This cop supports safe autocorrection (--autocorrect).
+Minitest/AssertKindOf:
   Exclude:
-    - 'lib/new_relic/agent/configuration/default_source.rb'
-    - infinite_tracing/test/**/*
-    - test/**/*
+    - 'test/multiverse/suites/agent_only/transaction_events_test.rb'
+    - 'test/multiverse/suites/curb/curb_test.rb'
+    - 'test/multiverse/suites/hybrid_agent/tracer_provider_test.rb'
+    - 'test/multiverse/suites/sequel/sequel_safety_test.rb'
+    - 'test/multiverse/suites/sidekiq/sidekiq_instrumentation_test.rb'
+    - 'test/new_relic/agent/attribute_pre_filtering_test.rb'
+    - 'test/new_relic/agent/sampler_test.rb'
+    - 'test/new_relic/agent/span_event_primitive_test.rb'
+    - 'test/new_relic/agent/transaction_event_primitive_test.rb'
+    - 'test/new_relic/http_client_test_cases.rb'
 
-Metrics/CollectionLiteralLength:
+# Offense count: 23
+# This cop supports safe autocorrection (--autocorrect).
+Minitest/AssertOperator:
   Exclude:
-    - 'lib/new_relic/agent/configuration/default_source.rb'
+    - 'test/multiverse/suites/agent_only/rum_instrumentation_test.rb'
+    - 'test/multiverse/suites/agent_only/thread_profiling_test.rb'
+    - 'test/multiverse/suites/bunny/bunny_test.rb'
+    - 'test/multiverse/suites/rails/gc_instrumentation_test.rb'
+    - 'test/multiverse/suites/typhoeus/typhoeus_test.rb'
+    - 'test/new_relic/agent/adaptive_sampler_test.rb'
+    - 'test/new_relic/agent/configuration/default_source_test.rb'
+    - 'test/new_relic/agent/datastores/redis_test.rb'
+    - 'test/new_relic/agent/health_check_test.rb'
+    - 'test/new_relic/agent/instrumentation/task_instrumentation_test.rb'
+    - 'test/new_relic/agent/messaging_test.rb'
+    - 'test/new_relic/agent/sql_sampler_test.rb'
+    - 'test/new_relic/agent/transaction/attributes_test.rb'
+    - 'test/new_relic/environment_report_test.rb'
+    - 'test/new_relic/rack/browser_monitoring_test.rb'
 
-# Offense count: 7
+# Offense count: 4
 Minitest/AssertRaisesCompoundBody:
   Exclude:
     - 'test/new_relic/agent/collector_response_code_test.rb'
     - 'test/new_relic/agent/new_relic_service_test.rb'
 
+# Offense count: 4
+# This cop supports safe autocorrection (--autocorrect).
+Minitest/AssertSame:
+  Exclude:
+    - 'test/new_relic/agent/new_relic_service_test.rb'
+
 # Offense count: 4
 Minitest/DuplicateTestRun:
   Exclude:
     - 'test/multiverse/suites/rails/error_tracing_test.rb'
     - 'test/multiverse/suites/sinatra/ignoring_test.rb'
 
-# Offense count: 284
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Minitest/LifecycleHooksOrder:
+  Exclude:
+    - 'test/multiverse/suites/mongo/mongo_instrumentation_test.rb'
+
+# Offense count: 305
 Minitest/MultipleAssertions:
   Max: 28
 
+# Offense count: 3
+# This cop supports safe autocorrection (--autocorrect).
+Minitest/RefuteEqual:
+  Exclude:
+    - 'test/new_relic/agent/agent_test.rb'
+
+# Offense count: 3
+# This cop supports safe autocorrection (--autocorrect).
+Minitest/RefuteOperator:
+  Exclude:
+    - 'test/new_relic/agent/agent_test.rb'
+
+# Offense count: 21
+# This cop supports safe autocorrection (--autocorrect).
+Minitest/ReturnInTestMethod:
+  Exclude:
+    - 'test/multiverse/suites/delayed_job/delayed_job_sampler_test.rb'
+    - 'test/multiverse/suites/memcache/memcached_test.rb'
+    - 'test/new_relic/agent/agent_logger_test.rb'
+    - 'test/new_relic/agent/database_test.rb'
+    - 'test/new_relic/agent/samplers/memory_sampler_test.rb'
+    - 'test/new_relic/agent/stats_engine/gc_profiler_test.rb'
+    - 'test/new_relic/control_test.rb'
+    - 'test/new_relic/language_support_test.rb'
+
 # Offense count: 19
 Minitest/TestFileName:
   Enabled: false
 
-# Offense count: 20
+# Offense count: 19
 # This cop supports safe autocorrection (--autocorrect).
 Minitest/TestMethodName:
-  Enabled: false
+  Exclude:
+    - 'test/multiverse/suites/agent_only/error_events_test.rb'
+    - 'test/multiverse/suites/agent_only/log_events_test.rb'
+    - 'test/multiverse/suites/agent_only/span_events_test.rb'
+    - 'test/multiverse/suites/agent_only/synthetics_test.rb'
+    - 'test/multiverse/suites/agent_only/transaction_events_test.rb'
+    - 'test/multiverse/suites/logger/logger_instrumentation_test.rb'
+    - 'test/multiverse/suites/rails/queue_time_test.rb'
+    - 'test/multiverse/suites/resque/instrumentation_test.rb'
+    - 'test/new_relic/agent/event_listener_test.rb'
+    - 'test/new_relic/agent/monitors/synthetics_monitor_test.rb'
+    - 'test/new_relic/agent/samplers/cpu_sampler_test.rb'
+    - 'test/new_relic/agent/threading/backtrace_service_test.rb'
+    - 'test/new_relic/agent/transaction/distributed_tracer_test.rb'
+    - 'test/new_relic/agent/transaction_event_aggregator_test.rb'
+    - 'test/new_relic/control/security_interface_test.rb'
 
 # Offense count: 7
 Minitest/UselessAssertion:
@@ -63,9 +222,134 @@ Minitest/UselessAssertion:
     - 'test/new_relic/agent/method_tracer_test.rb'
     - 'test/new_relic/agent/stats_test.rb'
 
+# Offense count: 19
+# Configuration parameters: Mode, AllowedMethods, AllowedPatterns, AllowBangMethods, WaywardPredicates.
+# AllowedMethods: call
+# WaywardPredicates: nonzero?
+Naming/PredicateMethod:
+  Exclude:
+    - 'lib/new_relic/agent/agent_helpers/connect.rb'
+    - 'lib/new_relic/agent/agent_helpers/startup.rb'
+    - 'lib/new_relic/agent/configuration/server_source.rb'
+    - 'lib/new_relic/agent/instrumentation/action_controller_subscriber.rb'
+    - 'lib/new_relic/agent/instrumentation/middleware_tracing.rb'
+    - 'lib/new_relic/agent/transaction/distributed_tracing.rb'
+    - 'lib/new_relic/agent/utilization/vendor.rb'
+    - 'test/multiverse/lib/multiverse/suite.rb'
+    - 'test/multiverse/suites/agent_only/logging_test.rb'
+    - 'test/multiverse/suites/rack/rack_builder_test.rb'
+    - 'test/multiverse/suites/rails/action_controller_other_test.rb'
+    - 'test/new_relic/agent/instrumentation/middleware_proxy_test.rb'
+    - 'test/new_relic/agent/method_interrobang_test.rb'
+    - 'test/new_relic/agent/method_tracer_test.rb'
+    - 'test/new_relic/agent/transaction_interrobang_test.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Performance/CompareWithBlock:
+  Exclude:
+    - 'lib/new_relic/agent/transaction/transaction_sample_buffer.rb'
+
+# Offense count: 2
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Performance/ZipWithoutBlock:
+  Exclude:
+    - 'lib/new_relic/agent/database/explain_plan_helpers.rb'
+    - 'test/multiverse/suites/sinatra/sinatra_test_cases.rb'
+
+# Offense count: 6
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Style/BitwisePredicate:
+  Exclude:
+    - 'test/new_relic/agent/attribute_filter_test.rb'
+
+# Offense count: 30
+# This cop supports safe autocorrection (--autocorrect).
+Style/CombinableDefined:
+  Enabled: false
+
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Style/ComparableBetween:
+  Exclude:
+    - 'test/agent_helper.rb'
+
 # Offense count: 7
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/ConcatArrayLiterals:
   Exclude:
     - 'lib/new_relic/agent/error_collector.rb'
     - 'test/new_relic/agent/sql_sampler_test.rb'
+
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: trailing_conditional, ternary
+Style/EmptyStringInsideInterpolation:
+  Exclude:
+    - 'lib/new_relic/agent/error_trace_aggregator.rb'
+    - 'lib/new_relic/agent/event_aggregator.rb'
+
+# Offense count: 10
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Style/FileNull:
+  Exclude:
+    - 'test/multiverse/suites/config_file_loading/config_file_loading_test.rb'
+    - 'test/multiverse/suites/sidekiq/sidekiq_test_helpers.rb'
+    - 'test/multiverse/suites/sidekiq_delay_extensions/sidekiq_delay_extensions_test_helpers.rb'
+    - 'test/multiverse/suites/sidekiq_ignore_retry_errors_enabled/sidekiq_test_helpers.rb'
+    - 'test/new_relic/agent/agent_logger_test.rb'
+    - 'test/new_relic/agent/instrumentation/rails/action_cable_subscriber.rb'
+    - 'test/new_relic/fake_server.rb'
+    - 'test/performance/lib/performance/options.rb'
+
+# Offense count: 5
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Style/MapIntoArray:
+  Exclude:
+    - 'Rakefile'
+    - 'lib/new_relic/agent/database/explain_plan_helpers.rb'
+    - 'lib/tasks/helpers/format.rb'
+
+# Offense count: 53
+# This cop supports safe autocorrection (--autocorrect).
+Style/RedundantLineContinuation:
+  Enabled: false
+
+# Offense count: 2
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: ConvertCodeThatCanStartToReturnNil, AllowedMethods, MaxChainLength.
+# AllowedMethods: present?, blank?, presence, try, try!
+Style/SafeNavigation:
+  Exclude:
+    - 'lib/new_relic/agent/instrumentation/active_record_helper.rb'
+    - 'lib/new_relic/agent/instrumentation/active_record_subscriber.rb'
+
+# Offense count: 4
+# Configuration parameters: Max.
+Style/SafeNavigationChainLength:
+  Exclude:
+    - 'lib/new_relic/agent/aws.rb'
+    - 'lib/new_relic/agent/instrumentation/dynamodb/instrumentation.rb'
+    - 'lib/new_relic/agent/instrumentation/ruby_openai/instrumentation.rb'
+    - 'lib/new_relic/agent/llm.rb'
+
+# Offense count: 10
+# This cop supports safe autocorrection (--autocorrect).
+Style/SuperArguments:
+  Exclude:
+    - 'lib/new_relic/agent/http_clients/curb_wrappers.rb'
+    - 'lib/new_relic/agent/http_clients/excon_wrappers.rb'
+    - 'lib/new_relic/agent/instrumentation/concurrent_ruby/prepend.rb'
+    - 'lib/new_relic/agent/instrumentation/grape/prepend.rb'
+    - 'lib/new_relic/agent/log_event_aggregator.rb'
+    - 'lib/new_relic/agent/logging.rb'
+    - 'lib/new_relic/cli/commands/install.rb'
+    - 'test/helpers/minitest.rb'
+    - 'test/multiverse/suites/activemerchant/activemerchant_test.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Style/SuperWithArgsParentheses:
+  Exclude:
+    - 'test/multiverse/suites/rails/app.rb'

lib/new_relic/agent/instrumentation/curb/chain.rb

@@ -7,7 +7,7 @@
 module NewRelic::Agent::Instrumentation
   module Curb
     module Chain
-      def self.instrument! # rubocop:disable Metrics/AbcSize
+      def self.instrument!
         Curl::Easy.class_eval do
           include NewRelic::Agent::Instrumentation::Curb::Easy