lint

Author: xuan-cao-swi

opentelemetry-auto-instrumentation/Gemfile

@@ -9,7 +9,7 @@ source 'https://rubygems.org'
 gemspec
 
 group :test do
-	gem 'bundler'
+  gem 'bundler'
   gem 'minitest'
   gem 'rake'
   gem 'rubocop'
@@ -22,4 +22,4 @@ group :test do
     gem 'bigdecimal'
     gem 'mutex_m'
   end
-end
+end

opentelemetry-auto-instrumentation/lib/opentelemetry-auto-instrumentation.rb

@@ -68,7 +68,7 @@ def detect_resource_from_env
           when 'azure'
             additional_resource = additional_resource.merge(::OpenTelemetry::Resource::Detector::Azure.detect) if defined? ::OpenTelemetry::Resource::Detector::Azure
           when 'aws'
-            additional_resource = additional_resource.merge(::OpenTelemetry::Resource::Detector::AWS.detect([:ec2, :ecs, :eks, :lambda])) if defined? ::OpenTelemetry::Resource::Detector::AWS
+            additional_resource = additional_resource.merge(::OpenTelemetry::Resource::Detector::AWS.detect(%i[ec2 ecs eks lambda])) if defined? ::OpenTelemetry::Resource::Detector::AWS
           end
         end
 
@@ -105,7 +105,7 @@ def initialize_opentelemetry
           end
           OpenTelemetry.logger.info { 'Auto-instrumentation initialized' }
         rescue StandardError => e
-          $stderr.puts "Auto-instrumentation failed to initialize. Error: #{e.message}"
+          warn "Auto-instrumentation failed to initialize. Error: #{e.message}"
         end
       end
     end

opentelemetry-auto-instrumentation/opentelemetry-auto-instrumentation.gemspec

@@ -31,10 +31,10 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-helpers-mysql', '~> 0.2.0'
   spec.add_dependency 'opentelemetry-helpers-sql-obfuscation', '~> 0.3.0'
   spec.add_dependency 'opentelemetry-instrumentation-all', '~> 0.72.0'
+  spec.add_dependency 'opentelemetry-resource-detector-aws', '~> 0.2.0'
   spec.add_dependency 'opentelemetry-resource-detector-azure', '~> 0.2.0'
   spec.add_dependency 'opentelemetry-resource-detector-container', '~> 0.2.0'
   spec.add_dependency 'opentelemetry-resource-detector-google_cloud_platform', '~> 0.2.0'
-  spec.add_dependency 'opentelemetry-resource-detector-aws', '~> 0.2.0'
   spec.add_dependency 'opentelemetry-sdk', '~> 1.6.0'
 
   if spec.respond_to?(:metadata)

opentelemetry-auto-instrumentation/test/opentelemetry-auto-instrumentation_test.rb

@@ -13,19 +13,13 @@
 
   after do
     # Clean up constants and methods if they exist
-    if defined?(OTelBundlerPatch::Initializer::OTEL_INSTRUMENTATION_MAP)
-      OTelBundlerPatch::Initializer.send(:remove_const, :OTEL_INSTRUMENTATION_MAP)
-    end
+    OTelBundlerPatch::Initializer.send(:remove_const, :OTEL_INSTRUMENTATION_MAP) if defined?(OTelBundlerPatch::Initializer::OTEL_INSTRUMENTATION_MAP)
 
-    if defined?(OTelBundlerPatch::Initializer)
-      OTelBundlerPatch.send(:remove_const, :Initializer)
-    end
+    OTelBundlerPatch.send(:remove_const, :Initializer) if defined?(OTelBundlerPatch::Initializer)
 
     %i[require].each do |method|
-      if OTelBundlerPatch.method_defined?(method)
-        OTelBundlerPatch.send(:undef_method, method)
-      end
-    end    # Reset instrumentation installation state
+      OTelBundlerPatch.send(:undef_method, method) if OTelBundlerPatch.method_defined?(method)
+    end
     [
       OpenTelemetry::Instrumentation::Net::HTTP::Instrumentation,
       OpenTelemetry::Instrumentation::Rake::Instrumentation

opentelemetry-auto-instrumentation/test/test_helper.rb

@@ -11,4 +11,4 @@
 require 'opentelemetry-instrumentation-all'
 require 'opentelemetry-test-helpers'
 require 'opentelemetry/resource/detector'
-require 'net/http'
+require 'net/http'