diff --git a/.rubocop.yml b/.rubocop.yml index bbacb1955a..7b5b5039b7 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -38,11 +38,10 @@ Metrics/PerceivedComplexity: Naming/FileName: Exclude: - '**/opentelemetry-*' -### TODO: Enable this is a separate PR Naming/BlockForwarding: - Enabled: false + Enabled: true Style/ArgumentsForwarding: - Enabled: false + Enabled: true ####################### Style/Documentation: Exclude: diff --git a/instrumentation/action_mailer/test/opentelemetry/instrumentation/action_mailer/subscription_test.rb b/instrumentation/action_mailer/test/opentelemetry/instrumentation/action_mailer/subscription_test.rb index 2d22098c6f..9ba4e1151a 100644 --- a/instrumentation/action_mailer/test/opentelemetry/instrumentation/action_mailer/subscription_test.rb +++ b/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 diff --git a/instrumentation/active_record/lib/opentelemetry/instrumentation/active_record/patches/persistence_class_methods.rb b/instrumentation/active_record/lib/opentelemetry/instrumentation/active_record/patches/persistence_class_methods.rb index f29b9d316c..e9d3349b9b 100644 --- a/instrumentation/active_record/lib/opentelemetry/instrumentation/active_record/patches/persistence_class_methods.rb +++ b/instrumentation/active_record/lib/opentelemetry/instrumentation/active_record/patches/persistence_class_methods.rb @@ -18,13 +18,13 @@ class << base # Contains ActiveRecord::Persistence::ClassMethods to be patched module ClassMethods - def create(attributes = nil, &block) + def create(attributes = nil, &) tracer.in_span("#{self}.create") do super end end - def create!(attributes = nil, &block) + def create!(attributes = nil, &) tracer.in_span("#{self}.create!") do super end diff --git a/instrumentation/active_record/lib/opentelemetry/instrumentation/active_record/patches/transactions_class_methods.rb b/instrumentation/active_record/lib/opentelemetry/instrumentation/active_record/patches/transactions_class_methods.rb index 542281e369..05d5b7e4ac 100644 --- a/instrumentation/active_record/lib/opentelemetry/instrumentation/active_record/patches/transactions_class_methods.rb +++ b/instrumentation/active_record/lib/opentelemetry/instrumentation/active_record/patches/transactions_class_methods.rb @@ -18,7 +18,7 @@ class << base # Contains ActiveRecord::Transactions::ClassMethods to be patched module ClassMethods - def transaction(**options, &block) + def transaction(**options, &) tracer.in_span('ActiveRecord.transaction', attributes: { 'code.namespace' => name }) do super end diff --git a/instrumentation/active_storage/test/opentelemetry/instrumentation/active_storage/subscription_test.rb b/instrumentation/active_storage/test/opentelemetry/instrumentation/active_storage/subscription_test.rb index 07d1b34110..099a85f357 100644 --- a/instrumentation/active_storage/test/opentelemetry/instrumentation/active_storage/subscription_test.rb +++ b/instrumentation/active_storage/test/opentelemetry/instrumentation/active_storage/subscription_test.rb @@ -341,7 +341,7 @@ # NOTE: The test for service_update_metadata.active_storage is skipped because this event is only for GCS service. # https://github.com/rails/rails/blob/fa9cf269191c5077de1abdd1e3f934fbeaf2a5d0/guides/source/active_support_instrumentation.md?plain=1#L928 - 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) @@ -351,7 +351,7 @@ def with_configuration(values, &block) instrumentation.instance_variable_set(:@config, original_config) end - def with_subscription(&block) + def with_subscription(&) OpenTelemetry::Instrumentation::ActiveStorage::Railtie.subscribe yield ensure diff --git a/instrumentation/active_storage/test/test_helpers/test_previewer.rb b/instrumentation/active_storage/test/test_helpers/test_previewer.rb index 5097ce01d3..2a29ecb1fd 100644 --- a/instrumentation/active_storage/test/test_helpers/test_previewer.rb +++ b/instrumentation/active_storage/test/test_helpers/test_previewer.rb @@ -22,7 +22,7 @@ def preview(**options) private - def draw_sample_image(file, &block) - draw 'echo', '"test previewer called"', &block + def draw_sample_image(file, &) + draw('echo', '"test previewer called"', &) end end diff --git a/instrumentation/aws_sdk/lib/opentelemetry/instrumentation/aws_sdk/patches/telemetry.rb b/instrumentation/aws_sdk/lib/opentelemetry/instrumentation/aws_sdk/patches/telemetry.rb index 31bb41c394..68c5141291 100644 --- a/instrumentation/aws_sdk/lib/opentelemetry/instrumentation/aws_sdk/patches/telemetry.rb +++ b/instrumentation/aws_sdk/lib/opentelemetry/instrumentation/aws_sdk/patches/telemetry.rb @@ -16,7 +16,7 @@ def call(context) private - def span_wrapper(context, &block) + def span_wrapper(context, &) service_id = HandlerHelper.service_id(context) client_method = HandlerHelper.client_method(service_id, context) context.tracer.in_span( diff --git a/instrumentation/bunny/lib/opentelemetry/instrumentation/bunny/patch_helpers.rb b/instrumentation/bunny/lib/opentelemetry/instrumentation/bunny/patch_helpers.rb index 043a175699..fe79e9a4ba 100644 --- a/instrumentation/bunny/lib/opentelemetry/instrumentation/bunny/patch_helpers.rb +++ b/instrumentation/bunny/lib/opentelemetry/instrumentation/bunny/patch_helpers.rb @@ -12,11 +12,11 @@ module Bunny # For additional details around trace messaging semantics # See https://github.com/open-telemetry/opentelemetry-specification/blob/master/specification/trace/semantic_conventions/messaging.md#messaging-attributes module PatchHelpers - def self.with_send_span(channel, tracer, exchange, routing_key, &block) + def self.with_send_span(channel, tracer, exchange, routing_key, &) attributes = basic_attributes(channel, channel.connection, exchange, routing_key) destination = destination_name(exchange, routing_key) - tracer.in_span("#{destination} publish", attributes: attributes, kind: :producer, &block) + tracer.in_span("#{destination} publish", attributes: attributes, kind: :producer, &) end def self.with_process_span(channel, tracer, delivery_info, properties, &block) diff --git a/instrumentation/concurrent_ruby/lib/opentelemetry/instrumentation/concurrent_ruby/patches/thread_pool_executor.rb b/instrumentation/concurrent_ruby/lib/opentelemetry/instrumentation/concurrent_ruby/patches/thread_pool_executor.rb index 116e59b27f..02c1f0e59b 100644 --- a/instrumentation/concurrent_ruby/lib/opentelemetry/instrumentation/concurrent_ruby/patches/thread_pool_executor.rb +++ b/instrumentation/concurrent_ruby/lib/opentelemetry/instrumentation/concurrent_ruby/patches/thread_pool_executor.rb @@ -11,7 +11,7 @@ module Patches # Concurrent::ThreadPoolExecutor patch for instrumentation module ThreadPoolExecutor # @see Concurrent::ExecutorService#post - def post(*args, **kwargs, &task) + def post(*args, **kwargs, &) context = OpenTelemetry::Context.current return super unless context diff --git a/instrumentation/delayed_job/lib/opentelemetry/instrumentation/delayed_job/plugins/tracer_plugin.rb b/instrumentation/delayed_job/lib/opentelemetry/instrumentation/delayed_job/plugins/tracer_plugin.rb index 676f720ed3..8edb8f9e24 100644 --- a/instrumentation/delayed_job/lib/opentelemetry/instrumentation/delayed_job/plugins/tracer_plugin.rb +++ b/instrumentation/delayed_job/lib/opentelemetry/instrumentation/delayed_job/plugins/tracer_plugin.rb @@ -13,7 +13,7 @@ module Plugins # Delayed Job plugin that instruments invoke_job and other hooks class TracerPlugin < Delayed::Plugin class << self - def instrument_enqueue(job, &block) + def instrument_enqueue(job, &) return yield(job) unless enabled? attributes = build_attributes(job) @@ -27,7 +27,7 @@ def instrument_enqueue(job, &block) end end - def instrument_invoke(job, &block) + def instrument_invoke(job, &) return yield(job) unless enabled? attributes = build_attributes(job) diff --git a/instrumentation/graphql/test/instrumentation/graphql/tracers/graphql_trace_test.rb b/instrumentation/graphql/test/instrumentation/graphql/tracers/graphql_trace_test.rb index 4fb0e9d85a..7e031854d6 100644 --- a/instrumentation/graphql/test/instrumentation/graphql/tracers/graphql_trace_test.rb +++ b/instrumentation/graphql/test/instrumentation/graphql/tracers/graphql_trace_test.rb @@ -302,32 +302,32 @@ def initialize(events:, **_options) super end - def platform_execute_field(platform_key, &block) + def platform_execute_field(platform_key, &) @events << platform_key yield end - def platform_execute_field_lazy(platform_key, &block) + def platform_execute_field_lazy(platform_key, &) @events << platform_key yield end - def platform_authorized(platform_key, &block) + def platform_authorized(platform_key, &) @events << platform_key yield end - def platform_authorized_lazy(platform_key, &block) + def platform_authorized_lazy(platform_key, &) @events << platform_key yield end - def platform_resolve_type(platform_key, &block) + def platform_resolve_type(platform_key, &) @events << platform_key yield end - def platform_resolve_type_lazy(platform_key, &block) + def platform_resolve_type_lazy(platform_key, &) @events << platform_key yield end diff --git a/instrumentation/http_client/lib/opentelemetry/instrumentation/http_client/patches/client.rb b/instrumentation/http_client/lib/opentelemetry/instrumentation/http_client/patches/client.rb index 46ad72142f..d66e21b964 100644 --- a/instrumentation/http_client/lib/opentelemetry/instrumentation/http_client/patches/client.rb +++ b/instrumentation/http_client/lib/opentelemetry/instrumentation/http_client/patches/client.rb @@ -15,7 +15,7 @@ module Client private - def do_get_block(req, proxy, conn, &block) + def do_get_block(req, proxy, conn, &) uri = req.header.request_uri url = "#{uri.scheme}://#{uri.host}" request_method = req.header.request_method diff --git a/instrumentation/koala/lib/opentelemetry/instrumentation/koala/patches/instrumentation.rb b/instrumentation/koala/lib/opentelemetry/instrumentation/koala/patches/instrumentation.rb index 2fc08f45b0..2279c3cecc 100644 --- a/instrumentation/koala/lib/opentelemetry/instrumentation/koala/patches/instrumentation.rb +++ b/instrumentation/koala/lib/opentelemetry/instrumentation/koala/patches/instrumentation.rb @@ -10,7 +10,7 @@ module Koala module Patches # Module to prepend to Koala::Facebook::API for instrumentation module Api - def graph_call(path, args = {}, verb = 'get', options = {}, &post_processing) + def graph_call(path, args = {}, verb = 'get', options = {}, &) OpenTelemetry::Common::HTTP::ClientContext.with_attributes('peer.service' => 'facebook', 'koala.verb' => verb, 'koala.path' => path) do super end diff --git a/instrumentation/net_http/lib/opentelemetry/instrumentation/net/http/patches/instrumentation.rb b/instrumentation/net_http/lib/opentelemetry/instrumentation/net/http/patches/instrumentation.rb index 6cdbfdb2b7..d5ed8a5923 100644 --- a/instrumentation/net_http/lib/opentelemetry/instrumentation/net/http/patches/instrumentation.rb +++ b/instrumentation/net_http/lib/opentelemetry/instrumentation/net/http/patches/instrumentation.rb @@ -17,7 +17,7 @@ module Instrumentation # Constant for the HTTP status range HTTP_STATUS_SUCCESS_RANGE = (100..399) - def request(req, body = nil, &block) + def request(req, body = nil, &) # Do not trace recursive call for starting the connection return super unless started? diff --git a/instrumentation/que/lib/opentelemetry/instrumentation/que/middlewares/server_middleware.rb b/instrumentation/que/lib/opentelemetry/instrumentation/que/middlewares/server_middleware.rb index 386a6d5cd1..bb9cfae494 100644 --- a/instrumentation/que/lib/opentelemetry/instrumentation/que/middlewares/server_middleware.rb +++ b/instrumentation/que/lib/opentelemetry/instrumentation/que/middlewares/server_middleware.rb @@ -10,7 +10,7 @@ module Que module Middlewares # Server middleware to trace Que jobs class ServerMiddleware - def self.call(job, &block) + def self.call(job, &) job_class = job_class(job) span_name = "#{job_class} process" attributes = attributes_before_job_completion(job, job_class) diff --git a/instrumentation/que/lib/opentelemetry/instrumentation/que/patches/que_job.rb b/instrumentation/que/lib/opentelemetry/instrumentation/que/patches/que_job.rb index a189f5aee9..e50a0994d1 100644 --- a/instrumentation/que/lib/opentelemetry/instrumentation/que/patches/que_job.rb +++ b/instrumentation/que/lib/opentelemetry/instrumentation/que/patches/que_job.rb @@ -62,7 +62,7 @@ def gem_version end if Gem.loaded_specs['que'].version >= Gem::Version.new('2.1.0') - def bulk_enqueue(**_kwargs, &block) + def bulk_enqueue(**_kwargs, &) tracer = Que::Instrumentation.instance.tracer otel_config = Que::Instrumentation.instance.config diff --git a/instrumentation/restclient/lib/opentelemetry/instrumentation/restclient/patches/request.rb b/instrumentation/restclient/lib/opentelemetry/instrumentation/restclient/patches/request.rb index 1507948f7d..94b74ccfef 100644 --- a/instrumentation/restclient/lib/opentelemetry/instrumentation/restclient/patches/request.rb +++ b/instrumentation/restclient/lib/opentelemetry/instrumentation/restclient/patches/request.rb @@ -13,7 +13,7 @@ module Request # Constant for the HTTP status range HTTP_STATUS_SUCCESS_RANGE = (100..399) - def execute(&block) + def execute(&) trace_request do |_span| super end diff --git a/instrumentation/rspec/test/rspec_patches.rb b/instrumentation/rspec/test/rspec_patches.rb index c82fd69219..2286ee4af8 100644 --- a/instrumentation/rspec/test/rspec_patches.rb +++ b/instrumentation/rspec/test/rspec_patches.rb @@ -6,7 +6,7 @@ module RSpec module Core module DSL - def self.change_global_dsl(&blk) + def self.change_global_dsl(&) nil end end