Skip to content

Commit

Permalink
fix: Remove inline linter rules (#608)
Browse files Browse the repository at this point in the history
  • Loading branch information
arielvalentin authored Aug 3, 2023
1 parent 48e3609 commit bc4a937
Show file tree
Hide file tree
Showing 17 changed files with 72 additions and 65 deletions.
9 changes: 8 additions & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ Gemspec/RequiredRubyVersion:
Lint/ConstantDefinitionInBlock:
Exclude:
- "**/*test.rb"
Lint/EmptyBlock:
Exclude:
- "**/*test.rb"
Lint/UnusedMethodArgument:
Enabled: false
Metrics/AbcSize:
Expand All @@ -24,8 +27,12 @@ Metrics/BlockLength:
Enabled: false
Metrics/ClassLength:
Enabled: false
Metrics/CyclomaticComplexity:
Enabled: false
Metrics/MethodLength:
Max: 25
Enabled: false
Metrics/PerceivedComplexity:
Enabled: false
Naming/FileName:
Exclude:
- '**/opentelemetry-*'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def self.prepended(base)
end
end

def perform_now # rubocop:disable Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
def perform_now
span_kind = self.class.queue_adapter_name == 'inline' ? :server : :consumer
span_name = "#{otel_config[:span_naming] == :job_class ? self.class : queue_name} process"
span_attributes = job_attributes(self).merge('messaging.operation' => 'process', 'code.function' => 'perform_now')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class Handler < Seahorse::Client::Handler
SQS_RECEIVE_MESSAGE = 'SQS.ReceiveMessage'
SNS_PUBLISH = 'SNS.Publish'

def call(context) # rubocop:disable Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
def call(context)
return super unless context

service_name = service_name(context)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ def enabled?(config = nil)
# Invalid configuration values are logged, and replaced by the default.
#
# @param [Hash] user_config The user supplied configuration hash
def config_options(user_config) # rubocop:disable Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
def config_options(user_config)
@options ||= {}
user_config ||= {}
config_overrides = config_overrides_from_env
Expand Down Expand Up @@ -348,7 +348,7 @@ def config_overrides_from_env
environment_config_overrides
end

def coerce_env_var(env_var, validation_type) # rubocop:disable Metrics/CyclomaticComplexity
def coerce_env_var(env_var, validation_type)
case validation_type
when :array
env_var.split(',').map(&:strip)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class GraphQLTracer < ::GraphQL::Tracing::PlatformTracing
'execute_multiplex' => 'graphql.execute_multiplex'
}

def platform_trace(platform_key, key, data) # rubocop:disable Metrics/CyclomaticComplexity
def platform_trace(platform_key, key, data)
return yield if platform_key.nil?

tracer.in_span(platform_key, attributes: attributes_for(key, data)) do |span|
Expand Down Expand Up @@ -85,7 +85,7 @@ def config
GraphQL::Instrumentation.instance.config
end

def attributes_for(key, data) # rubocop:disable Metrics/CyclomaticComplexity
def attributes_for(key, data)
attributes = {}
case key
when 'execute_field', 'execute_field_lazy'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ def detect_unmatched_pairs(obfuscated)
%r{'|"|\/\*|\*\/}.match(obfuscated)
end

def database_span_name(sql) # rubocop:disable Metrics/CyclomaticComplexity
def database_span_name(sql)
case config[:span_name]
when :statement_type
extract_statement_type(sql)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ def initialize(app)
@untraced_endpoints = config[:untraced_endpoints]
end

def call(env) # rubocop:disable Metrics/MethodLength
def call(env)
if untraced_request?(env)
OpenTelemetry::Common::Utilities.untraced do
return @app.call(env)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ module QueueTime

module_function

def get_request_start(env, now = nil) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
def get_request_start(env, now = nil)
header = env[REQUEST_START] || env[QUEUE_START]
return unless header

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ module RedisV4Client
MAX_STATEMENT_LENGTH = 500
private_constant :MAX_STATEMENT_LENGTH

def process(commands) # rubocop:disable Metrics/MethodLength, Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity
def process(commands)
return super unless instrumentation_config[:trace_root_spans] || OpenTelemetry::Trace.current_span.context.valid?

host = options[:host]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ module Resque
module Patches
# Module to prepend to Resque::Job for instrumentation
module ResqueJob
def perform # rubocop:disable Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
def perform
job_args = args || []

# Check if the job is being wrapped by ActiveJob
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ module Server
# TracerMiddleware propagates context and instruments Sidekiq requests
# by way of its middleware system
class TracerMiddleware
def call(_worker, msg, _queue) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
def call(_worker, msg, _queue)
attributes = {
SemanticConventions::Trace::MESSAGING_SYSTEM => 'sidekiq',
'messaging.sidekiq.job_class' => msg['wrapped']&.to_s || msg['class'],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ def detect_unmatched_pairs(obfuscated)
%r{'|"|\/\*|\*\/}.match(obfuscated)
end

def database_span_name(sql) # rubocop:disable Metrics/CyclomaticComplexity
def database_span_name(sql)
case config[:span_name]
when :statement_type
extract_statement_type(sql)
Expand Down
82 changes: 41 additions & 41 deletions releases/Gemfile
Original file line number Diff line number Diff line change
@@ -1,53 +1,53 @@
# frozen_string_literal: true

source "https://rubygems.org"
source 'https://rubygems.org'

gem "aws_sdk"
gem "bunny"
gem "concurrent-ruby"
gem "dalli"
gem "delayed_job"
gem "ethon"
gem "excon"
gem "faraday"
gem "grape"
gem "graphql"
gem "http"
gem "httpclient"
gem "koala"
gem "lmdb"
gem "mongo"
gem "mysql2"
gem "pg"
gem "que"
gem "racecar"
gem "rack"
gem "rails"
gem "rake"
gem "rdkafka"
gem "redis"
gem "resque"
gem "rest-client"
gem "rspec"
gem "ruby-kafka"
gem "sidekiq"
gem "sinatra"
gem "trilogy"
gem 'aws_sdk'
gem 'bunny'
gem 'concurrent-ruby'
gem 'dalli'
gem 'delayed_job'
gem 'ethon'
gem 'excon'
gem 'faraday'
gem 'grape'
gem 'graphql'
gem 'http'
gem 'httpclient'
gem 'koala'
gem 'lmdb'
gem 'mongo'
gem 'mysql2'
gem 'pg'
gem 'que'
gem 'racecar'
gem 'rack'
gem 'rails'
gem 'rake'
gem 'rdkafka'
gem 'redis'
gem 'resque'
gem 'rest-client'
gem 'rspec'
gem 'ruby-kafka'
gem 'sidekiq'
gem 'sinatra'
gem 'trilogy'

gem "opentelemetry-api"
gem "opentelemetry-sdk"
gem "opentelemetry-resource_detectors"
gem 'opentelemetry-api'
gem 'opentelemetry-sdk'
gem 'opentelemetry-resource_detectors'

Dir["../propagator/**/version.rb"].each do |f|
name = f.match(/propagator\/(\w+)\/lib/)[1]
Dir['../propagator/**/version.rb'].each do |f|
name = f.match(%r{propagator/(\w+)/lib})[1]

version = File.read(f).match(%r|VERSION = '([\d\.]+)'|)[1]
version = File.read(f).match(/VERSION = '([\d\.]+)'/)[1]
gem "opentelemetry-propagator-#{name}", version
end

Dir["../instrumentation/**/version.rb"].each do |f|
name = f.match(/instrumentation\/(\w+)\/lib/)[1]
Dir['../instrumentation/**/version.rb'].each do |f|
name = f.match(%r{instrumentation/(\w+)/lib})[1]

version = File.read(f).match(%r|VERSION = '([\d\.]+)'|)[1]
version = File.read(f).match(/VERSION = '([\d\.]+)'/)[1]
gem "opentelemetry-instrumentation-#{name}", version
end
10 changes: 5 additions & 5 deletions releases/Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
#
# SPDX-License-Identifier: Apache-2.0

require "minitest/test_task"
require 'minitest/test_task'

Minitest::TestTask.create(:test) do |t|
t.libs << "test"
t.libs << "lib"
t.libs << 'test'
t.libs << 'lib'
t.warning = false
t.test_globs = ["test/**/*_test.rb"]
t.test_globs = ['test/**/*_test.rb']
end

task :default => :test
task default: :test
6 changes: 3 additions & 3 deletions releases/test/integration/installation_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ def test_installs
c.use_all
end

tracer = OpenTelemetry.tracer_provider.tracer("releases","1.0")
tracer.in_span("test") { }
tracer = OpenTelemetry.tracer_provider.tracer('releases', '1.0')
tracer.in_span('test') {}

spans = @exporter.finished_spans
assert_equal(["test"], spans.map(&:name))
assert_equal(['test'], spans.map(&:name))
end
end
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ module Detectors
module GoogleCloudPlatform
extend self

def detect # rubocop:disable Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
def detect
gcp_env = Google::Cloud::Env.new
resource_attributes = {}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def detect
#
# @return [String] container.id
# May be nil.
def container_id # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
def container_id
[CGROUP_V2_PATH, CGROUP_V1_PATH].each do |cgroup|
unless File.readable?(cgroup)
OpenTelemetry.handle_error(message: "Container resource detector - #{cgroup} could not be read.")
Expand Down

0 comments on commit bc4a937

Please sign in to comment.