revision

Author: xuan-cao-swi

instrumentation/base/lib/opentelemetry/instrumentation/base.rb

@@ -214,6 +214,7 @@ def initialize(name, version, install_blk, present_blk,
       #
       # @param [Hash] config The config for this instrumentation
       def install(config = {})
+        puts "name: #{@name}"
         return true if installed?
 
         @config = config_options(config)

zero-code-instrumentation/.rubocop.yml

@@ -1,3 +1,5 @@
 inherit_from: ../.rubocop.yml
 Naming/FileName:
   Enabled: false
+Gemspec/DevelopmentDependencies:
+  Enabled: false

zero-code-instrumentation/CHANGELOG.md

@@ -1,5 +1 @@
 # Release History: zero-code-instrumentation
-
-### v0.1.0 / 2025-01-21
-
-* Initial release

zero-code-instrumentation/README.md

@@ -10,7 +10,7 @@ OpenTelemetry provides a single set of APIs, libraries, agents, and collector se
 
 ## How does this gem fit in?
 
-The `zero-code-instrumentation` gem provides an easy way to load and initialize the OpenTelemetry Ruby SDK. This gem is particularly used for the [OpenTelemetry Operator][opentelemetry-operator].
+The `zero-code-instrumentation` gem provides an easy way to load and initialize the OpenTelemetry Ruby SDK without changing your code initialize the SDK. This gem is particularly used with the [OpenTelemetry Operator][opentelemetry-operator].
 
 ## How do I get started?
 
@@ -97,7 +97,7 @@ export REQUIRE_BUNDLER=true
 RUBYOPT="-r zero-code-instrumentation" rackup config.ru
 ```
 
-If wish to load some gem outside the Gemfile, then it needs to be placed in front of zero-code-instrumentation:
+If you wish to load some gems outside the Gemfile, then they need to be placed in front of zero-code-instrumentation:
 
 ```console
 export BUNDLE_WITHOUT=development,test
@@ -107,11 +107,11 @@ RUBYOPT="-r mysql2 -r zero-code-instrumentation" ruby application.rb
 
 ## Example
 
-In example folder, execute the following commands should see the trace output.
+In example folder, executing the following commands should result in trace output.
 
 ```console
-# if user don't want to install zero-code-instrumentation from rubygems.org
-# user can build the gem and install it with gem install *.gem
+# if the user doesn't want to install zero-code-instrumentation from rubygems.org
+# the user can build the gem and install it with gem install *.gem
 
 gem install zero-code-instrumentation
 bundle install

zero-code-instrumentation/lib/version.rb

@@ -4,4 +4,4 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-VERSION = '0.1.0'
+VERSION = '0.0.0'

zero-code-instrumentation/lib/zero-code-instrumentation.rb

@@ -77,7 +77,7 @@ def detect_resource_from_env
   def determine_enabled_instrumentation
     env = ENV['OTEL_RUBY_ENABLED_INSTRUMENTATIONS'].to_s
 
-    env.split(',').each_with_object({}) { |instrumentation, config| config[OTEL_INSTRUMENTATION_MAP[instrumentation]] = {} }
+    env.split(',').map { |instrumentation| OTEL_INSTRUMENTATION_MAP[instrumentation] }
   end
 
   def require_otel
@@ -90,7 +90,13 @@ def require_otel
 
       OpenTelemetry::SDK.configure do |c|
         c.resource = detect_resource_from_env
-        c.use_all(required_instrumentation)
+        if required_instrumentation.empty?
+          c.use_all # enables all instrumentation!
+        else
+          required_instrumentation.each do |instrumentation|
+            c.use instrumentation
+          end
+        end
       end
       OpenTelemetry.logger.info { 'Auto-instrumentation initialized' }
     rescue StandardError => e
@@ -107,29 +113,26 @@ def require_otel
 
 # set OTEL_OPERATOR to false if not in autoinstrumentation-ruby image, default to /otel-auto-instrumentation-ruby
 # /otel-auto-instrumentation-ruby is set in opentelemetry-operator ruby.go
-operator_gem_path = (ENV['OTEL_RUBY_OPERATOR'].nil? || ENV['OTEL_RUBY_OPERATOR'] == 'true') ? '/otel-auto-instrumentation-ruby' : nil
+operator_gem_path = ENV['OTEL_RUBY_OPERATOR'].nil? || ENV['OTEL_RUBY_OPERATOR'] == 'true' ? '/otel-auto-instrumentation-ruby' : nil
 additional_gem_path = operator_gem_path || ENV['OTEL_RUBY_ADDITIONAL_GEM_PATH'] || Gem.dir
 puts "Loading the additional gem path from #{additional_gem_path}" if ENV['OTEL_RUBY_ZERO_CODE_DEBUG'] == 'true'
 
 # use OTEL_RUBY_UNLOAD_LIBRARY to avoid certain gem preload (esp. google protobuf)
 # e.g export OTEL_RUBY_UNLOAD_LIBRARY=google-protobuf;googleapis-common-protos-types
 unload_libraries = ENV['OTEL_RUBY_UNLOAD_LIBRARY'].to_s.split(';')
-loaded_library_file_path = Array.new
 
-Dir.glob("#{additional_gem_path}/gems/*").each do |file_path|
-  gem_name = file_path.match(/\/gems\/([^\/]+)-\d/)[1]
-  include_file = (file_path.include?('opentelemetry') || file_path.include?('google')) && !unload_libraries.include?(gem_name)
-  loaded_library_file_path << file_path if include_file
+loaded_library_file_path = Dir.glob("#{additional_gem_path}/gems/*").select do |file_path|
+  gem_name = file_path.match(%r{/gems/([^/]+)-\d})[1]
+  (file_path.include?('opentelemetry') || file_path.include?('google')) && !unload_libraries.include?(gem_name)
 end
 
+puts "Loaded Library File Paths #{loaded_library_file_path.join(',')}" if ENV['ZERO_CODE_DEBUG'] == 'true'
+
 loaded_library_file_path.each do |file_path|
   $LOAD_PATH.unshift("#{file_path}/lib")
 end
 
-if ENV['OTEL_RUBY_ZERO_CODE_DEBUG'] == 'true'
-  puts loaded_library_file_path.to_s
-  puts "$LOAD_PATH #{$LOAD_PATH}"
-end
+puts "$LOAD_PATH after unshift: #{$LOAD_PATH.join(',')}" if ENV['OTEL_RUBY_ZERO_CODE_DEBUG'] == 'true'
 
 require 'opentelemetry-sdk'
 require 'opentelemetry-instrumentation-all'

zero-code-instrumentation/test/zero-code-instrumentation_test.rb

@@ -65,7 +65,6 @@
 
     _(registry.size).must_equal 1
     _(registry.first.first.name).must_equal 'OpenTelemetry::Instrumentation::Net::HTTP'
-
   end
 
   it 'simple_load_with_additional_resource' do