Fixed: Tools & tests related to 'datadog' rename.

.github/workflows/lib-injection.yml

@@ -76,8 +76,8 @@ jobs:
           path: system-tests
       - name: Overwrite auto inject script with commit SHA
         run: |
-          sed -i "s~<DD_TRACE_SHA_TO_BE_REPLACED>~${{github.sha}}~g" lib-injection/auto_inject.rb
-          sed -i "s~<DD_TRACE_VERSION_TO_BE_REPLACED>~~g" lib-injection/auto_inject.rb
+          sed -i "s~<DATADOG_GEM_SHA_TO_BE_REPLACED>~${{github.sha}}~g" lib-injection/auto_inject.rb
+          sed -i "s~<DATADOG_GEM_VERSION_TO_BE_REPLACED>~~g" lib-injection/auto_inject.rb
       - name: Build app
         run: |
           cp -r system-tests/lib-injection/build/docker/ruby/lib_injection_rails_app system-tests/lib-injection/build/docker/ruby/${{matrix.variant}}

.github/workflows/system-tests.yml

@@ -25,6 +25,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: 'DataDog/system-tests'
+          ref: 'tonycthsu/ruby-datadog-rename'
       - name: Pull released image
         run: |
           docker pull ghcr.io/datadog/dd-trace-rb/system-tests/${{ matrix.image }}:latest
@@ -78,6 +79,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: 'DataDog/system-tests'
+          ref: 'tonycthsu/ruby-datadog-rename'
       - name: Checkout dd-trace-rb
         uses: actions/checkout@v4
         with:
@@ -200,6 +202,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: 'DataDog/system-tests'
+          ref: 'tonycthsu/ruby-datadog-rename'
       - name: Pull agent image
         run: |
           docker pull ghcr.io/datadog/dd-trace-rb/system-tests/agent:gha${{ github.run_id }}-g${{ github.sha }}
@@ -268,6 +271,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: 'DataDog/system-tests'
+          ref: 'tonycthsu/ruby-datadog-rename'
       - name: Retrieve logs
         uses: actions/download-artifact@v3
         with:

benchmarks/tracing_trace.rb

@@ -181,24 +181,27 @@ def benchmark_propagation_trace_context
 
   def benchmark_gem_loading
     # This benchmark needs to be run in a clean environment where datadog is not loaded yet
-    output, status = Open3.capture2e('ruby', stdin_data: <<-RUBY)
-      raise "Datadog is already loaded" if defined?(::Datadog)
+    output, status = Open3.capture2e('bundle', 'exec', 'ruby', stdin_data: <<-RUBY)
+      raise "Datadog is already loaded" if defined?(::Datadog::Core)
 
-      VALIDATE_BENCHMARK_MODE = ENV['VALIDATE_BENCHMARK'] == 'true'
+      lib = File.expand_path('../lib', '#{__dir__}')
+      $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
+      VALIDATE_BENCHMARK_MODE = #{VALIDATE_BENCHMARK_MODE}
       require 'benchmark/ips'
-      
+
       Benchmark.ips do |x|
         # Gem loading is quite slower than the other microbenchmarks
         benchmark_time = VALIDATE_BENCHMARK_MODE ? { time: 0.001, warmup: 0 } : { time: 60, warmup: 5 }
         x.config(**benchmark_time)
-  
+
         x.report("Gem loading") do
           pid = fork { require 'datadog' }
-  
+
           _, status = Process.wait2(pid)
           raise unless status.success?
         end
-  
+
         x.save! "#{__FILE__}-results.json" unless VALIDATE_BENCHMARK_MODE
         x.compare!
       end

datadog.gemspec

@@ -2,6 +2,10 @@
 
 lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+# DEV: Loading gem files here is undesirable because it pollutes the application namesspace.
+# DEV: In this case, `bundle exec ruby -e 'puts defined?(Datadog)'` will return `constant`
+# DEV: even though `require 'datadog'` wasn't executed. But only the version file was loaded.
+# DEV: We should avoid loading gem files to fetch the version here.
 require 'datadog/version'
 
 Gem::Specification.new do |spec|