Merge pull request #1532 from appsignal/bump-rubocop

Upgrade RuboCop to 1.87

Author: unflxw

.rubocop.yml

@@ -67,6 +67,12 @@ Style/SymbolArray:
 Style/RedundantConstantBase:
   Enabled: false
 
+# Keep the detection but never autocorrect: removing the `\` after a `%()`
+# literal silently breaks adjacent-string concatenation, turning the joined
+# string into dead code. Let it flag for a human instead of rewriting.
+Style/RedundantLineContinuation:
+  AutoCorrect: false
+
 Lint/ConstantDefinitionInBlock:
   Exclude:
     - "spec/**/*.rb"

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2024-06-27 09:42:06 UTC using RuboCop version 1.64.1.
+# on 2026-06-26 10:42:55 UTC using RuboCop version 1.87.0.
 # 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
@@ -18,32 +18,54 @@ Lint/StructNewOverride:
   Exclude:
     - 'spec/lib/appsignal/probes/sidekiq_spec.rb'
 
-# Offense count: 63
+# Offense count: 78
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
-  Max: 44
+  Max: 43
 
-# Offense count: 6
+# Offense count: 4
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 # AllowedMethods: refine
 Metrics/BlockLength:
   Max: 31
 
-# Offense count: 21
+# Offense count: 25
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/CyclomaticComplexity:
   Max: 11
 
-# Offense count: 139
+# Offense count: 176
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
-  Max: 56
+  Max: 54
 
-# Offense count: 18
+# Offense count: 20
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/PerceivedComplexity:
   Max: 13
 
+# Offense count: 5
+# Configuration parameters: Mode, AllowedMethods, AllowedPatterns, AllowBangMethods, WaywardPredicates.
+# AllowedMethods: call
+# WaywardPredicates: infinite?, nonzero?
+Naming/PredicateMethod:
+  Exclude:
+    - 'ext/base.rb'
+    - 'lib/appsignal/demo.rb'
+    - 'spec/lib/appsignal/integrations/delayed_job_plugin_spec.rb'
+    - 'spec/support/testing.rb'
+
+# Offense count: 1
+# Configuration parameters: NamePrefix, ForbiddenPrefixes, AllowedMethods, MethodDefinitionMacros, UseSorbetSigs.
+# NamePrefix: is_, has_, have_, does_
+# ForbiddenPrefixes: is_, has_, have_, does_
+# AllowedMethods: is_a?
+# MethodDefinitionMacros: define_method, define_singleton_method
+Naming/PredicatePrefix:
+  Exclude:
+    - 'spec/**/*'
+    - 'ext/extconf.rb'
+
 # Offense count: 2
 Security/Open:
   Exclude:
@@ -56,7 +78,7 @@ Security/YAMLLoad:
     - 'lib/appsignal/config.rb'
     - 'lib/appsignal/integrations/sidekiq.rb'
 
-# Offense count: 7
+# Offense count: 22
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: prefer_alias, prefer_alias_method
@@ -70,15 +92,17 @@ Style/ClassVars:
   Exclude:
     - 'spec/lib/appsignal/event_formatter_spec.rb'
 
-# Offense count: 1
-Style/OpenStructUse:
-  Exclude:
-    - 'lib/appsignal/cli/install.rb'
-
 # Offense count: 2
 # Configuration parameters: AllowedMethods.
 # AllowedMethods: respond_to_missing?
 Style/OptionalBooleanParameter:
   Exclude:
     - 'lib/appsignal/integrations/delayed_job_plugin.rb'
     - 'lib/appsignal/utils/query_params_sanitizer.rb'
+
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: AllowedMethods, AllowedPatterns.
+Style/ReturnNilInPredicateMethodDefinition:
+  Exclude:
+    - 'spec/support/testing.rb'

appsignal.gemspec

@@ -63,7 +63,7 @@ Gem::Specification.new do |gem| # rubocop:disable Metrics/BlockLength
   gem.add_development_dependency "pry"
   gem.add_development_dependency "rake", ">= 12"
   gem.add_development_dependency "rspec", "~> 3.8"
-  gem.add_development_dependency "rubocop", "1.64.1"
+  gem.add_development_dependency "rubocop", "~> 1.87.0"
   gem.add_development_dependency("sord") unless RUBY_PLATFORM == "java"
   gem.add_development_dependency "timecop"
   gem.add_development_dependency "webmock"

ext/base.rb

@@ -100,15 +100,11 @@ def installation_succeeded?
 end
 
 def check_architecture
-  if APPSIGNAL_AGENT_CONFIG["triples"].key?(TARGET_TRIPLE)
-    true
-  else
-    abort_installation(
+  APPSIGNAL_AGENT_CONFIG["triples"].key?(TARGET_TRIPLE) || abort_installation(
       "AppSignal currently does not support your system architecture (#{TARGET_TRIPLE})." \
         "Please let us know at support@appsignal.com, we aim to support everything " \
         "our customers run."
     )
-  end
 end
 
 def download_archive(type)

ext/extconf.rb

@@ -77,7 +77,7 @@ def link_libraries
   end
 end
 
-def have_required_function(library, func) # rubocop:disable Naming/PredicateName
+def have_required_function(library, func)
   if have_func(func)
     report["build"]["dependencies"][library] = "linked"
     return

lib/appsignal/check_in/event.rb

@@ -4,6 +4,9 @@ module Appsignal
   module CheckIn
     # @!visibility private
     class Event
+      CRON_KINDS = %w[start finish].freeze
+      private_constant :CRON_KINDS
+
       class << self
         def new(check_in_type:, identifier:, digest: nil, kind: nil)
           {
@@ -67,7 +70,7 @@ def describe(events)
           end
         end
 
-        def deduplicate_cron!(events) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity
+        def deduplicate_cron!(events) # rubocop:disable Metrics/AbcSize
           # Remove redundant cron check-in events from the given list of events.
           # This is done by removing redundant *pairs* of events -- that is,
           # for each identifier, only send one complete pair of start and
@@ -111,9 +114,7 @@ def deduplicate_cron!(events) # rubocop:disable Metrics/AbcSize,Metrics/Cyclomat
             # Do not remove events that are not cron check-in events or that
             # have an unknown kind.
             return false unless
-              event[:check_in_type] == "cron" && (
-                event[:kind] == "start" ||
-                event[:kind] == "finish")
+              event[:check_in_type] == "cron" && CRON_KINDS.include?(event[:kind])
 
             # Remove any event that is part of a complete digest pair, except
             # for the one digest that should be kept.

lib/appsignal/cli/helpers.rb

@@ -5,8 +5,6 @@
 module Appsignal
   class CLI
     module Helpers
-      private
-
       COLOR_CODES = {
         :red => 31,
         :green => 32,
@@ -16,6 +14,8 @@ module Helpers
         :default => 0
       }.freeze
 
+      private
+
       def coloring=(value)
         @coloring = value
       end

lib/appsignal/extension/jruby.rb

@@ -547,6 +547,7 @@ def close
 
       class Data
         include StringHelpers
+
         attr_reader :pointer
 
         def initialize(pointer)

lib/appsignal/rack/hanami_middleware.rb

@@ -14,6 +14,7 @@ def initialize(app, options = {})
 
       HANAMI_ACTION_INSTANCE = "hanami.action_instance"
       ROUTER_PARAMS = "router.params"
+      private_constant :HANAMI_ACTION_INSTANCE, :ROUTER_PARAMS
 
       def add_transaction_metadata_after(transaction, request)
         action_name = fetch_hanami_action(request.env)

lib/appsignal/sample_data.rb

@@ -68,6 +68,7 @@ def empty?
     private
 
     UNSET_VALUE = nil
+    private_constant :UNSET_VALUE
 
     # Method called by `dup` and `clone` to create a duplicate instance.
     # Make sure the `@blocks` variable is also properly duplicated.