Merge branch 'main' into fossa-update

Author: kaylareopelle

.rubocop.yml

@@ -38,12 +38,6 @@ Metrics/PerceivedComplexity:
 Naming/FileName:
   Exclude:
     - '**/opentelemetry-*'
-### TODO: Enable this is a separate PR
-Naming/BlockForwarding:
-  Enabled: false
-Style/ArgumentsForwarding:
-  Enabled: false
-#######################
 Style/Documentation:
   Exclude:
     - "**/test/**/*"

Gemfile

@@ -7,5 +7,5 @@
 source 'https://rubygems.org'
 
 gem 'rake', '~> 13.0'
-gem 'rubocop', '~> 1.71.0'
+gem 'rubocop', '~> 1.72.2'
 gem 'rubocop-performance', '~> 1.23.0'

helpers/mysql/opentelemetry-helpers-mysql.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
   spec.add_development_dependency 'rake', '~> 13.0'
-  spec.add_development_dependency 'rubocop', '~> 1.71.0'
+  spec.add_development_dependency 'rubocop', '~> 1.72.2'
   spec.add_development_dependency 'rubocop-performance', '~> 1.23.0'
   spec.add_development_dependency 'simplecov', '~> 0.22.0'
   spec.add_development_dependency 'yard', '~> 0.9'

helpers/sql-obfuscation/opentelemetry-helpers-sql-obfuscation.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
   spec.add_development_dependency 'rake', '~> 13.0'
-  spec.add_development_dependency 'rubocop', '~> 1.71.0'
+  spec.add_development_dependency 'rubocop', '~> 1.72.2'
   spec.add_development_dependency 'rubocop-performance', '~> 1.23.0'
   spec.add_development_dependency 'simplecov', '~> 0.22.0'
   spec.add_development_dependency 'yard', '~> 0.9'

helpers/sql/opentelemetry-helpers-sql.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
   spec.add_development_dependency 'rake', '~> 13.0'
-  spec.add_development_dependency 'rubocop', '~> 1.71.0'
+  spec.add_development_dependency 'rubocop', '~> 1.72.2'
   spec.add_development_dependency 'rubocop-performance', '~> 1.23.0'
   spec.add_development_dependency 'simplecov', '~> 0.22.0'
   spec.add_development_dependency 'yard', '~> 0.9'

instrumentation/action_mailer/opentelemetry-instrumentation-action_mailer.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
   spec.add_development_dependency 'rake', '~> 13.0'
-  spec.add_development_dependency 'rubocop', '~> 1.71.0'
+  spec.add_development_dependency 'rubocop', '~> 1.72.2'
   spec.add_development_dependency 'rubocop-performance', '~> 1.23.0'
   spec.add_development_dependency 'simplecov', '~> 0.22.0'
   spec.add_development_dependency 'webmock', '~> 3.24'

instrumentation/action_mailer/test/opentelemetry/instrumentation/action_mailer/subscription_test.rb

@@ -116,7 +116,7 @@
     end
   end
 
-  def with_configuration(values, &block)
+  def with_configuration(values, &)
     original_config = instrumentation.instance_variable_get(:@config)
     modified_config = original_config.merge(values)
     instrumentation.instance_variable_set(:@config, modified_config)
@@ -126,14 +126,14 @@ def with_configuration(values, &block)
     instrumentation.instance_variable_set(:@config, original_config)
   end
 
-  def subscribing_to_deliver(&block)
+  def subscribing_to_deliver(&)
     subscription = OpenTelemetry::Instrumentation::ActionMailer::Railtie.subscribe_to_deliver
     yield
   ensure
     ActiveSupport::Notifications.unsubscribe(subscription)
   end
 
-  def subscribing_to_process(&block)
+  def subscribing_to_process(&)
     subscription = OpenTelemetry::Instrumentation::ActionMailer::Railtie.subscribe_to_process
     yield
   ensure

instrumentation/action_pack/opentelemetry-instrumentation-action_pack.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
   spec.add_development_dependency 'rake', '~> 13.0'
-  spec.add_development_dependency 'rubocop', '~> 1.71.0'
+  spec.add_development_dependency 'rubocop', '~> 1.72.2'
   spec.add_development_dependency 'rubocop-performance', '~> 1.23.0'
   spec.add_development_dependency 'simplecov', '~> 0.22.0'
   spec.add_development_dependency 'webmock', '~> 3.24'

instrumentation/action_view/opentelemetry-instrumentation-action_view.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
   spec.add_development_dependency 'rails', '>= 6.1'
   spec.add_development_dependency 'rake', '~> 13.0'
-  spec.add_development_dependency 'rubocop', '~> 1.71.0'
+  spec.add_development_dependency 'rubocop', '~> 1.72.2'
   spec.add_development_dependency 'rubocop-performance', '~> 1.23.0'
   spec.add_development_dependency 'simplecov', '~> 0.22.0'
   spec.add_development_dependency 'webmock', '~> 3.24'

instrumentation/active_job/opentelemetry-instrumentation-active_job.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
   spec.add_development_dependency 'rake', '~> 13.0'
-  spec.add_development_dependency 'rubocop', '~> 1.71.0'
+  spec.add_development_dependency 'rubocop', '~> 1.72.2'
   spec.add_development_dependency 'rubocop-performance', '~> 1.23.0'
   spec.add_development_dependency 'simplecov', '~> 0.22.0'
   spec.add_development_dependency 'webmock', '~> 3.24'