From 43ebe170aba0d40918b072b8bd14e3546fccc0d5 Mon Sep 17 00:00:00 2001
From: Ariel Valentin <arielvalentin@github.com>
Date: Wed, 15 Jan 2025 22:34:21 -0600
Subject: [PATCH 01/14] ci: Add Ruby 3.4 build

---
 .github/workflows/ci-contrib.yml              | 20 +++++++++++++
 .../ci-instrumentation-with-services.yml      | 30 +++++++++++++++++++
 .github/workflows/ci-instrumentation.yml      |  5 ++++
 instrumentation/CONTRIBUTING.md               |  5 ++++
 4 files changed, 60 insertions(+)

diff --git a/.github/workflows/ci-contrib.yml b/.github/workflows/ci-contrib.yml
index 1f0d0c65a..ede73353a 100644
--- a/.github/workflows/ci-contrib.yml
+++ b/.github/workflows/ci-contrib.yml
@@ -30,6 +30,11 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
+      - name: "Test Ruby 3.4"
+        uses: ./.github/actions/test_gem
+        with:
+          gem: "opentelemetry-helpers-${{ matrix.gem }}"
+          ruby: "3.4"
       - name: "Test Ruby 3.3"
         uses: ./.github/actions/test_gem
         with:
@@ -70,6 +75,11 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
+      - name: "Test Ruby 3.4"
+        uses: ./.github/actions/test_gem
+        with:
+          gem: "opentelemetry-helpers-${{ matrix.gem }}"
+          ruby: "3.4"
       - name: "Test Ruby 3.3"
         uses: ./.github/actions/test_gem
         with:
@@ -109,6 +119,11 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
+      - name: "Test Ruby 3.4"
+        uses: ./.github/actions/test_gem
+        with:
+          gem: "opentelemetry-helpers-${{ matrix.gem }}"
+          ruby: "3.4"
       - name: "Test Ruby 3.3"
         uses: ./.github/actions/test_gem
         with:
@@ -147,6 +162,11 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
+      - name: "Test Ruby 3.4"
+        uses: ./.github/actions/test_gem
+        with:
+          gem: "opentelemetry-helpers-${{ matrix.gem }}"
+          ruby: "3.4"
       - name: "Test Ruby 3.3"
         uses: ./.github/actions/test_gem
         with:
diff --git a/.github/workflows/ci-instrumentation-with-services.yml b/.github/workflows/ci-instrumentation-with-services.yml
index e30123ae7..334200306 100644
--- a/.github/workflows/ci-instrumentation-with-services.yml
+++ b/.github/workflows/ci-instrumentation-with-services.yml
@@ -29,6 +29,11 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
+      - name: "Test Ruby 3.4"
+        uses: ./.github/actions/test_gem
+        with:
+          gem: "opentelemetry-helpers-${{ matrix.gem }}"
+          ruby: "3.4"
       - name: "Test Ruby 3.3"
         uses: ./.github/actions/test_gem
         with:
@@ -76,6 +81,11 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
+      - name: "Test Ruby 3.4"
+        uses: ./.github/actions/test_gem
+        with:
+          gem: "opentelemetry-helpers-${{ matrix.gem }}"
+          ruby: "3.4"
       - name: "Test Ruby 3.3"
         uses: ./.github/actions/test_gem
         with:
@@ -114,6 +124,11 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
+      - name: "Test Ruby 3.4"
+        uses: ./.github/actions/test_gem
+        with:
+          gem: "opentelemetry-helpers-${{ matrix.gem }}"
+          ruby: "3.4"
       - name: "Test Ruby 3.3"
         uses: ./.github/actions/test_gem
         with:
@@ -168,6 +183,11 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
+      - name: "Test Ruby 3.4"
+        uses: ./.github/actions/test_gem
+        with:
+          gem: "opentelemetry-helpers-${{ matrix.gem }}"
+          ruby: "3.4"
       - name: "Test Ruby 3.3"
         uses: ./.github/actions/test_gem
         with:
@@ -213,6 +233,11 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
+      - name: "Test Ruby 3.4"
+        uses: ./.github/actions/test_gem
+        with:
+          gem: "opentelemetry-helpers-${{ matrix.gem }}"
+          ruby: "3.4"
       - name: "Test Ruby 3.3"
         uses: ./.github/actions/test_gem
         with:
@@ -255,6 +280,11 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
+      - name: "Test Ruby 3.4"
+        uses: ./.github/actions/test_gem
+        with:
+          gem: "opentelemetry-helpers-${{ matrix.gem }}"
+          ruby: "3.4"
       - name: "Test Ruby 3.3"
         uses: ./.github/actions/test_gem
         with:
diff --git a/.github/workflows/ci-instrumentation.yml b/.github/workflows/ci-instrumentation.yml
index 491fd6e32..8fdfbb764 100644
--- a/.github/workflows/ci-instrumentation.yml
+++ b/.github/workflows/ci-instrumentation.yml
@@ -60,6 +60,11 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
+      - name: "Test Ruby 3.4"
+        uses: ./.github/actions/test_gem
+        with:
+          gem: "opentelemetry-helpers-${{ matrix.gem }}"
+          ruby: "3.4"
       - name: "Test Ruby 3.3"
         uses: ./.github/actions/test_gem
         with:
diff --git a/instrumentation/CONTRIBUTING.md b/instrumentation/CONTRIBUTING.md
index 36269d89d..9a77d6d7a 100644
--- a/instrumentation/CONTRIBUTING.md
+++ b/instrumentation/CONTRIBUTING.md
@@ -353,6 +353,11 @@ If we determine the service container slows down the test suite significantly, i
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
+      - name: "Test Ruby 3.4"
+        uses: ./.github/actions/test_gem
+        with:
+          gem: "opentelemetry-helpers-${{ matrix.gem }}"
+          ruby: "3.4"
       - name: "Test Ruby 3.3"
         uses: ./.github/actions/test_gem
         with:

From 78cb4d2ccb491dc4895ad64ab3ff719e35b4ded4 Mon Sep 17 00:00:00 2001
From: Ariel Valentin <arielvalentin@github.com>
Date: Wed, 29 Jan 2025 18:38:46 -0600
Subject: [PATCH 02/14] squash: use a separate cache key

---
 .github/actions/test_gem/action.yml           | 44 ++++++++-----------
 .../templates/gemspec.tt                      |  2 +-
 CONTRIBUTING.md                               |  4 +-
 .../mysql/opentelemetry-helpers-mysql.gemspec |  1 -
 ...ntelemetry-helpers-sql-obfuscation.gemspec |  1 -
 helpers/sql/opentelemetry-helpers-sql.gemspec |  2 +-
 ...etry-instrumentation-action_mailer.gemspec |  2 +-
 ...emetry-instrumentation-action_pack.gemspec |  2 +-
 ...emetry-instrumentation-action_view.gemspec |  2 +-
 ...lemetry-instrumentation-active_job.gemspec |  2 +-
 ...mentation-active_model_serializers.gemspec |  2 +-
 ...etry-instrumentation-active_record.gemspec |  2 +-
 ...try-instrumentation-active_storage.gemspec |  2 +-
 ...try-instrumentation-active_support.gemspec |  2 +-
 .../opentelemetry-instrumentation-all.gemspec |  2 +-
 ...lemetry-instrumentation-aws_lambda.gemspec |  2 +-
 ...ntelemetry-instrumentation-aws_sdk.gemspec |  2 +-
 ...opentelemetry-instrumentation-base.gemspec |  1 -
 ...pentelemetry-instrumentation-bunny.gemspec |  2 +-
 ...ry-instrumentation-concurrent_ruby.gemspec |  2 +-
 ...pentelemetry-instrumentation-dalli.gemspec |  2 +-
 ...emetry-instrumentation-delayed_job.gemspec |  2 +-
 ...pentelemetry-instrumentation-ethon.gemspec |  2 +-
 ...pentelemetry-instrumentation-excon.gemspec |  2 +-
 ...ntelemetry-instrumentation-faraday.gemspec |  2 +-
 ...pentelemetry-instrumentation-grape.gemspec |  2 +-
 ...ntelemetry-instrumentation-graphql.gemspec |  2 +-
 ...opentelemetry-instrumentation-grpc.gemspec |  2 +-
 ...opentelemetry-instrumentation-gruf.gemspec |  1 -
 ...opentelemetry-instrumentation-http.gemspec |  2 +-
 ...emetry-instrumentation-http_client.gemspec |  2 +-
 ...pentelemetry-instrumentation-httpx.gemspec |  2 +-
 ...pentelemetry-instrumentation-koala.gemspec |  2 +-
 ...opentelemetry-instrumentation-lmdb.gemspec |  2 +-
 ...pentelemetry-instrumentation-mongo.gemspec |  2 +-
 ...entelemetry-instrumentation-mysql2.gemspec |  2 +-
 ...telemetry-instrumentation-net_http.gemspec |  1 -
 .../opentelemetry-instrumentation-pg.gemspec  |  2 +-
 .../opentelemetry-instrumentation-que.gemspec |  2 +-
 ...ntelemetry-instrumentation-racecar.gemspec |  2 +-
 ...opentelemetry-instrumentation-rack.gemspec |  2 +-
 ...pentelemetry-instrumentation-rails.gemspec |  2 +-
 ...opentelemetry-instrumentation-rake.gemspec |  2 +-
 ...ntelemetry-instrumentation-rdkafka.gemspec |  2 +-
 ...pentelemetry-instrumentation-redis.gemspec |  2 +-
 ...entelemetry-instrumentation-resque.gemspec |  2 +-
 ...lemetry-instrumentation-restclient.gemspec |  2 +-
 ...pentelemetry-instrumentation-rspec.gemspec |  2 +-
 ...lemetry-instrumentation-ruby_kafka.gemspec |  2 +-
 ...ntelemetry-instrumentation-sidekiq.gemspec |  2 +-
 ...ntelemetry-instrumentation-sinatra.gemspec |  2 +-
 ...ntelemetry-instrumentation-trilogy.gemspec |  2 +-
 .../opentelemetry-processor-baggage.gemspec   |  1 -
 .../opentelemetry-propagator-ottrace.gemspec  |  1 -
 .../opentelemetry-propagator-vitess.gemspec   |  1 -
 .../opentelemetry-propagator-xray.gemspec     |  1 -
 ...ntelemetry-resource-detector-azure.gemspec |  1 -
 ...emetry-resource-detector-container.gemspec |  1 -
 ...rce-detector-google_cloud_platform.gemspec |  1 -
 59 files changed, 65 insertions(+), 85 deletions(-)

diff --git a/.github/actions/test_gem/action.yml b/.github/actions/test_gem/action.yml
index 276452354..9b4ce7e16 100644
--- a/.github/actions/test_gem/action.yml
+++ b/.github/actions/test_gem/action.yml
@@ -57,7 +57,7 @@ runs:
         # of the benefits of bundler caching.
         rm -f "${dir}/Gemfile.lock"
 
-        echo "cache_key=mri" >> $GITHUB_OUTPUT
+        echo "cache_key=cruby" >> $GITHUB_OUTPUT
         if [[ "${{ inputs.ruby }}" == "jruby" ]]; then
           echo "cache_key=jruby" >> $GITHUB_OUTPUT
         elif [[ "${{ inputs.ruby }}" == "truffleruby" ]]; then
@@ -80,57 +80,49 @@ runs:
       shell: bash
       run: sudo apt update && sudo apt install -y imagemagick
 
-    # Install ruby and bundle dependencies and cache!
-    # ...but not for appraisals, sadly.
-    - name: Install Ruby ${{ inputs.ruby }} with dependencies
-      if: "${{ steps.setup.outputs.appraisals == 'false' }}"
-      uses: ruby/setup-ruby@v1.214.0
-      with:
-        ruby-version: "${{ inputs.ruby }}"
-        working-directory: "${{ steps.setup.outputs.gem_dir }}"
-        bundler:  "latest"
-        bundler-cache: true
-        cache-version: "${{ inputs.ruby }}-${{ steps.setup.outputs.cache_key }}"
-
     # If we're using appraisals, do it all manually.
     - name: Install Ruby ${{ inputs.ruby }} without dependencies
-      if: "${{ steps.setup.outputs.appraisals == 'true' }}"
       uses: ruby/setup-ruby@v1.214.0
       with:
+        bundler: "latest"
         ruby-version: "${{ inputs.ruby }}"
-        bundler:  "latest"
         working-directory: "${{ steps.setup.outputs.gem_dir }}"
-    # Perms workaround. See https://github.com/actions/runner-images/issues/10215
-    - name: Fix GEM_HOME permissions on GitHub Actions Runner
-      if: "${{ steps.setup.outputs.appraisals == 'true' }}"
+
+    - name: Install dependencies
       shell: bash
       run: |
-        # 🛠️😭 Fix GEM_HOME permissions 😭🛠️
-        chmod -R o-w $(gem env home)
+        echo "::group:: 💎 Install dependencies and generate appraisals 💎"
+        bundle install
+
+        echo "::endgroup::"
+      working-directory: "${{ steps.setup.outputs.gem_dir }}"
+
     - name: Install dependencies and generate appraisals
       if: "${{ steps.setup.outputs.appraisals == 'true' }}"
       shell: bash
       run: |
-        # 💎 Install dependencies and generate appraisals 💎
-        bundle install --quiet --jobs=3 --retry=4
+        echo "::group:: 💎 Install dependencies and generate appraisals 💎"
+
         bundle exec appraisal clean
         bundle exec appraisal generate
+
+        echo "::endgroup::"
       working-directory: "${{ steps.setup.outputs.gem_dir }}"
 
     - name: Test Gem
       shell: bash
       run: |
-        # 🍿 Test Gem 🍿
         if [[ -f "Appraisals" ]]; then
           for i in `bundle exec appraisal list | sed 's/-/_/g' `; do
             echo "::group::🔎 Appraising ${i}"
-            BUNDLE_GEMFILE=gemfiles/${i}.gemfile bundle install --quiet --jobs=3 --retry=4 && \
-            BUNDLE_GEMFILE=gemfiles/${i}.gemfile bundle show && \
-            BUNDLE_GEMFILE=gemfiles/${i}.gemfile bundle exec rake test || exit
+            bundle install --gemfile=gemfiles/${i}.gemfile --jobs=3 --retry=4
+            bundle exec --gemfile=gemfiles/${i}.gemfile rake test
             echo "::endgroup::"
           done
         else
+          echo "::group::🔎 Running Tests Standalone"
           bundle exec rake test
+          echo "::endgroup::"
         fi
       working-directory: "${{ steps.setup.outputs.gem_dir }}"
       env:
diff --git a/.instrumentation_generator/templates/gemspec.tt b/.instrumentation_generator/templates/gemspec.tt
index caeaf0530..8b46df2fd 100644
--- a/.instrumentation_generator/templates/gemspec.tt
+++ b/.instrumentation_generator/templates/gemspec.tt
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> <%= instrumentation_base_version %>'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-  spec.add_development_dependency 'bundler', '~> 2.4'
+
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.0'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index dc7c281c7..044428984 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -392,7 +392,7 @@ index 42c5ecba..74fcc743 100644
 --- a/propagator/ottrace/opentelemetry-propagator-ottrace.gemspec
 +++ b/propagator/ottrace/opentelemetry-propagator-ottrace.gemspec
 @@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
-   spec.add_development_dependency 'bundler', '~> 2.4'
+
    spec.add_development_dependency 'minitest', '~> 5.0'
    spec.add_development_dependency 'rake', '~> 13.0'
 -  spec.add_development_dependency 'rubocop', '~> 1.50.0'
@@ -407,7 +407,7 @@ index e29acbfc..85622d25 100644
 --- a/propagator/xray/opentelemetry-propagator-xray.gemspec
 +++ b/propagator/xray/opentelemetry-propagator-xray.gemspec
 @@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
-   spec.add_development_dependency 'bundler', '~> 2.4'
+
    spec.add_development_dependency 'minitest', '~> 5.0'
    spec.add_development_dependency 'rake', '~> 13.0'
 -  spec.add_development_dependency 'rubocop', '~> 1.50.0'
diff --git a/helpers/mysql/opentelemetry-helpers-mysql.gemspec b/helpers/mysql/opentelemetry-helpers-mysql.gemspec
index 00d786041..e81a21c27 100644
--- a/helpers/mysql/opentelemetry-helpers-mysql.gemspec
+++ b/helpers/mysql/opentelemetry-helpers-mysql.gemspec
@@ -28,7 +28,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-api', '~> 1.0'
   spec.add_dependency 'opentelemetry-common', '~> 0.21'
 
-  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
   spec.add_development_dependency 'rake', '~> 13.0'
diff --git a/helpers/sql-obfuscation/opentelemetry-helpers-sql-obfuscation.gemspec b/helpers/sql-obfuscation/opentelemetry-helpers-sql-obfuscation.gemspec
index a8159ad8f..453e6161f 100644
--- a/helpers/sql-obfuscation/opentelemetry-helpers-sql-obfuscation.gemspec
+++ b/helpers/sql-obfuscation/opentelemetry-helpers-sql-obfuscation.gemspec
@@ -27,7 +27,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'opentelemetry-common', '~> 0.21'
 
-  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
   spec.add_development_dependency 'rake', '~> 13.0'
diff --git a/helpers/sql/opentelemetry-helpers-sql.gemspec b/helpers/sql/opentelemetry-helpers-sql.gemspec
index 055c76f31..79d885bc5 100644
--- a/helpers/sql/opentelemetry-helpers-sql.gemspec
+++ b/helpers/sql/opentelemetry-helpers-sql.gemspec
@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-api', '~> 1.4.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-  spec.add_development_dependency 'bundler', '~> 2.4'
+
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
   spec.add_development_dependency 'rake', '~> 13.0'
diff --git a/instrumentation/action_mailer/opentelemetry-instrumentation-action_mailer.gemspec b/instrumentation/action_mailer/opentelemetry-instrumentation-action_mailer.gemspec
index 5a72e1906..73dae00de 100644
--- a/instrumentation/action_mailer/opentelemetry-instrumentation-action_mailer.gemspec
+++ b/instrumentation/action_mailer/opentelemetry-instrumentation-action_mailer.gemspec
@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-  spec.add_development_dependency 'bundler', '~> 2.4'
+
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/action_pack/opentelemetry-instrumentation-action_pack.gemspec b/instrumentation/action_pack/opentelemetry-instrumentation-action_pack.gemspec
index 625dd0a91..835374c20 100644
--- a/instrumentation/action_pack/opentelemetry-instrumentation-action_pack.gemspec
+++ b/instrumentation/action_pack/opentelemetry-instrumentation-action_pack.gemspec
@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-rack', '~> 0.21'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-  spec.add_development_dependency 'bundler', '~> 2.4'
+
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/action_view/opentelemetry-instrumentation-action_view.gemspec b/instrumentation/action_view/opentelemetry-instrumentation-action_view.gemspec
index 2a2baed86..6083a2d88 100644
--- a/instrumentation/action_view/opentelemetry-instrumentation-action_view.gemspec
+++ b/instrumentation/action_view/opentelemetry-instrumentation-action_view.gemspec
@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-  spec.add_development_dependency 'bundler', '~> 2.4'
+
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/active_job/opentelemetry-instrumentation-active_job.gemspec b/instrumentation/active_job/opentelemetry-instrumentation-active_job.gemspec
index a9ff0d8c3..57bc79249 100644
--- a/instrumentation/active_job/opentelemetry-instrumentation-active_job.gemspec
+++ b/instrumentation/active_job/opentelemetry-instrumentation-active_job.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-  spec.add_development_dependency 'bundler', '~> 2.4'
+
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/active_model_serializers/opentelemetry-instrumentation-active_model_serializers.gemspec b/instrumentation/active_model_serializers/opentelemetry-instrumentation-active_model_serializers.gemspec
index 4433473c9..9a88ea48b 100644
--- a/instrumentation/active_model_serializers/opentelemetry-instrumentation-active_model_serializers.gemspec
+++ b/instrumentation/active_model_serializers/opentelemetry-instrumentation-active_model_serializers.gemspec
@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'active_model_serializers', '>= 0.10.0'
   spec.add_development_dependency 'appraisal', '~> 2.5'
-  spec.add_development_dependency 'bundler', '~> 2.4'
+
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/active_record/opentelemetry-instrumentation-active_record.gemspec b/instrumentation/active_record/opentelemetry-instrumentation-active_record.gemspec
index 7e85a6c9a..f7c65063b 100644
--- a/instrumentation/active_record/opentelemetry-instrumentation-active_record.gemspec
+++ b/instrumentation/active_record/opentelemetry-instrumentation-active_record.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-  spec.add_development_dependency 'bundler', '~> 2.4'
+
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/active_storage/opentelemetry-instrumentation-active_storage.gemspec b/instrumentation/active_storage/opentelemetry-instrumentation-active_storage.gemspec
index 68e22175e..c121ffb0a 100644
--- a/instrumentation/active_storage/opentelemetry-instrumentation-active_storage.gemspec
+++ b/instrumentation/active_storage/opentelemetry-instrumentation-active_storage.gemspec
@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-  spec.add_development_dependency 'bundler', '~> 2.4'
+
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/active_support/opentelemetry-instrumentation-active_support.gemspec b/instrumentation/active_support/opentelemetry-instrumentation-active_support.gemspec
index ee346d85d..71fcb2e41 100644
--- a/instrumentation/active_support/opentelemetry-instrumentation-active_support.gemspec
+++ b/instrumentation/active_support/opentelemetry-instrumentation-active_support.gemspec
@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'activesupport'
   spec.add_development_dependency 'appraisal', '~> 2.5'
-  spec.add_development_dependency 'bundler', '~> 2.4'
+
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/all/opentelemetry-instrumentation-all.gemspec b/instrumentation/all/opentelemetry-instrumentation-all.gemspec
index 53b6b65c2..a7ce2d8b1 100644
--- a/instrumentation/all/opentelemetry-instrumentation-all.gemspec
+++ b/instrumentation/all/opentelemetry-instrumentation-all.gemspec
@@ -63,7 +63,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'active_model_serializers'
   spec.add_development_dependency 'activesupport'
-  spec.add_development_dependency 'bundler', '~> 2.4'
+
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rubocop', '~> 1.71.0'
diff --git a/instrumentation/aws_lambda/opentelemetry-instrumentation-aws_lambda.gemspec b/instrumentation/aws_lambda/opentelemetry-instrumentation-aws_lambda.gemspec
index a7bed08ce..2e70332f3 100644
--- a/instrumentation/aws_lambda/opentelemetry-instrumentation-aws_lambda.gemspec
+++ b/instrumentation/aws_lambda/opentelemetry-instrumentation-aws_lambda.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-  spec.add_development_dependency 'bundler', '~> 2.4'
+
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/aws_sdk/opentelemetry-instrumentation-aws_sdk.gemspec b/instrumentation/aws_sdk/opentelemetry-instrumentation-aws_sdk.gemspec
index 1d2b23b8b..dd9efe98b 100644
--- a/instrumentation/aws_sdk/opentelemetry-instrumentation-aws_sdk.gemspec
+++ b/instrumentation/aws_sdk/opentelemetry-instrumentation-aws_sdk.gemspec
@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-  spec.add_development_dependency 'bundler', '~> 2.4'
+
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/base/opentelemetry-instrumentation-base.gemspec b/instrumentation/base/opentelemetry-instrumentation-base.gemspec
index 90edf29d0..e255e1fa0 100644
--- a/instrumentation/base/opentelemetry-instrumentation-base.gemspec
+++ b/instrumentation/base/opentelemetry-instrumentation-base.gemspec
@@ -29,7 +29,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-common', '~> 0.21'
   spec.add_dependency 'opentelemetry-registry', '~> 0.1'
 
-  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
   spec.add_development_dependency 'rake', '~> 13.0'
diff --git a/instrumentation/bunny/opentelemetry-instrumentation-bunny.gemspec b/instrumentation/bunny/opentelemetry-instrumentation-bunny.gemspec
index 47536f452..66f567367 100644
--- a/instrumentation/bunny/opentelemetry-instrumentation-bunny.gemspec
+++ b/instrumentation/bunny/opentelemetry-instrumentation-bunny.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-  spec.add_development_dependency 'bundler', '~> 2.4'
+
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/concurrent_ruby/opentelemetry-instrumentation-concurrent_ruby.gemspec b/instrumentation/concurrent_ruby/opentelemetry-instrumentation-concurrent_ruby.gemspec
index 66eb21b11..7d63314be 100644
--- a/instrumentation/concurrent_ruby/opentelemetry-instrumentation-concurrent_ruby.gemspec
+++ b/instrumentation/concurrent_ruby/opentelemetry-instrumentation-concurrent_ruby.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-  spec.add_development_dependency 'bundler', '~> 2.4'
+
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/dalli/opentelemetry-instrumentation-dalli.gemspec b/instrumentation/dalli/opentelemetry-instrumentation-dalli.gemspec
index 95e8d91c1..565ec4bf8 100644
--- a/instrumentation/dalli/opentelemetry-instrumentation-dalli.gemspec
+++ b/instrumentation/dalli/opentelemetry-instrumentation-dalli.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-  spec.add_development_dependency 'bundler', '~> 2.4'
+
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/delayed_job/opentelemetry-instrumentation-delayed_job.gemspec b/instrumentation/delayed_job/opentelemetry-instrumentation-delayed_job.gemspec
index 7e3fe3a71..3fef6e7f5 100644
--- a/instrumentation/delayed_job/opentelemetry-instrumentation-delayed_job.gemspec
+++ b/instrumentation/delayed_job/opentelemetry-instrumentation-delayed_job.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-  spec.add_development_dependency 'bundler', '~> 2.4'
+
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/ethon/opentelemetry-instrumentation-ethon.gemspec b/instrumentation/ethon/opentelemetry-instrumentation-ethon.gemspec
index e17edf6ed..6cd30dbf6 100644
--- a/instrumentation/ethon/opentelemetry-instrumentation-ethon.gemspec
+++ b/instrumentation/ethon/opentelemetry-instrumentation-ethon.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-  spec.add_development_dependency 'bundler', '~> 2.4'
+
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/excon/opentelemetry-instrumentation-excon.gemspec b/instrumentation/excon/opentelemetry-instrumentation-excon.gemspec
index 4c6006c9b..e13a9a284 100644
--- a/instrumentation/excon/opentelemetry-instrumentation-excon.gemspec
+++ b/instrumentation/excon/opentelemetry-instrumentation-excon.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-  spec.add_development_dependency 'bundler', '~> 2.4'
+
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/faraday/opentelemetry-instrumentation-faraday.gemspec b/instrumentation/faraday/opentelemetry-instrumentation-faraday.gemspec
index fc67d48b7..4787deb91 100644
--- a/instrumentation/faraday/opentelemetry-instrumentation-faraday.gemspec
+++ b/instrumentation/faraday/opentelemetry-instrumentation-faraday.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-  spec.add_development_dependency 'bundler', '~> 2.4'
+
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/grape/opentelemetry-instrumentation-grape.gemspec b/instrumentation/grape/opentelemetry-instrumentation-grape.gemspec
index 6eb4671e0..5a87dd889 100644
--- a/instrumentation/grape/opentelemetry-instrumentation-grape.gemspec
+++ b/instrumentation/grape/opentelemetry-instrumentation-grape.gemspec
@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'activesupport'
   spec.add_development_dependency 'appraisal', '~> 2.5'
-  spec.add_development_dependency 'bundler', '~> 2.4'
+
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.0'
   spec.add_development_dependency 'opentelemetry-test-helpers'
diff --git a/instrumentation/graphql/opentelemetry-instrumentation-graphql.gemspec b/instrumentation/graphql/opentelemetry-instrumentation-graphql.gemspec
index 4646b41b2..412173496 100644
--- a/instrumentation/graphql/opentelemetry-instrumentation-graphql.gemspec
+++ b/instrumentation/graphql/opentelemetry-instrumentation-graphql.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-  spec.add_development_dependency 'bundler', '~> 2.4'
+
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/grpc/opentelemetry-instrumentation-grpc.gemspec b/instrumentation/grpc/opentelemetry-instrumentation-grpc.gemspec
index 5839a7179..d061e5c62 100644
--- a/instrumentation/grpc/opentelemetry-instrumentation-grpc.gemspec
+++ b/instrumentation/grpc/opentelemetry-instrumentation-grpc.gemspec
@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-  spec.add_development_dependency 'bundler', '~> 2.4'
+
   spec.add_development_dependency 'google-protobuf', '~> 4.29'
   spec.add_development_dependency 'grpc-tools', '~> 1.64'
   spec.add_development_dependency 'minitest', '~> 5.0'
diff --git a/instrumentation/gruf/opentelemetry-instrumentation-gruf.gemspec b/instrumentation/gruf/opentelemetry-instrumentation-gruf.gemspec
index 374500e67..6fb66f820 100644
--- a/instrumentation/gruf/opentelemetry-instrumentation-gruf.gemspec
+++ b/instrumentation/gruf/opentelemetry-instrumentation-gruf.gemspec
@@ -29,7 +29,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-  spec.add_development_dependency 'bundler', '>= 1.17'
   spec.add_development_dependency 'grpc_mock'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.0'
diff --git a/instrumentation/http/opentelemetry-instrumentation-http.gemspec b/instrumentation/http/opentelemetry-instrumentation-http.gemspec
index e7e3076ab..efafa90df 100644
--- a/instrumentation/http/opentelemetry-instrumentation-http.gemspec
+++ b/instrumentation/http/opentelemetry-instrumentation-http.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-  spec.add_development_dependency 'bundler', '~> 2.4'
+
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/http_client/opentelemetry-instrumentation-http_client.gemspec b/instrumentation/http_client/opentelemetry-instrumentation-http_client.gemspec
index 4db1c0e74..0d74f5030 100644
--- a/instrumentation/http_client/opentelemetry-instrumentation-http_client.gemspec
+++ b/instrumentation/http_client/opentelemetry-instrumentation-http_client.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-  spec.add_development_dependency 'bundler', '~> 2.4'
+
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/httpx/opentelemetry-instrumentation-httpx.gemspec b/instrumentation/httpx/opentelemetry-instrumentation-httpx.gemspec
index 21e32269c..5d90b6980 100644
--- a/instrumentation/httpx/opentelemetry-instrumentation-httpx.gemspec
+++ b/instrumentation/httpx/opentelemetry-instrumentation-httpx.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-  spec.add_development_dependency 'bundler', '~> 2.4'
+
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/koala/opentelemetry-instrumentation-koala.gemspec b/instrumentation/koala/opentelemetry-instrumentation-koala.gemspec
index 5baaaa202..1589f417b 100644
--- a/instrumentation/koala/opentelemetry-instrumentation-koala.gemspec
+++ b/instrumentation/koala/opentelemetry-instrumentation-koala.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-  spec.add_development_dependency 'bundler', '~> 2.4'
+
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/lmdb/opentelemetry-instrumentation-lmdb.gemspec b/instrumentation/lmdb/opentelemetry-instrumentation-lmdb.gemspec
index 5eed8a275..ccd5c190d 100644
--- a/instrumentation/lmdb/opentelemetry-instrumentation-lmdb.gemspec
+++ b/instrumentation/lmdb/opentelemetry-instrumentation-lmdb.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-  spec.add_development_dependency 'bundler', '~> 2.4'
+
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/mongo/opentelemetry-instrumentation-mongo.gemspec b/instrumentation/mongo/opentelemetry-instrumentation-mongo.gemspec
index 61460cf21..5b321cd40 100644
--- a/instrumentation/mongo/opentelemetry-instrumentation-mongo.gemspec
+++ b/instrumentation/mongo/opentelemetry-instrumentation-mongo.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-  spec.add_development_dependency 'bundler', '~> 2.4'
+
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/mysql2/opentelemetry-instrumentation-mysql2.gemspec b/instrumentation/mysql2/opentelemetry-instrumentation-mysql2.gemspec
index d217b42f9..4068f17e3 100644
--- a/instrumentation/mysql2/opentelemetry-instrumentation-mysql2.gemspec
+++ b/instrumentation/mysql2/opentelemetry-instrumentation-mysql2.gemspec
@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-  spec.add_development_dependency 'bundler', '~> 2.4'
+
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/net_http/opentelemetry-instrumentation-net_http.gemspec b/instrumentation/net_http/opentelemetry-instrumentation-net_http.gemspec
index 19265107a..8062a99ae 100644
--- a/instrumentation/net_http/opentelemetry-instrumentation-net_http.gemspec
+++ b/instrumentation/net_http/opentelemetry-instrumentation-net_http.gemspec
@@ -28,7 +28,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-api', '~> 1.0'
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
-  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/pg/opentelemetry-instrumentation-pg.gemspec b/instrumentation/pg/opentelemetry-instrumentation-pg.gemspec
index 70e2b17f6..e242bbeca 100644
--- a/instrumentation/pg/opentelemetry-instrumentation-pg.gemspec
+++ b/instrumentation/pg/opentelemetry-instrumentation-pg.gemspec
@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-  spec.add_development_dependency 'bundler', '~> 2.4'
+
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/que/opentelemetry-instrumentation-que.gemspec b/instrumentation/que/opentelemetry-instrumentation-que.gemspec
index f8b2a4f4b..bf1044be5 100644
--- a/instrumentation/que/opentelemetry-instrumentation-que.gemspec
+++ b/instrumentation/que/opentelemetry-instrumentation-que.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-  spec.add_development_dependency 'bundler', '~> 2.4'
+
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/racecar/opentelemetry-instrumentation-racecar.gemspec b/instrumentation/racecar/opentelemetry-instrumentation-racecar.gemspec
index 4e2671bca..de1db3bec 100644
--- a/instrumentation/racecar/opentelemetry-instrumentation-racecar.gemspec
+++ b/instrumentation/racecar/opentelemetry-instrumentation-racecar.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-  spec.add_development_dependency 'bundler', '~> 2.4'
+
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.0'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/rack/opentelemetry-instrumentation-rack.gemspec b/instrumentation/rack/opentelemetry-instrumentation-rack.gemspec
index 1188a146a..f084e305b 100644
--- a/instrumentation/rack/opentelemetry-instrumentation-rack.gemspec
+++ b/instrumentation/rack/opentelemetry-instrumentation-rack.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-  spec.add_development_dependency 'bundler', '~> 2.4'
+
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-sdk-experimental', '~> 0.1'
diff --git a/instrumentation/rails/opentelemetry-instrumentation-rails.gemspec b/instrumentation/rails/opentelemetry-instrumentation-rails.gemspec
index 6f6bd5a4f..1b897b4f2 100644
--- a/instrumentation/rails/opentelemetry-instrumentation-rails.gemspec
+++ b/instrumentation/rails/opentelemetry-instrumentation-rails.gemspec
@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-concurrent_ruby', '~> 0.22.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-  spec.add_development_dependency 'bundler', '~> 2.4'
+
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/rake/opentelemetry-instrumentation-rake.gemspec b/instrumentation/rake/opentelemetry-instrumentation-rake.gemspec
index 47d420722..e2b434965 100644
--- a/instrumentation/rake/opentelemetry-instrumentation-rake.gemspec
+++ b/instrumentation/rake/opentelemetry-instrumentation-rake.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-  spec.add_development_dependency 'bundler', '~> 2.4'
+
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.0'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/rdkafka/opentelemetry-instrumentation-rdkafka.gemspec b/instrumentation/rdkafka/opentelemetry-instrumentation-rdkafka.gemspec
index f1f8c2817..820e7f31f 100644
--- a/instrumentation/rdkafka/opentelemetry-instrumentation-rdkafka.gemspec
+++ b/instrumentation/rdkafka/opentelemetry-instrumentation-rdkafka.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-  spec.add_development_dependency 'bundler', '~> 2.4'
+
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/redis/opentelemetry-instrumentation-redis.gemspec b/instrumentation/redis/opentelemetry-instrumentation-redis.gemspec
index 892e75aaa..bff0b93d7 100644
--- a/instrumentation/redis/opentelemetry-instrumentation-redis.gemspec
+++ b/instrumentation/redis/opentelemetry-instrumentation-redis.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-  spec.add_development_dependency 'bundler', '~> 2.4'
+
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/resque/opentelemetry-instrumentation-resque.gemspec b/instrumentation/resque/opentelemetry-instrumentation-resque.gemspec
index b0b8cd737..809eff3dd 100644
--- a/instrumentation/resque/opentelemetry-instrumentation-resque.gemspec
+++ b/instrumentation/resque/opentelemetry-instrumentation-resque.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-  spec.add_development_dependency 'bundler', '~> 2.4'
+
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/restclient/opentelemetry-instrumentation-restclient.gemspec b/instrumentation/restclient/opentelemetry-instrumentation-restclient.gemspec
index 0420dff30..ab758e3bf 100644
--- a/instrumentation/restclient/opentelemetry-instrumentation-restclient.gemspec
+++ b/instrumentation/restclient/opentelemetry-instrumentation-restclient.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-  spec.add_development_dependency 'bundler', '~> 2.4'
+
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/rspec/opentelemetry-instrumentation-rspec.gemspec b/instrumentation/rspec/opentelemetry-instrumentation-rspec.gemspec
index 933ce4d59..39f348949 100644
--- a/instrumentation/rspec/opentelemetry-instrumentation-rspec.gemspec
+++ b/instrumentation/rspec/opentelemetry-instrumentation-rspec.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-  spec.add_development_dependency 'bundler', '~> 2.4'
+
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/ruby_kafka/opentelemetry-instrumentation-ruby_kafka.gemspec b/instrumentation/ruby_kafka/opentelemetry-instrumentation-ruby_kafka.gemspec
index ec5e43d0d..b4a6eb22e 100644
--- a/instrumentation/ruby_kafka/opentelemetry-instrumentation-ruby_kafka.gemspec
+++ b/instrumentation/ruby_kafka/opentelemetry-instrumentation-ruby_kafka.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-  spec.add_development_dependency 'bundler', '~> 2.4'
+
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/sidekiq/opentelemetry-instrumentation-sidekiq.gemspec b/instrumentation/sidekiq/opentelemetry-instrumentation-sidekiq.gemspec
index 1b45f0f24..1a9ffec15 100644
--- a/instrumentation/sidekiq/opentelemetry-instrumentation-sidekiq.gemspec
+++ b/instrumentation/sidekiq/opentelemetry-instrumentation-sidekiq.gemspec
@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'activejob', '>= 6.0'
   spec.add_development_dependency 'appraisal', '~> 2.5'
-  spec.add_development_dependency 'bundler', '~> 2.4'
+
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/sinatra/opentelemetry-instrumentation-sinatra.gemspec b/instrumentation/sinatra/opentelemetry-instrumentation-sinatra.gemspec
index 4c4bf7ed4..40049b9ab 100644
--- a/instrumentation/sinatra/opentelemetry-instrumentation-sinatra.gemspec
+++ b/instrumentation/sinatra/opentelemetry-instrumentation-sinatra.gemspec
@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-rack', '~> 0.21'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-  spec.add_development_dependency 'bundler', '~> 2.4'
+
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/trilogy/opentelemetry-instrumentation-trilogy.gemspec b/instrumentation/trilogy/opentelemetry-instrumentation-trilogy.gemspec
index a5296365d..d7d83f695 100644
--- a/instrumentation/trilogy/opentelemetry-instrumentation-trilogy.gemspec
+++ b/instrumentation/trilogy/opentelemetry-instrumentation-trilogy.gemspec
@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-semantic_conventions', '>= 1.8.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-  spec.add_development_dependency 'bundler', '~> 2.4'
+
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/processor/baggage/opentelemetry-processor-baggage.gemspec b/processor/baggage/opentelemetry-processor-baggage.gemspec
index 7c2337be3..875f5229c 100644
--- a/processor/baggage/opentelemetry-processor-baggage.gemspec
+++ b/processor/baggage/opentelemetry-processor-baggage.gemspec
@@ -26,7 +26,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-api', '~> 1.0'
   spec.add_dependency 'opentelemetry-sdk', '~> 1.0'
 
-  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'rake', '~> 13.0'
diff --git a/propagator/ottrace/opentelemetry-propagator-ottrace.gemspec b/propagator/ottrace/opentelemetry-propagator-ottrace.gemspec
index 44b27b6ce..515dfa7f7 100644
--- a/propagator/ottrace/opentelemetry-propagator-ottrace.gemspec
+++ b/propagator/ottrace/opentelemetry-propagator-ottrace.gemspec
@@ -25,7 +25,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'opentelemetry-api', '~> 1.0'
 
-  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rubocop', '~> 1.71.0'
diff --git a/propagator/vitess/opentelemetry-propagator-vitess.gemspec b/propagator/vitess/opentelemetry-propagator-vitess.gemspec
index 9b7018ce7..18a2c6df4 100644
--- a/propagator/vitess/opentelemetry-propagator-vitess.gemspec
+++ b/propagator/vitess/opentelemetry-propagator-vitess.gemspec
@@ -26,7 +26,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-api', '~> 1.0'
   spec.add_dependency 'opentelemetry-propagator-jaeger', '~> 0.21'
 
-  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rubocop', '~> 1.71.0'
diff --git a/propagator/xray/opentelemetry-propagator-xray.gemspec b/propagator/xray/opentelemetry-propagator-xray.gemspec
index b9f0d3c40..14c1cd1fa 100644
--- a/propagator/xray/opentelemetry-propagator-xray.gemspec
+++ b/propagator/xray/opentelemetry-propagator-xray.gemspec
@@ -28,7 +28,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'opentelemetry-api', '~> 1.0'
 
-  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rubocop', '~> 1.71.0'
diff --git a/resources/azure/opentelemetry-resource-detector-azure.gemspec b/resources/azure/opentelemetry-resource-detector-azure.gemspec
index 3c555d598..367392b6d 100644
--- a/resources/azure/opentelemetry-resource-detector-azure.gemspec
+++ b/resources/azure/opentelemetry-resource-detector-azure.gemspec
@@ -27,7 +27,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'opentelemetry-sdk', '~> 1.0'
 
-  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rubocop', '~> 1.71.0'
diff --git a/resources/container/opentelemetry-resource-detector-container.gemspec b/resources/container/opentelemetry-resource-detector-container.gemspec
index 5a5263071..d3ac82a39 100644
--- a/resources/container/opentelemetry-resource-detector-container.gemspec
+++ b/resources/container/opentelemetry-resource-detector-container.gemspec
@@ -27,7 +27,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'opentelemetry-sdk', '~> 1.0'
 
-  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rubocop', '~> 1.71.0'
diff --git a/resources/google_cloud_platform/opentelemetry-resource-detector-google_cloud_platform.gemspec b/resources/google_cloud_platform/opentelemetry-resource-detector-google_cloud_platform.gemspec
index e61687539..7332cf412 100644
--- a/resources/google_cloud_platform/opentelemetry-resource-detector-google_cloud_platform.gemspec
+++ b/resources/google_cloud_platform/opentelemetry-resource-detector-google_cloud_platform.gemspec
@@ -28,7 +28,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'google-cloud-env'
   spec.add_dependency 'opentelemetry-sdk', '~> 1.0'
 
-  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rubocop', '~> 1.71.0'

From ecc88cb86a29ecd4c6b3927eebefeda96b13234f Mon Sep 17 00:00:00 2001
From: Ariel Valentin <arielvalentin@github.com>
Date: Wed, 29 Jan 2025 22:18:30 -0600
Subject: [PATCH 03/14] Revert "squash: use a separate cache key"

This reverts commit 78cb4d2ccb491dc4895ad64ab3ff719e35b4ded4.
---
 .github/actions/test_gem/action.yml           | 44 +++++++++++--------
 .../templates/gemspec.tt                      |  2 +-
 CONTRIBUTING.md                               |  4 +-
 .../mysql/opentelemetry-helpers-mysql.gemspec |  1 +
 ...ntelemetry-helpers-sql-obfuscation.gemspec |  1 +
 helpers/sql/opentelemetry-helpers-sql.gemspec |  2 +-
 ...etry-instrumentation-action_mailer.gemspec |  2 +-
 ...emetry-instrumentation-action_pack.gemspec |  2 +-
 ...emetry-instrumentation-action_view.gemspec |  2 +-
 ...lemetry-instrumentation-active_job.gemspec |  2 +-
 ...mentation-active_model_serializers.gemspec |  2 +-
 ...etry-instrumentation-active_record.gemspec |  2 +-
 ...try-instrumentation-active_storage.gemspec |  2 +-
 ...try-instrumentation-active_support.gemspec |  2 +-
 .../opentelemetry-instrumentation-all.gemspec |  2 +-
 ...lemetry-instrumentation-aws_lambda.gemspec |  2 +-
 ...ntelemetry-instrumentation-aws_sdk.gemspec |  2 +-
 ...opentelemetry-instrumentation-base.gemspec |  1 +
 ...pentelemetry-instrumentation-bunny.gemspec |  2 +-
 ...ry-instrumentation-concurrent_ruby.gemspec |  2 +-
 ...pentelemetry-instrumentation-dalli.gemspec |  2 +-
 ...emetry-instrumentation-delayed_job.gemspec |  2 +-
 ...pentelemetry-instrumentation-ethon.gemspec |  2 +-
 ...pentelemetry-instrumentation-excon.gemspec |  2 +-
 ...ntelemetry-instrumentation-faraday.gemspec |  2 +-
 ...pentelemetry-instrumentation-grape.gemspec |  2 +-
 ...ntelemetry-instrumentation-graphql.gemspec |  2 +-
 ...opentelemetry-instrumentation-grpc.gemspec |  2 +-
 ...opentelemetry-instrumentation-gruf.gemspec |  1 +
 ...opentelemetry-instrumentation-http.gemspec |  2 +-
 ...emetry-instrumentation-http_client.gemspec |  2 +-
 ...pentelemetry-instrumentation-httpx.gemspec |  2 +-
 ...pentelemetry-instrumentation-koala.gemspec |  2 +-
 ...opentelemetry-instrumentation-lmdb.gemspec |  2 +-
 ...pentelemetry-instrumentation-mongo.gemspec |  2 +-
 ...entelemetry-instrumentation-mysql2.gemspec |  2 +-
 ...telemetry-instrumentation-net_http.gemspec |  1 +
 .../opentelemetry-instrumentation-pg.gemspec  |  2 +-
 .../opentelemetry-instrumentation-que.gemspec |  2 +-
 ...ntelemetry-instrumentation-racecar.gemspec |  2 +-
 ...opentelemetry-instrumentation-rack.gemspec |  2 +-
 ...pentelemetry-instrumentation-rails.gemspec |  2 +-
 ...opentelemetry-instrumentation-rake.gemspec |  2 +-
 ...ntelemetry-instrumentation-rdkafka.gemspec |  2 +-
 ...pentelemetry-instrumentation-redis.gemspec |  2 +-
 ...entelemetry-instrumentation-resque.gemspec |  2 +-
 ...lemetry-instrumentation-restclient.gemspec |  2 +-
 ...pentelemetry-instrumentation-rspec.gemspec |  2 +-
 ...lemetry-instrumentation-ruby_kafka.gemspec |  2 +-
 ...ntelemetry-instrumentation-sidekiq.gemspec |  2 +-
 ...ntelemetry-instrumentation-sinatra.gemspec |  2 +-
 ...ntelemetry-instrumentation-trilogy.gemspec |  2 +-
 .../opentelemetry-processor-baggage.gemspec   |  1 +
 .../opentelemetry-propagator-ottrace.gemspec  |  1 +
 .../opentelemetry-propagator-vitess.gemspec   |  1 +
 .../opentelemetry-propagator-xray.gemspec     |  1 +
 ...ntelemetry-resource-detector-azure.gemspec |  1 +
 ...emetry-resource-detector-container.gemspec |  1 +
 ...rce-detector-google_cloud_platform.gemspec |  1 +
 59 files changed, 85 insertions(+), 65 deletions(-)

diff --git a/.github/actions/test_gem/action.yml b/.github/actions/test_gem/action.yml
index 9b4ce7e16..276452354 100644
--- a/.github/actions/test_gem/action.yml
+++ b/.github/actions/test_gem/action.yml
@@ -57,7 +57,7 @@ runs:
         # of the benefits of bundler caching.
         rm -f "${dir}/Gemfile.lock"
 
-        echo "cache_key=cruby" >> $GITHUB_OUTPUT
+        echo "cache_key=mri" >> $GITHUB_OUTPUT
         if [[ "${{ inputs.ruby }}" == "jruby" ]]; then
           echo "cache_key=jruby" >> $GITHUB_OUTPUT
         elif [[ "${{ inputs.ruby }}" == "truffleruby" ]]; then
@@ -80,49 +80,57 @@ runs:
       shell: bash
       run: sudo apt update && sudo apt install -y imagemagick
 
+    # Install ruby and bundle dependencies and cache!
+    # ...but not for appraisals, sadly.
+    - name: Install Ruby ${{ inputs.ruby }} with dependencies
+      if: "${{ steps.setup.outputs.appraisals == 'false' }}"
+      uses: ruby/setup-ruby@v1.214.0
+      with:
+        ruby-version: "${{ inputs.ruby }}"
+        working-directory: "${{ steps.setup.outputs.gem_dir }}"
+        bundler:  "latest"
+        bundler-cache: true
+        cache-version: "${{ inputs.ruby }}-${{ steps.setup.outputs.cache_key }}"
+
     # If we're using appraisals, do it all manually.
     - name: Install Ruby ${{ inputs.ruby }} without dependencies
+      if: "${{ steps.setup.outputs.appraisals == 'true' }}"
       uses: ruby/setup-ruby@v1.214.0
       with:
-        bundler: "latest"
         ruby-version: "${{ inputs.ruby }}"
+        bundler:  "latest"
         working-directory: "${{ steps.setup.outputs.gem_dir }}"
-
-    - name: Install dependencies
+    # Perms workaround. See https://github.com/actions/runner-images/issues/10215
+    - name: Fix GEM_HOME permissions on GitHub Actions Runner
+      if: "${{ steps.setup.outputs.appraisals == 'true' }}"
       shell: bash
       run: |
-        echo "::group:: 💎 Install dependencies and generate appraisals 💎"
-        bundle install
-
-        echo "::endgroup::"
-      working-directory: "${{ steps.setup.outputs.gem_dir }}"
-
+        # 🛠️😭 Fix GEM_HOME permissions 😭🛠️
+        chmod -R o-w $(gem env home)
     - name: Install dependencies and generate appraisals
       if: "${{ steps.setup.outputs.appraisals == 'true' }}"
       shell: bash
       run: |
-        echo "::group:: 💎 Install dependencies and generate appraisals 💎"
-
+        # 💎 Install dependencies and generate appraisals 💎
+        bundle install --quiet --jobs=3 --retry=4
         bundle exec appraisal clean
         bundle exec appraisal generate
-
-        echo "::endgroup::"
       working-directory: "${{ steps.setup.outputs.gem_dir }}"
 
     - name: Test Gem
       shell: bash
       run: |
+        # 🍿 Test Gem 🍿
         if [[ -f "Appraisals" ]]; then
           for i in `bundle exec appraisal list | sed 's/-/_/g' `; do
             echo "::group::🔎 Appraising ${i}"
-            bundle install --gemfile=gemfiles/${i}.gemfile --jobs=3 --retry=4
-            bundle exec --gemfile=gemfiles/${i}.gemfile rake test
+            BUNDLE_GEMFILE=gemfiles/${i}.gemfile bundle install --quiet --jobs=3 --retry=4 && \
+            BUNDLE_GEMFILE=gemfiles/${i}.gemfile bundle show && \
+            BUNDLE_GEMFILE=gemfiles/${i}.gemfile bundle exec rake test || exit
             echo "::endgroup::"
           done
         else
-          echo "::group::🔎 Running Tests Standalone"
           bundle exec rake test
-          echo "::endgroup::"
         fi
       working-directory: "${{ steps.setup.outputs.gem_dir }}"
       env:
diff --git a/.instrumentation_generator/templates/gemspec.tt b/.instrumentation_generator/templates/gemspec.tt
index 8b46df2fd..caeaf0530 100644
--- a/.instrumentation_generator/templates/gemspec.tt
+++ b/.instrumentation_generator/templates/gemspec.tt
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> <%= instrumentation_base_version %>'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.0'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 044428984..dc7c281c7 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -392,7 +392,7 @@ index 42c5ecba..74fcc743 100644
 --- a/propagator/ottrace/opentelemetry-propagator-ottrace.gemspec
 +++ b/propagator/ottrace/opentelemetry-propagator-ottrace.gemspec
 @@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
-
+   spec.add_development_dependency 'bundler', '~> 2.4'
    spec.add_development_dependency 'minitest', '~> 5.0'
    spec.add_development_dependency 'rake', '~> 13.0'
 -  spec.add_development_dependency 'rubocop', '~> 1.50.0'
@@ -407,7 +407,7 @@ index e29acbfc..85622d25 100644
 --- a/propagator/xray/opentelemetry-propagator-xray.gemspec
 +++ b/propagator/xray/opentelemetry-propagator-xray.gemspec
 @@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
-
+   spec.add_development_dependency 'bundler', '~> 2.4'
    spec.add_development_dependency 'minitest', '~> 5.0'
    spec.add_development_dependency 'rake', '~> 13.0'
 -  spec.add_development_dependency 'rubocop', '~> 1.50.0'
diff --git a/helpers/mysql/opentelemetry-helpers-mysql.gemspec b/helpers/mysql/opentelemetry-helpers-mysql.gemspec
index e81a21c27..00d786041 100644
--- a/helpers/mysql/opentelemetry-helpers-mysql.gemspec
+++ b/helpers/mysql/opentelemetry-helpers-mysql.gemspec
@@ -28,6 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-api', '~> 1.0'
   spec.add_dependency 'opentelemetry-common', '~> 0.21'
 
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
   spec.add_development_dependency 'rake', '~> 13.0'
diff --git a/helpers/sql-obfuscation/opentelemetry-helpers-sql-obfuscation.gemspec b/helpers/sql-obfuscation/opentelemetry-helpers-sql-obfuscation.gemspec
index 453e6161f..a8159ad8f 100644
--- a/helpers/sql-obfuscation/opentelemetry-helpers-sql-obfuscation.gemspec
+++ b/helpers/sql-obfuscation/opentelemetry-helpers-sql-obfuscation.gemspec
@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'opentelemetry-common', '~> 0.21'
 
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
   spec.add_development_dependency 'rake', '~> 13.0'
diff --git a/helpers/sql/opentelemetry-helpers-sql.gemspec b/helpers/sql/opentelemetry-helpers-sql.gemspec
index 79d885bc5..055c76f31 100644
--- a/helpers/sql/opentelemetry-helpers-sql.gemspec
+++ b/helpers/sql/opentelemetry-helpers-sql.gemspec
@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-api', '~> 1.4.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
   spec.add_development_dependency 'rake', '~> 13.0'
diff --git a/instrumentation/action_mailer/opentelemetry-instrumentation-action_mailer.gemspec b/instrumentation/action_mailer/opentelemetry-instrumentation-action_mailer.gemspec
index 73dae00de..5a72e1906 100644
--- a/instrumentation/action_mailer/opentelemetry-instrumentation-action_mailer.gemspec
+++ b/instrumentation/action_mailer/opentelemetry-instrumentation-action_mailer.gemspec
@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/action_pack/opentelemetry-instrumentation-action_pack.gemspec b/instrumentation/action_pack/opentelemetry-instrumentation-action_pack.gemspec
index 835374c20..625dd0a91 100644
--- a/instrumentation/action_pack/opentelemetry-instrumentation-action_pack.gemspec
+++ b/instrumentation/action_pack/opentelemetry-instrumentation-action_pack.gemspec
@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-rack', '~> 0.21'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/action_view/opentelemetry-instrumentation-action_view.gemspec b/instrumentation/action_view/opentelemetry-instrumentation-action_view.gemspec
index 6083a2d88..2a2baed86 100644
--- a/instrumentation/action_view/opentelemetry-instrumentation-action_view.gemspec
+++ b/instrumentation/action_view/opentelemetry-instrumentation-action_view.gemspec
@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/active_job/opentelemetry-instrumentation-active_job.gemspec b/instrumentation/active_job/opentelemetry-instrumentation-active_job.gemspec
index 57bc79249..a9ff0d8c3 100644
--- a/instrumentation/active_job/opentelemetry-instrumentation-active_job.gemspec
+++ b/instrumentation/active_job/opentelemetry-instrumentation-active_job.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/active_model_serializers/opentelemetry-instrumentation-active_model_serializers.gemspec b/instrumentation/active_model_serializers/opentelemetry-instrumentation-active_model_serializers.gemspec
index 9a88ea48b..4433473c9 100644
--- a/instrumentation/active_model_serializers/opentelemetry-instrumentation-active_model_serializers.gemspec
+++ b/instrumentation/active_model_serializers/opentelemetry-instrumentation-active_model_serializers.gemspec
@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'active_model_serializers', '>= 0.10.0'
   spec.add_development_dependency 'appraisal', '~> 2.5'
-
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/active_record/opentelemetry-instrumentation-active_record.gemspec b/instrumentation/active_record/opentelemetry-instrumentation-active_record.gemspec
index f7c65063b..7e85a6c9a 100644
--- a/instrumentation/active_record/opentelemetry-instrumentation-active_record.gemspec
+++ b/instrumentation/active_record/opentelemetry-instrumentation-active_record.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/active_storage/opentelemetry-instrumentation-active_storage.gemspec b/instrumentation/active_storage/opentelemetry-instrumentation-active_storage.gemspec
index c121ffb0a..68e22175e 100644
--- a/instrumentation/active_storage/opentelemetry-instrumentation-active_storage.gemspec
+++ b/instrumentation/active_storage/opentelemetry-instrumentation-active_storage.gemspec
@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/active_support/opentelemetry-instrumentation-active_support.gemspec b/instrumentation/active_support/opentelemetry-instrumentation-active_support.gemspec
index 71fcb2e41..ee346d85d 100644
--- a/instrumentation/active_support/opentelemetry-instrumentation-active_support.gemspec
+++ b/instrumentation/active_support/opentelemetry-instrumentation-active_support.gemspec
@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'activesupport'
   spec.add_development_dependency 'appraisal', '~> 2.5'
-
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/all/opentelemetry-instrumentation-all.gemspec b/instrumentation/all/opentelemetry-instrumentation-all.gemspec
index a7ce2d8b1..53b6b65c2 100644
--- a/instrumentation/all/opentelemetry-instrumentation-all.gemspec
+++ b/instrumentation/all/opentelemetry-instrumentation-all.gemspec
@@ -63,7 +63,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'active_model_serializers'
   spec.add_development_dependency 'activesupport'
-
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rubocop', '~> 1.71.0'
diff --git a/instrumentation/aws_lambda/opentelemetry-instrumentation-aws_lambda.gemspec b/instrumentation/aws_lambda/opentelemetry-instrumentation-aws_lambda.gemspec
index 2e70332f3..a7bed08ce 100644
--- a/instrumentation/aws_lambda/opentelemetry-instrumentation-aws_lambda.gemspec
+++ b/instrumentation/aws_lambda/opentelemetry-instrumentation-aws_lambda.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/aws_sdk/opentelemetry-instrumentation-aws_sdk.gemspec b/instrumentation/aws_sdk/opentelemetry-instrumentation-aws_sdk.gemspec
index dd9efe98b..1d2b23b8b 100644
--- a/instrumentation/aws_sdk/opentelemetry-instrumentation-aws_sdk.gemspec
+++ b/instrumentation/aws_sdk/opentelemetry-instrumentation-aws_sdk.gemspec
@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/base/opentelemetry-instrumentation-base.gemspec b/instrumentation/base/opentelemetry-instrumentation-base.gemspec
index e255e1fa0..90edf29d0 100644
--- a/instrumentation/base/opentelemetry-instrumentation-base.gemspec
+++ b/instrumentation/base/opentelemetry-instrumentation-base.gemspec
@@ -29,6 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-common', '~> 0.21'
   spec.add_dependency 'opentelemetry-registry', '~> 0.1'
 
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
   spec.add_development_dependency 'rake', '~> 13.0'
diff --git a/instrumentation/bunny/opentelemetry-instrumentation-bunny.gemspec b/instrumentation/bunny/opentelemetry-instrumentation-bunny.gemspec
index 66f567367..47536f452 100644
--- a/instrumentation/bunny/opentelemetry-instrumentation-bunny.gemspec
+++ b/instrumentation/bunny/opentelemetry-instrumentation-bunny.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/concurrent_ruby/opentelemetry-instrumentation-concurrent_ruby.gemspec b/instrumentation/concurrent_ruby/opentelemetry-instrumentation-concurrent_ruby.gemspec
index 7d63314be..66eb21b11 100644
--- a/instrumentation/concurrent_ruby/opentelemetry-instrumentation-concurrent_ruby.gemspec
+++ b/instrumentation/concurrent_ruby/opentelemetry-instrumentation-concurrent_ruby.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/dalli/opentelemetry-instrumentation-dalli.gemspec b/instrumentation/dalli/opentelemetry-instrumentation-dalli.gemspec
index 565ec4bf8..95e8d91c1 100644
--- a/instrumentation/dalli/opentelemetry-instrumentation-dalli.gemspec
+++ b/instrumentation/dalli/opentelemetry-instrumentation-dalli.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/delayed_job/opentelemetry-instrumentation-delayed_job.gemspec b/instrumentation/delayed_job/opentelemetry-instrumentation-delayed_job.gemspec
index 3fef6e7f5..7e3fe3a71 100644
--- a/instrumentation/delayed_job/opentelemetry-instrumentation-delayed_job.gemspec
+++ b/instrumentation/delayed_job/opentelemetry-instrumentation-delayed_job.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/ethon/opentelemetry-instrumentation-ethon.gemspec b/instrumentation/ethon/opentelemetry-instrumentation-ethon.gemspec
index 6cd30dbf6..e17edf6ed 100644
--- a/instrumentation/ethon/opentelemetry-instrumentation-ethon.gemspec
+++ b/instrumentation/ethon/opentelemetry-instrumentation-ethon.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/excon/opentelemetry-instrumentation-excon.gemspec b/instrumentation/excon/opentelemetry-instrumentation-excon.gemspec
index e13a9a284..4c6006c9b 100644
--- a/instrumentation/excon/opentelemetry-instrumentation-excon.gemspec
+++ b/instrumentation/excon/opentelemetry-instrumentation-excon.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/faraday/opentelemetry-instrumentation-faraday.gemspec b/instrumentation/faraday/opentelemetry-instrumentation-faraday.gemspec
index 4787deb91..fc67d48b7 100644
--- a/instrumentation/faraday/opentelemetry-instrumentation-faraday.gemspec
+++ b/instrumentation/faraday/opentelemetry-instrumentation-faraday.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/grape/opentelemetry-instrumentation-grape.gemspec b/instrumentation/grape/opentelemetry-instrumentation-grape.gemspec
index 5a87dd889..6eb4671e0 100644
--- a/instrumentation/grape/opentelemetry-instrumentation-grape.gemspec
+++ b/instrumentation/grape/opentelemetry-instrumentation-grape.gemspec
@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'activesupport'
   spec.add_development_dependency 'appraisal', '~> 2.5'
-
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.0'
   spec.add_development_dependency 'opentelemetry-test-helpers'
diff --git a/instrumentation/graphql/opentelemetry-instrumentation-graphql.gemspec b/instrumentation/graphql/opentelemetry-instrumentation-graphql.gemspec
index 412173496..4646b41b2 100644
--- a/instrumentation/graphql/opentelemetry-instrumentation-graphql.gemspec
+++ b/instrumentation/graphql/opentelemetry-instrumentation-graphql.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/grpc/opentelemetry-instrumentation-grpc.gemspec b/instrumentation/grpc/opentelemetry-instrumentation-grpc.gemspec
index d061e5c62..5839a7179 100644
--- a/instrumentation/grpc/opentelemetry-instrumentation-grpc.gemspec
+++ b/instrumentation/grpc/opentelemetry-instrumentation-grpc.gemspec
@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'google-protobuf', '~> 4.29'
   spec.add_development_dependency 'grpc-tools', '~> 1.64'
   spec.add_development_dependency 'minitest', '~> 5.0'
diff --git a/instrumentation/gruf/opentelemetry-instrumentation-gruf.gemspec b/instrumentation/gruf/opentelemetry-instrumentation-gruf.gemspec
index 6fb66f820..374500e67 100644
--- a/instrumentation/gruf/opentelemetry-instrumentation-gruf.gemspec
+++ b/instrumentation/gruf/opentelemetry-instrumentation-gruf.gemspec
@@ -29,6 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
+  spec.add_development_dependency 'bundler', '>= 1.17'
   spec.add_development_dependency 'grpc_mock'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.0'
diff --git a/instrumentation/http/opentelemetry-instrumentation-http.gemspec b/instrumentation/http/opentelemetry-instrumentation-http.gemspec
index efafa90df..e7e3076ab 100644
--- a/instrumentation/http/opentelemetry-instrumentation-http.gemspec
+++ b/instrumentation/http/opentelemetry-instrumentation-http.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/http_client/opentelemetry-instrumentation-http_client.gemspec b/instrumentation/http_client/opentelemetry-instrumentation-http_client.gemspec
index 0d74f5030..4db1c0e74 100644
--- a/instrumentation/http_client/opentelemetry-instrumentation-http_client.gemspec
+++ b/instrumentation/http_client/opentelemetry-instrumentation-http_client.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/httpx/opentelemetry-instrumentation-httpx.gemspec b/instrumentation/httpx/opentelemetry-instrumentation-httpx.gemspec
index 5d90b6980..21e32269c 100644
--- a/instrumentation/httpx/opentelemetry-instrumentation-httpx.gemspec
+++ b/instrumentation/httpx/opentelemetry-instrumentation-httpx.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/koala/opentelemetry-instrumentation-koala.gemspec b/instrumentation/koala/opentelemetry-instrumentation-koala.gemspec
index 1589f417b..5baaaa202 100644
--- a/instrumentation/koala/opentelemetry-instrumentation-koala.gemspec
+++ b/instrumentation/koala/opentelemetry-instrumentation-koala.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/lmdb/opentelemetry-instrumentation-lmdb.gemspec b/instrumentation/lmdb/opentelemetry-instrumentation-lmdb.gemspec
index ccd5c190d..5eed8a275 100644
--- a/instrumentation/lmdb/opentelemetry-instrumentation-lmdb.gemspec
+++ b/instrumentation/lmdb/opentelemetry-instrumentation-lmdb.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/mongo/opentelemetry-instrumentation-mongo.gemspec b/instrumentation/mongo/opentelemetry-instrumentation-mongo.gemspec
index 5b321cd40..61460cf21 100644
--- a/instrumentation/mongo/opentelemetry-instrumentation-mongo.gemspec
+++ b/instrumentation/mongo/opentelemetry-instrumentation-mongo.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/mysql2/opentelemetry-instrumentation-mysql2.gemspec b/instrumentation/mysql2/opentelemetry-instrumentation-mysql2.gemspec
index 4068f17e3..d217b42f9 100644
--- a/instrumentation/mysql2/opentelemetry-instrumentation-mysql2.gemspec
+++ b/instrumentation/mysql2/opentelemetry-instrumentation-mysql2.gemspec
@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/net_http/opentelemetry-instrumentation-net_http.gemspec b/instrumentation/net_http/opentelemetry-instrumentation-net_http.gemspec
index 8062a99ae..19265107a 100644
--- a/instrumentation/net_http/opentelemetry-instrumentation-net_http.gemspec
+++ b/instrumentation/net_http/opentelemetry-instrumentation-net_http.gemspec
@@ -28,6 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-api', '~> 1.0'
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/pg/opentelemetry-instrumentation-pg.gemspec b/instrumentation/pg/opentelemetry-instrumentation-pg.gemspec
index e242bbeca..70e2b17f6 100644
--- a/instrumentation/pg/opentelemetry-instrumentation-pg.gemspec
+++ b/instrumentation/pg/opentelemetry-instrumentation-pg.gemspec
@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/que/opentelemetry-instrumentation-que.gemspec b/instrumentation/que/opentelemetry-instrumentation-que.gemspec
index bf1044be5..f8b2a4f4b 100644
--- a/instrumentation/que/opentelemetry-instrumentation-que.gemspec
+++ b/instrumentation/que/opentelemetry-instrumentation-que.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/racecar/opentelemetry-instrumentation-racecar.gemspec b/instrumentation/racecar/opentelemetry-instrumentation-racecar.gemspec
index de1db3bec..4e2671bca 100644
--- a/instrumentation/racecar/opentelemetry-instrumentation-racecar.gemspec
+++ b/instrumentation/racecar/opentelemetry-instrumentation-racecar.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.0'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/rack/opentelemetry-instrumentation-rack.gemspec b/instrumentation/rack/opentelemetry-instrumentation-rack.gemspec
index f084e305b..1188a146a 100644
--- a/instrumentation/rack/opentelemetry-instrumentation-rack.gemspec
+++ b/instrumentation/rack/opentelemetry-instrumentation-rack.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-sdk-experimental', '~> 0.1'
diff --git a/instrumentation/rails/opentelemetry-instrumentation-rails.gemspec b/instrumentation/rails/opentelemetry-instrumentation-rails.gemspec
index 1b897b4f2..6f6bd5a4f 100644
--- a/instrumentation/rails/opentelemetry-instrumentation-rails.gemspec
+++ b/instrumentation/rails/opentelemetry-instrumentation-rails.gemspec
@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-concurrent_ruby', '~> 0.22.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/rake/opentelemetry-instrumentation-rake.gemspec b/instrumentation/rake/opentelemetry-instrumentation-rake.gemspec
index e2b434965..47d420722 100644
--- a/instrumentation/rake/opentelemetry-instrumentation-rake.gemspec
+++ b/instrumentation/rake/opentelemetry-instrumentation-rake.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.0'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/rdkafka/opentelemetry-instrumentation-rdkafka.gemspec b/instrumentation/rdkafka/opentelemetry-instrumentation-rdkafka.gemspec
index 820e7f31f..f1f8c2817 100644
--- a/instrumentation/rdkafka/opentelemetry-instrumentation-rdkafka.gemspec
+++ b/instrumentation/rdkafka/opentelemetry-instrumentation-rdkafka.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/redis/opentelemetry-instrumentation-redis.gemspec b/instrumentation/redis/opentelemetry-instrumentation-redis.gemspec
index bff0b93d7..892e75aaa 100644
--- a/instrumentation/redis/opentelemetry-instrumentation-redis.gemspec
+++ b/instrumentation/redis/opentelemetry-instrumentation-redis.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/resque/opentelemetry-instrumentation-resque.gemspec b/instrumentation/resque/opentelemetry-instrumentation-resque.gemspec
index 809eff3dd..b0b8cd737 100644
--- a/instrumentation/resque/opentelemetry-instrumentation-resque.gemspec
+++ b/instrumentation/resque/opentelemetry-instrumentation-resque.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/restclient/opentelemetry-instrumentation-restclient.gemspec b/instrumentation/restclient/opentelemetry-instrumentation-restclient.gemspec
index ab758e3bf..0420dff30 100644
--- a/instrumentation/restclient/opentelemetry-instrumentation-restclient.gemspec
+++ b/instrumentation/restclient/opentelemetry-instrumentation-restclient.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/rspec/opentelemetry-instrumentation-rspec.gemspec b/instrumentation/rspec/opentelemetry-instrumentation-rspec.gemspec
index 39f348949..933ce4d59 100644
--- a/instrumentation/rspec/opentelemetry-instrumentation-rspec.gemspec
+++ b/instrumentation/rspec/opentelemetry-instrumentation-rspec.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/ruby_kafka/opentelemetry-instrumentation-ruby_kafka.gemspec b/instrumentation/ruby_kafka/opentelemetry-instrumentation-ruby_kafka.gemspec
index b4a6eb22e..ec5e43d0d 100644
--- a/instrumentation/ruby_kafka/opentelemetry-instrumentation-ruby_kafka.gemspec
+++ b/instrumentation/ruby_kafka/opentelemetry-instrumentation-ruby_kafka.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/sidekiq/opentelemetry-instrumentation-sidekiq.gemspec b/instrumentation/sidekiq/opentelemetry-instrumentation-sidekiq.gemspec
index 1a9ffec15..1b45f0f24 100644
--- a/instrumentation/sidekiq/opentelemetry-instrumentation-sidekiq.gemspec
+++ b/instrumentation/sidekiq/opentelemetry-instrumentation-sidekiq.gemspec
@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'activejob', '>= 6.0'
   spec.add_development_dependency 'appraisal', '~> 2.5'
-
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/sinatra/opentelemetry-instrumentation-sinatra.gemspec b/instrumentation/sinatra/opentelemetry-instrumentation-sinatra.gemspec
index 40049b9ab..4c4bf7ed4 100644
--- a/instrumentation/sinatra/opentelemetry-instrumentation-sinatra.gemspec
+++ b/instrumentation/sinatra/opentelemetry-instrumentation-sinatra.gemspec
@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-rack', '~> 0.21'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/instrumentation/trilogy/opentelemetry-instrumentation-trilogy.gemspec b/instrumentation/trilogy/opentelemetry-instrumentation-trilogy.gemspec
index d7d83f695..a5296365d 100644
--- a/instrumentation/trilogy/opentelemetry-instrumentation-trilogy.gemspec
+++ b/instrumentation/trilogy/opentelemetry-instrumentation-trilogy.gemspec
@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-semantic_conventions', '>= 1.8.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
diff --git a/processor/baggage/opentelemetry-processor-baggage.gemspec b/processor/baggage/opentelemetry-processor-baggage.gemspec
index 875f5229c..7c2337be3 100644
--- a/processor/baggage/opentelemetry-processor-baggage.gemspec
+++ b/processor/baggage/opentelemetry-processor-baggage.gemspec
@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-api', '~> 1.0'
   spec.add_dependency 'opentelemetry-sdk', '~> 1.0'
 
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'rake', '~> 13.0'
diff --git a/propagator/ottrace/opentelemetry-propagator-ottrace.gemspec b/propagator/ottrace/opentelemetry-propagator-ottrace.gemspec
index 515dfa7f7..44b27b6ce 100644
--- a/propagator/ottrace/opentelemetry-propagator-ottrace.gemspec
+++ b/propagator/ottrace/opentelemetry-propagator-ottrace.gemspec
@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'opentelemetry-api', '~> 1.0'
 
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rubocop', '~> 1.71.0'
diff --git a/propagator/vitess/opentelemetry-propagator-vitess.gemspec b/propagator/vitess/opentelemetry-propagator-vitess.gemspec
index 18a2c6df4..9b7018ce7 100644
--- a/propagator/vitess/opentelemetry-propagator-vitess.gemspec
+++ b/propagator/vitess/opentelemetry-propagator-vitess.gemspec
@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-api', '~> 1.0'
   spec.add_dependency 'opentelemetry-propagator-jaeger', '~> 0.21'
 
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rubocop', '~> 1.71.0'
diff --git a/propagator/xray/opentelemetry-propagator-xray.gemspec b/propagator/xray/opentelemetry-propagator-xray.gemspec
index 14c1cd1fa..b9f0d3c40 100644
--- a/propagator/xray/opentelemetry-propagator-xray.gemspec
+++ b/propagator/xray/opentelemetry-propagator-xray.gemspec
@@ -28,6 +28,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'opentelemetry-api', '~> 1.0'
 
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rubocop', '~> 1.71.0'
diff --git a/resources/azure/opentelemetry-resource-detector-azure.gemspec b/resources/azure/opentelemetry-resource-detector-azure.gemspec
index 367392b6d..3c555d598 100644
--- a/resources/azure/opentelemetry-resource-detector-azure.gemspec
+++ b/resources/azure/opentelemetry-resource-detector-azure.gemspec
@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'opentelemetry-sdk', '~> 1.0'
 
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rubocop', '~> 1.71.0'
diff --git a/resources/container/opentelemetry-resource-detector-container.gemspec b/resources/container/opentelemetry-resource-detector-container.gemspec
index d3ac82a39..5a5263071 100644
--- a/resources/container/opentelemetry-resource-detector-container.gemspec
+++ b/resources/container/opentelemetry-resource-detector-container.gemspec
@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'opentelemetry-sdk', '~> 1.0'
 
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rubocop', '~> 1.71.0'
diff --git a/resources/google_cloud_platform/opentelemetry-resource-detector-google_cloud_platform.gemspec b/resources/google_cloud_platform/opentelemetry-resource-detector-google_cloud_platform.gemspec
index 7332cf412..e61687539 100644
--- a/resources/google_cloud_platform/opentelemetry-resource-detector-google_cloud_platform.gemspec
+++ b/resources/google_cloud_platform/opentelemetry-resource-detector-google_cloud_platform.gemspec
@@ -28,6 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'google-cloud-env'
   spec.add_dependency 'opentelemetry-sdk', '~> 1.0'
 
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rubocop', '~> 1.71.0'

From bfc55bdd84c0d29dad10fc1a977bf984832bd5b0 Mon Sep 17 00:00:00 2001
From: Ariel Valentin <arielvalentin@github.com>
Date: Wed, 29 Jan 2025 22:23:37 -0600
Subject: [PATCH 04/14] squash: copy paste error

---
 .github/workflows/ci-contrib.yml                     |  6 +++---
 .../workflows/ci-instrumentation-with-services.yml   | 12 ++++++------
 .github/workflows/ci-instrumentation.yml             |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci-contrib.yml b/.github/workflows/ci-contrib.yml
index ede73353a..59b88e9dd 100644
--- a/.github/workflows/ci-contrib.yml
+++ b/.github/workflows/ci-contrib.yml
@@ -78,7 +78,7 @@ jobs:
       - name: "Test Ruby 3.4"
         uses: ./.github/actions/test_gem
         with:
-          gem: "opentelemetry-helpers-${{ matrix.gem }}"
+          gem: "opentelemetry-propagator-${{ matrix.gem }}"
           ruby: "3.4"
       - name: "Test Ruby 3.3"
         uses: ./.github/actions/test_gem
@@ -122,7 +122,7 @@ jobs:
       - name: "Test Ruby 3.4"
         uses: ./.github/actions/test_gem
         with:
-          gem: "opentelemetry-helpers-${{ matrix.gem }}"
+          gem: "opentelemetry-${{ matrix.gem }}"
           ruby: "3.4"
       - name: "Test Ruby 3.3"
         uses: ./.github/actions/test_gem
@@ -165,7 +165,7 @@ jobs:
       - name: "Test Ruby 3.4"
         uses: ./.github/actions/test_gem
         with:
-          gem: "opentelemetry-helpers-${{ matrix.gem }}"
+          gem: "opentelemetry-processor-${{ matrix.gem }}"
           ruby: "3.4"
       - name: "Test Ruby 3.3"
         uses: ./.github/actions/test_gem
diff --git a/.github/workflows/ci-instrumentation-with-services.yml b/.github/workflows/ci-instrumentation-with-services.yml
index 334200306..15e3d974f 100644
--- a/.github/workflows/ci-instrumentation-with-services.yml
+++ b/.github/workflows/ci-instrumentation-with-services.yml
@@ -32,7 +32,7 @@ jobs:
       - name: "Test Ruby 3.4"
         uses: ./.github/actions/test_gem
         with:
-          gem: "opentelemetry-helpers-${{ matrix.gem }}"
+          gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
           ruby: "3.4"
       - name: "Test Ruby 3.3"
         uses: ./.github/actions/test_gem
@@ -84,7 +84,7 @@ jobs:
       - name: "Test Ruby 3.4"
         uses: ./.github/actions/test_gem
         with:
-          gem: "opentelemetry-helpers-${{ matrix.gem }}"
+          gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
           ruby: "3.4"
       - name: "Test Ruby 3.3"
         uses: ./.github/actions/test_gem
@@ -127,7 +127,7 @@ jobs:
       - name: "Test Ruby 3.4"
         uses: ./.github/actions/test_gem
         with:
-          gem: "opentelemetry-helpers-${{ matrix.gem }}"
+          gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
           ruby: "3.4"
       - name: "Test Ruby 3.3"
         uses: ./.github/actions/test_gem
@@ -186,7 +186,7 @@ jobs:
       - name: "Test Ruby 3.4"
         uses: ./.github/actions/test_gem
         with:
-          gem: "opentelemetry-helpers-${{ matrix.gem }}"
+          gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
           ruby: "3.4"
       - name: "Test Ruby 3.3"
         uses: ./.github/actions/test_gem
@@ -236,7 +236,7 @@ jobs:
       - name: "Test Ruby 3.4"
         uses: ./.github/actions/test_gem
         with:
-          gem: "opentelemetry-helpers-${{ matrix.gem }}"
+          gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
           ruby: "3.4"
       - name: "Test Ruby 3.3"
         uses: ./.github/actions/test_gem
@@ -283,7 +283,7 @@ jobs:
       - name: "Test Ruby 3.4"
         uses: ./.github/actions/test_gem
         with:
-          gem: "opentelemetry-helpers-${{ matrix.gem }}"
+          gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
           ruby: "3.4"
       - name: "Test Ruby 3.3"
         uses: ./.github/actions/test_gem
diff --git a/.github/workflows/ci-instrumentation.yml b/.github/workflows/ci-instrumentation.yml
index 8fdfbb764..841e14115 100644
--- a/.github/workflows/ci-instrumentation.yml
+++ b/.github/workflows/ci-instrumentation.yml
@@ -63,7 +63,7 @@ jobs:
       - name: "Test Ruby 3.4"
         uses: ./.github/actions/test_gem
         with:
-          gem: "opentelemetry-helpers-${{ matrix.gem }}"
+          gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
           ruby: "3.4"
       - name: "Test Ruby 3.3"
         uses: ./.github/actions/test_gem

From 736fd8aafa4f6a6e0daac06159eda1ea8537ae23 Mon Sep 17 00:00:00 2001
From: Ariel Valentin <arielvalentin@github.com>
Date: Wed, 29 Jan 2025 22:51:35 -0600
Subject: [PATCH 05/14] squash: 3.4 workaround

---
 helpers/mysql/Gemfile                            | 4 ++++
 helpers/sql-obfuscation/Gemfile                  | 4 ++++
 helpers/sql/Gemfile                              | 4 ++++
 instrumentation/action_mailer/Gemfile            | 1 +
 instrumentation/action_pack/Gemfile              | 1 +
 instrumentation/action_view/Gemfile              | 1 +
 instrumentation/active_job/Gemfile               | 1 +
 instrumentation/active_model_serializers/Gemfile | 1 +
 instrumentation/active_record/Gemfile            | 1 +
 instrumentation/active_storage/Gemfile           | 1 +
 instrumentation/active_support/Gemfile           | 1 +
 instrumentation/all/Gemfile                      | 2 ++
 instrumentation/aws_lambda/Gemfile               | 1 +
 instrumentation/aws_sdk/Gemfile                  | 1 +
 instrumentation/base/Gemfile                     | 4 ++++
 instrumentation/bunny/Gemfile                    | 1 +
 instrumentation/concurrent_ruby/Gemfile          | 1 +
 instrumentation/dalli/Gemfile                    | 1 +
 instrumentation/delayed_job/Gemfile              | 1 +
 instrumentation/ethon/Gemfile                    | 1 +
 instrumentation/excon/Gemfile                    | 1 +
 instrumentation/faraday/Gemfile                  | 1 +
 instrumentation/grape/Gemfile                    | 1 +
 instrumentation/graphql/Gemfile                  | 1 +
 instrumentation/grpc/Gemfile                     | 1 +
 instrumentation/gruf/Gemfile                     | 1 +
 instrumentation/http/Gemfile                     | 1 +
 instrumentation/http_client/Gemfile              | 1 +
 instrumentation/httpx/Gemfile                    | 1 +
 instrumentation/koala/Gemfile                    | 1 +
 instrumentation/lmdb/Gemfile                     | 1 +
 instrumentation/mongo/Gemfile                    | 5 ++++-
 instrumentation/mysql2/Gemfile                   | 1 +
 instrumentation/net_http/Gemfile                 | 1 +
 instrumentation/pg/Gemfile                       | 1 +
 instrumentation/que/Gemfile                      | 1 +
 instrumentation/racecar/Gemfile                  | 2 +-
 instrumentation/rack/Gemfile                     | 1 +
 instrumentation/rails/Gemfile                    | 1 +
 instrumentation/rake/Gemfile                     | 1 +
 instrumentation/rdkafka/Gemfile                  | 1 +
 instrumentation/redis/Gemfile                    | 1 +
 instrumentation/resque/Gemfile                   | 1 +
 instrumentation/restclient/Gemfile               | 1 +
 instrumentation/rspec/Gemfile                    | 1 +
 instrumentation/ruby_kafka/Gemfile               | 1 +
 instrumentation/sidekiq/Gemfile                  | 1 +
 instrumentation/sinatra/Gemfile                  | 1 +
 instrumentation/trilogy/Gemfile                  | 1 +
 processor/baggage/Gemfile                        | 4 ++++
 propagator/ottrace/Gemfile                       | 4 ++++
 propagator/vitess/Gemfile                        | 4 ++++
 propagator/xray/Gemfile                          | 4 ++++
 resources/azure/Gemfile                          | 1 +
 resources/container/Gemfile                      | 1 +
 resources/google_cloud_platform/Gemfile          | 1 +
 56 files changed, 84 insertions(+), 2 deletions(-)

diff --git a/helpers/mysql/Gemfile b/helpers/mysql/Gemfile
index f649e2f64..293f70a5e 100644
--- a/helpers/mysql/Gemfile
+++ b/helpers/mysql/Gemfile
@@ -7,3 +7,7 @@
 source 'https://rubygems.org'
 
 gemspec
+
+group :test do
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+end
diff --git a/helpers/sql-obfuscation/Gemfile b/helpers/sql-obfuscation/Gemfile
index f649e2f64..293f70a5e 100644
--- a/helpers/sql-obfuscation/Gemfile
+++ b/helpers/sql-obfuscation/Gemfile
@@ -7,3 +7,7 @@
 source 'https://rubygems.org'
 
 gemspec
+
+group :test do
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+end
diff --git a/helpers/sql/Gemfile b/helpers/sql/Gemfile
index 5f1d771fa..0e2fc4516 100644
--- a/helpers/sql/Gemfile
+++ b/helpers/sql/Gemfile
@@ -11,3 +11,7 @@ source 'https://rubygems.org'
 # then target specific versions in the Appraisals file.
 
 gemspec
+
+group :test do
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+end
diff --git a/instrumentation/action_mailer/Gemfile b/instrumentation/action_mailer/Gemfile
index c0f09e6f4..cf0f8ae24 100644
--- a/instrumentation/action_mailer/Gemfile
+++ b/instrumentation/action_mailer/Gemfile
@@ -14,4 +14,5 @@ group :test do
   # Add jar-dependencies gem only if the Ruby runtime is JRuby
   # https://github.com/jruby/jruby/issues/7262
   gem 'jar-dependencies', '0.4.1', platforms: :jruby
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/action_pack/Gemfile b/instrumentation/action_pack/Gemfile
index 1ff5cee48..f3b577a1d 100644
--- a/instrumentation/action_pack/Gemfile
+++ b/instrumentation/action_pack/Gemfile
@@ -12,4 +12,5 @@ group :test do
   gem 'opentelemetry-instrumentation-base', path: '../../instrumentation/base'
   gem 'opentelemetry-instrumentation-rack', path: '../../instrumentation/rack'
   gem 'pry-byebug'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/action_view/Gemfile b/instrumentation/action_view/Gemfile
index 54506a58d..bc7e055f0 100644
--- a/instrumentation/action_view/Gemfile
+++ b/instrumentation/action_view/Gemfile
@@ -12,4 +12,5 @@ group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'opentelemetry-instrumentation-active_support', path: '../active_support'
   gem 'pry-byebug'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/active_job/Gemfile b/instrumentation/active_job/Gemfile
index 2baf57ac4..d4c603924 100644
--- a/instrumentation/active_job/Gemfile
+++ b/instrumentation/active_job/Gemfile
@@ -10,4 +10,5 @@ gemspec
 
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/active_model_serializers/Gemfile b/instrumentation/active_model_serializers/Gemfile
index 2ededff74..abd1ea9e9 100644
--- a/instrumentation/active_model_serializers/Gemfile
+++ b/instrumentation/active_model_serializers/Gemfile
@@ -11,4 +11,5 @@ gemspec
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'opentelemetry-instrumentation-active_support', path: '../active_support'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/active_record/Gemfile b/instrumentation/active_record/Gemfile
index 02f64ca9a..ff288dc76 100644
--- a/instrumentation/active_record/Gemfile
+++ b/instrumentation/active_record/Gemfile
@@ -12,4 +12,5 @@ group :test do
   gem 'byebug'
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'pry-byebug'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/active_storage/Gemfile b/instrumentation/active_storage/Gemfile
index 2ededff74..abd1ea9e9 100644
--- a/instrumentation/active_storage/Gemfile
+++ b/instrumentation/active_storage/Gemfile
@@ -11,4 +11,5 @@ gemspec
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'opentelemetry-instrumentation-active_support', path: '../active_support'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/active_support/Gemfile b/instrumentation/active_support/Gemfile
index 2baf57ac4..d4c603924 100644
--- a/instrumentation/active_support/Gemfile
+++ b/instrumentation/active_support/Gemfile
@@ -10,4 +10,5 @@ gemspec
 
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/all/Gemfile b/instrumentation/all/Gemfile
index 30808d503..4eecd3edd 100644
--- a/instrumentation/all/Gemfile
+++ b/instrumentation/all/Gemfile
@@ -9,6 +9,8 @@ source 'https://rubygems.org'
 gemspec
 
 group :test do
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+
   Dir.entries('../../helpers')
      .select { |entry| File.directory?(File.join('../../helpers', entry)) }
      .reject { |entry| %w[. ..].include?(entry) } # rubocop:disable Performance/CollectionLiteralInLoop
diff --git a/instrumentation/aws_lambda/Gemfile b/instrumentation/aws_lambda/Gemfile
index a03fdb17e..f29cfe9b9 100644
--- a/instrumentation/aws_lambda/Gemfile
+++ b/instrumentation/aws_lambda/Gemfile
@@ -11,4 +11,5 @@ gemspec
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'webrick', '~> 1.7'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/aws_sdk/Gemfile b/instrumentation/aws_sdk/Gemfile
index a03fdb17e..f29cfe9b9 100644
--- a/instrumentation/aws_sdk/Gemfile
+++ b/instrumentation/aws_sdk/Gemfile
@@ -11,4 +11,5 @@ gemspec
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'webrick', '~> 1.7'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/base/Gemfile b/instrumentation/base/Gemfile
index f649e2f64..293f70a5e 100644
--- a/instrumentation/base/Gemfile
+++ b/instrumentation/base/Gemfile
@@ -7,3 +7,7 @@
 source 'https://rubygems.org'
 
 gemspec
+
+group :test do
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+end
diff --git a/instrumentation/bunny/Gemfile b/instrumentation/bunny/Gemfile
index 5b7d54b64..e46552806 100644
--- a/instrumentation/bunny/Gemfile
+++ b/instrumentation/bunny/Gemfile
@@ -11,4 +11,5 @@ gemspec
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'pry-byebug'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/concurrent_ruby/Gemfile b/instrumentation/concurrent_ruby/Gemfile
index 2baf57ac4..d4c603924 100644
--- a/instrumentation/concurrent_ruby/Gemfile
+++ b/instrumentation/concurrent_ruby/Gemfile
@@ -10,4 +10,5 @@ gemspec
 
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/dalli/Gemfile b/instrumentation/dalli/Gemfile
index 036a87b29..db9df6ab1 100644
--- a/instrumentation/dalli/Gemfile
+++ b/instrumentation/dalli/Gemfile
@@ -11,4 +11,5 @@ gemspec
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'pry'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/delayed_job/Gemfile b/instrumentation/delayed_job/Gemfile
index 2baf57ac4..d4c603924 100644
--- a/instrumentation/delayed_job/Gemfile
+++ b/instrumentation/delayed_job/Gemfile
@@ -10,4 +10,5 @@ gemspec
 
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/ethon/Gemfile b/instrumentation/ethon/Gemfile
index 2baf57ac4..d4c603924 100644
--- a/instrumentation/ethon/Gemfile
+++ b/instrumentation/ethon/Gemfile
@@ -10,4 +10,5 @@ gemspec
 
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/excon/Gemfile b/instrumentation/excon/Gemfile
index 2baf57ac4..d4c603924 100644
--- a/instrumentation/excon/Gemfile
+++ b/instrumentation/excon/Gemfile
@@ -10,4 +10,5 @@ gemspec
 
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/faraday/Gemfile b/instrumentation/faraday/Gemfile
index 2baf57ac4..d4c603924 100644
--- a/instrumentation/faraday/Gemfile
+++ b/instrumentation/faraday/Gemfile
@@ -10,4 +10,5 @@ gemspec
 
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/grape/Gemfile b/instrumentation/grape/Gemfile
index a97f3cccf..9ff51bcb1 100644
--- a/instrumentation/grape/Gemfile
+++ b/instrumentation/grape/Gemfile
@@ -16,4 +16,5 @@ group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'opentelemetry-instrumentation-rack', path: '../rack'
   gem 'builder'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/graphql/Gemfile b/instrumentation/graphql/Gemfile
index 5b7d54b64..e46552806 100644
--- a/instrumentation/graphql/Gemfile
+++ b/instrumentation/graphql/Gemfile
@@ -11,4 +11,5 @@ gemspec
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'pry-byebug'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/grpc/Gemfile b/instrumentation/grpc/Gemfile
index 68f476d47..b7fe8f8a5 100644
--- a/instrumentation/grpc/Gemfile
+++ b/instrumentation/grpc/Gemfile
@@ -12,4 +12,5 @@ gemspec
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'pry'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/gruf/Gemfile b/instrumentation/gruf/Gemfile
index a952c5002..b4e1df3cd 100644
--- a/instrumentation/gruf/Gemfile
+++ b/instrumentation/gruf/Gemfile
@@ -14,4 +14,5 @@ gemspec
 
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/http/Gemfile b/instrumentation/http/Gemfile
index 5b7d54b64..e46552806 100644
--- a/instrumentation/http/Gemfile
+++ b/instrumentation/http/Gemfile
@@ -11,4 +11,5 @@ gemspec
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'pry-byebug'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/http_client/Gemfile b/instrumentation/http_client/Gemfile
index 5b7d54b64..e46552806 100644
--- a/instrumentation/http_client/Gemfile
+++ b/instrumentation/http_client/Gemfile
@@ -11,4 +11,5 @@ gemspec
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'pry-byebug'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/httpx/Gemfile b/instrumentation/httpx/Gemfile
index 8b038cdcb..253e97984 100644
--- a/instrumentation/httpx/Gemfile
+++ b/instrumentation/httpx/Gemfile
@@ -11,4 +11,5 @@ gemspec
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'pry-byebug', platform: 'ruby'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/koala/Gemfile b/instrumentation/koala/Gemfile
index 5b7d54b64..e46552806 100644
--- a/instrumentation/koala/Gemfile
+++ b/instrumentation/koala/Gemfile
@@ -11,4 +11,5 @@ gemspec
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'pry-byebug'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/lmdb/Gemfile b/instrumentation/lmdb/Gemfile
index 5b7d54b64..e46552806 100644
--- a/instrumentation/lmdb/Gemfile
+++ b/instrumentation/lmdb/Gemfile
@@ -11,4 +11,5 @@ gemspec
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'pry-byebug'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/mongo/Gemfile b/instrumentation/mongo/Gemfile
index 4c6082de3..d4c603924 100644
--- a/instrumentation/mongo/Gemfile
+++ b/instrumentation/mongo/Gemfile
@@ -8,4 +8,7 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'opentelemetry-instrumentation-base', path: '../base'
+group :test do
+  gem 'opentelemetry-instrumentation-base', path: '../base'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+end
diff --git a/instrumentation/mysql2/Gemfile b/instrumentation/mysql2/Gemfile
index fc50ea311..4ef86e850 100644
--- a/instrumentation/mysql2/Gemfile
+++ b/instrumentation/mysql2/Gemfile
@@ -13,4 +13,5 @@ group :test, :development do
   gem 'opentelemetry-helpers-sql', path: '../../helpers/sql'
   gem 'opentelemetry-helpers-mysql', path: '../../helpers/mysql'
   gem 'opentelemetry-helpers-sql-obfuscation', path: '../../helpers/sql-obfuscation'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/net_http/Gemfile b/instrumentation/net_http/Gemfile
index 2baf57ac4..d4c603924 100644
--- a/instrumentation/net_http/Gemfile
+++ b/instrumentation/net_http/Gemfile
@@ -10,4 +10,5 @@ gemspec
 
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/pg/Gemfile b/instrumentation/pg/Gemfile
index a298585bb..904b07e19 100644
--- a/instrumentation/pg/Gemfile
+++ b/instrumentation/pg/Gemfile
@@ -13,4 +13,5 @@ group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'opentelemetry-helpers-sql', path: '../../helpers/sql'
   gem 'opentelemetry-helpers-sql-obfuscation', path: '../../helpers/sql-obfuscation'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/que/Gemfile b/instrumentation/que/Gemfile
index 9a673d3a2..fa9661fd8 100644
--- a/instrumentation/que/Gemfile
+++ b/instrumentation/que/Gemfile
@@ -15,4 +15,5 @@ group :test do
   gem 'opentelemetry-helpers-sql-obfuscation', path: '../../helpers/sql-obfuscation'
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'opentelemetry-instrumentation-pg', path: '../pg'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/racecar/Gemfile b/instrumentation/racecar/Gemfile
index b4aa971cf..f441ca843 100644
--- a/instrumentation/racecar/Gemfile
+++ b/instrumentation/racecar/Gemfile
@@ -13,6 +13,6 @@ source 'https://rubygems.org'
 gemspec
 
 group :development, :test do
-  gem 'activesupport', '~> 6' # used to test against JRuby which is only MRI 2.6 compatibile
   gem 'opentelemetry-instrumentation-base', path: '../base'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/rack/Gemfile b/instrumentation/rack/Gemfile
index c8b2ad72f..fc98f7c79 100644
--- a/instrumentation/rack/Gemfile
+++ b/instrumentation/rack/Gemfile
@@ -12,4 +12,5 @@ group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'rack-test', '~> 2.1.0'
   gem 'pry-byebug'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/rails/Gemfile b/instrumentation/rails/Gemfile
index 117177e6e..7d6bcf048 100644
--- a/instrumentation/rails/Gemfile
+++ b/instrumentation/rails/Gemfile
@@ -19,4 +19,5 @@ group :test, :development do
   gem 'opentelemetry-instrumentation-active_support', path: '../active_support'
   gem 'opentelemetry-instrumentation-action_view', path: '../action_view'
   gem 'opentelemetry-instrumentation-rack', path: '../rack'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/rake/Gemfile b/instrumentation/rake/Gemfile
index a952c5002..b4e1df3cd 100644
--- a/instrumentation/rake/Gemfile
+++ b/instrumentation/rake/Gemfile
@@ -14,4 +14,5 @@ gemspec
 
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/rdkafka/Gemfile b/instrumentation/rdkafka/Gemfile
index 2baf57ac4..d4c603924 100644
--- a/instrumentation/rdkafka/Gemfile
+++ b/instrumentation/rdkafka/Gemfile
@@ -10,4 +10,5 @@ gemspec
 
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/redis/Gemfile b/instrumentation/redis/Gemfile
index 2baf57ac4..d4c603924 100644
--- a/instrumentation/redis/Gemfile
+++ b/instrumentation/redis/Gemfile
@@ -10,4 +10,5 @@ gemspec
 
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/resque/Gemfile b/instrumentation/resque/Gemfile
index a340f69a9..297f29154 100644
--- a/instrumentation/resque/Gemfile
+++ b/instrumentation/resque/Gemfile
@@ -12,4 +12,5 @@ group :test do
   gem 'activejob'
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'pry-byebug'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/restclient/Gemfile b/instrumentation/restclient/Gemfile
index 2baf57ac4..d4c603924 100644
--- a/instrumentation/restclient/Gemfile
+++ b/instrumentation/restclient/Gemfile
@@ -10,4 +10,5 @@ gemspec
 
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/rspec/Gemfile b/instrumentation/rspec/Gemfile
index 74a39f083..217c8d4bb 100644
--- a/instrumentation/rspec/Gemfile
+++ b/instrumentation/rspec/Gemfile
@@ -11,4 +11,5 @@ gemspec
 group :test do
   gem 'rspec', '~> 3.0'
   gem 'opentelemetry-instrumentation-base', path: '../base'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/ruby_kafka/Gemfile b/instrumentation/ruby_kafka/Gemfile
index 5b7d54b64..e46552806 100644
--- a/instrumentation/ruby_kafka/Gemfile
+++ b/instrumentation/ruby_kafka/Gemfile
@@ -11,4 +11,5 @@ gemspec
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'pry-byebug'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/sidekiq/Gemfile b/instrumentation/sidekiq/Gemfile
index 84efc8a18..a07c5c6a2 100644
--- a/instrumentation/sidekiq/Gemfile
+++ b/instrumentation/sidekiq/Gemfile
@@ -12,4 +12,5 @@ group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'opentelemetry-instrumentation-redis', path: '../redis'
   gem 'pry-byebug'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/sinatra/Gemfile b/instrumentation/sinatra/Gemfile
index a8bfa13a1..66a662371 100644
--- a/instrumentation/sinatra/Gemfile
+++ b/instrumentation/sinatra/Gemfile
@@ -11,4 +11,5 @@ gemspec
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'opentelemetry-instrumentation-rack', path: '../rack'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/trilogy/Gemfile b/instrumentation/trilogy/Gemfile
index 2484ca993..6e850813b 100644
--- a/instrumentation/trilogy/Gemfile
+++ b/instrumentation/trilogy/Gemfile
@@ -14,4 +14,5 @@ group :test do
   gem 'opentelemetry-helpers-sql', path: '../../helpers/sql'
   gem 'opentelemetry-helpers-sql-obfuscation', path: '../../helpers/sql-obfuscation'
   gem 'opentelemetry-propagator-vitess', path: '../../propagator/vitess'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/processor/baggage/Gemfile b/processor/baggage/Gemfile
index 52eb0ed2e..24ff11b6e 100644
--- a/processor/baggage/Gemfile
+++ b/processor/baggage/Gemfile
@@ -4,3 +4,7 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in opentelemetry-processor-baggage.gemspec
 gemspec
+
+group :test do
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+end
diff --git a/propagator/ottrace/Gemfile b/propagator/ottrace/Gemfile
index 12150b151..b5c8d739f 100644
--- a/propagator/ottrace/Gemfile
+++ b/propagator/ottrace/Gemfile
@@ -4,3 +4,7 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in opentelemetry-propragator-ottrace.gemspec
 gemspec
+
+group :test do
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+end
diff --git a/propagator/vitess/Gemfile b/propagator/vitess/Gemfile
index b79007ade..4f53697a0 100644
--- a/propagator/vitess/Gemfile
+++ b/propagator/vitess/Gemfile
@@ -4,3 +4,7 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in opentelemetry-propragator-vitess.gemspec
 gemspec
+
+group :test do
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+end
diff --git a/propagator/xray/Gemfile b/propagator/xray/Gemfile
index b32179c8b..495fad952 100644
--- a/propagator/xray/Gemfile
+++ b/propagator/xray/Gemfile
@@ -7,3 +7,7 @@
 source 'https://rubygems.org'
 
 gemspec
+
+group :test do
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+end
diff --git a/resources/azure/Gemfile b/resources/azure/Gemfile
index 6ae9e48bc..33e51aa67 100644
--- a/resources/azure/Gemfile
+++ b/resources/azure/Gemfile
@@ -11,4 +11,5 @@ gemspec
 group :development, :test do
   gem 'byebug' unless RUBY_PLATFORM == 'java'
   gem 'pry'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/resources/container/Gemfile b/resources/container/Gemfile
index 6ae9e48bc..33e51aa67 100644
--- a/resources/container/Gemfile
+++ b/resources/container/Gemfile
@@ -11,4 +11,5 @@ gemspec
 group :development, :test do
   gem 'byebug' unless RUBY_PLATFORM == 'java'
   gem 'pry'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/resources/google_cloud_platform/Gemfile b/resources/google_cloud_platform/Gemfile
index 6ae9e48bc..33e51aa67 100644
--- a/resources/google_cloud_platform/Gemfile
+++ b/resources/google_cloud_platform/Gemfile
@@ -11,4 +11,5 @@ gemspec
 group :development, :test do
   gem 'byebug' unless RUBY_PLATFORM == 'java'
   gem 'pry'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end

From 4f2a0372dd5759e77573990f2ac1fb4f1fe161a2 Mon Sep 17 00:00:00 2001
From: Ariel Valentin <arielvalentin@github.com>
Date: Wed, 29 Jan 2025 22:56:29 -0600
Subject: [PATCH 06/14] squash: mas cosas

---
 helpers/mysql/Gemfile                            | 5 ++++-
 helpers/sql-obfuscation/Gemfile                  | 5 ++++-
 helpers/sql/Gemfile                              | 5 ++++-
 instrumentation/action_mailer/Gemfile            | 5 ++++-
 instrumentation/action_pack/Gemfile              | 5 ++++-
 instrumentation/action_view/Gemfile              | 5 ++++-
 instrumentation/active_job/Gemfile               | 5 ++++-
 instrumentation/active_model_serializers/Gemfile | 5 ++++-
 instrumentation/active_record/Gemfile            | 5 ++++-
 instrumentation/active_storage/Gemfile           | 5 ++++-
 instrumentation/active_support/Gemfile           | 5 ++++-
 instrumentation/all/Gemfile                      | 5 ++++-
 instrumentation/aws_lambda/Gemfile               | 5 ++++-
 instrumentation/aws_sdk/Gemfile                  | 5 ++++-
 instrumentation/base/Gemfile                     | 5 ++++-
 instrumentation/bunny/Gemfile                    | 5 ++++-
 instrumentation/concurrent_ruby/Gemfile          | 5 ++++-
 instrumentation/dalli/Gemfile                    | 5 ++++-
 instrumentation/delayed_job/Gemfile              | 5 ++++-
 instrumentation/ethon/Gemfile                    | 5 ++++-
 instrumentation/excon/Gemfile                    | 5 ++++-
 instrumentation/faraday/Gemfile                  | 5 ++++-
 instrumentation/grape/Gemfile                    | 5 ++++-
 instrumentation/graphql/Gemfile                  | 5 ++++-
 instrumentation/grpc/Gemfile                     | 5 ++++-
 instrumentation/gruf/Gemfile                     | 5 ++++-
 instrumentation/http/Gemfile                     | 5 ++++-
 instrumentation/http_client/Gemfile              | 5 ++++-
 instrumentation/httpx/Gemfile                    | 5 ++++-
 instrumentation/koala/Gemfile                    | 5 ++++-
 instrumentation/lmdb/Gemfile                     | 5 ++++-
 instrumentation/mongo/Gemfile                    | 5 ++++-
 instrumentation/mysql2/Gemfile                   | 5 ++++-
 instrumentation/net_http/Gemfile                 | 5 ++++-
 instrumentation/pg/Gemfile                       | 5 ++++-
 instrumentation/que/Gemfile                      | 5 ++++-
 instrumentation/racecar/Gemfile                  | 5 ++++-
 instrumentation/rack/Gemfile                     | 5 ++++-
 instrumentation/rails/Gemfile                    | 5 ++++-
 instrumentation/rake/Gemfile                     | 5 ++++-
 instrumentation/rdkafka/Gemfile                  | 5 ++++-
 instrumentation/redis/Gemfile                    | 5 ++++-
 instrumentation/resque/Gemfile                   | 5 ++++-
 instrumentation/restclient/Gemfile               | 5 ++++-
 instrumentation/rspec/Gemfile                    | 5 ++++-
 instrumentation/ruby_kafka/Gemfile               | 5 ++++-
 instrumentation/sidekiq/Gemfile                  | 5 ++++-
 instrumentation/sinatra/Gemfile                  | 5 ++++-
 instrumentation/trilogy/Gemfile                  | 5 ++++-
 processor/baggage/Gemfile                        | 5 ++++-
 propagator/ottrace/Gemfile                       | 5 ++++-
 propagator/vitess/Gemfile                        | 5 ++++-
 propagator/xray/Gemfile                          | 5 ++++-
 resources/azure/Gemfile                          | 5 ++++-
 resources/container/Gemfile                      | 5 ++++-
 resources/google_cloud_platform/Gemfile          | 5 ++++-
 56 files changed, 224 insertions(+), 56 deletions(-)

diff --git a/helpers/mysql/Gemfile b/helpers/mysql/Gemfile
index 293f70a5e..afb6912bf 100644
--- a/helpers/mysql/Gemfile
+++ b/helpers/mysql/Gemfile
@@ -9,5 +9,8 @@ source 'https://rubygems.org'
 gemspec
 
 group :test do
-  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+  if RUBY_VERSION >= '3.4'
+    gem 'base64'
+    gem 'mutex_m'
+  end
 end
diff --git a/helpers/sql-obfuscation/Gemfile b/helpers/sql-obfuscation/Gemfile
index 293f70a5e..afb6912bf 100644
--- a/helpers/sql-obfuscation/Gemfile
+++ b/helpers/sql-obfuscation/Gemfile
@@ -9,5 +9,8 @@ source 'https://rubygems.org'
 gemspec
 
 group :test do
-  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+  if RUBY_VERSION >= '3.4'
+    gem 'base64'
+    gem 'mutex_m'
+  end
 end
diff --git a/helpers/sql/Gemfile b/helpers/sql/Gemfile
index 0e2fc4516..5139c3d9a 100644
--- a/helpers/sql/Gemfile
+++ b/helpers/sql/Gemfile
@@ -13,5 +13,8 @@ source 'https://rubygems.org'
 gemspec
 
 group :test do
-  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+  if RUBY_VERSION >= '3.4'
+    gem 'base64'
+    gem 'mutex_m'
+  end
 end
diff --git a/instrumentation/action_mailer/Gemfile b/instrumentation/action_mailer/Gemfile
index cf0f8ae24..39ff49aac 100644
--- a/instrumentation/action_mailer/Gemfile
+++ b/instrumentation/action_mailer/Gemfile
@@ -14,5 +14,8 @@ group :test do
   # Add jar-dependencies gem only if the Ruby runtime is JRuby
   # https://github.com/jruby/jruby/issues/7262
   gem 'jar-dependencies', '0.4.1', platforms: :jruby
-  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+  if RUBY_VERSION >= '3.4'
+    gem 'base64'
+    gem 'mutex_m'
+  end
 end
diff --git a/instrumentation/action_pack/Gemfile b/instrumentation/action_pack/Gemfile
index f3b577a1d..167e8562f 100644
--- a/instrumentation/action_pack/Gemfile
+++ b/instrumentation/action_pack/Gemfile
@@ -12,5 +12,8 @@ group :test do
   gem 'opentelemetry-instrumentation-base', path: '../../instrumentation/base'
   gem 'opentelemetry-instrumentation-rack', path: '../../instrumentation/rack'
   gem 'pry-byebug'
-  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+  if RUBY_VERSION >= '3.4'
+    gem 'base64'
+    gem 'mutex_m'
+  end
 end
diff --git a/instrumentation/action_view/Gemfile b/instrumentation/action_view/Gemfile
index bc7e055f0..362b810fa 100644
--- a/instrumentation/action_view/Gemfile
+++ b/instrumentation/action_view/Gemfile
@@ -12,5 +12,8 @@ group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'opentelemetry-instrumentation-active_support', path: '../active_support'
   gem 'pry-byebug'
-  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+  if RUBY_VERSION >= '3.4'
+    gem 'base64'
+    gem 'mutex_m'
+  end
 end
diff --git a/instrumentation/active_job/Gemfile b/instrumentation/active_job/Gemfile
index d4c603924..cb4d0e9ba 100644
--- a/instrumentation/active_job/Gemfile
+++ b/instrumentation/active_job/Gemfile
@@ -10,5 +10,8 @@ gemspec
 
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
-  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+  if RUBY_VERSION >= '3.4'
+    gem 'base64'
+    gem 'mutex_m'
+  end
 end
diff --git a/instrumentation/active_model_serializers/Gemfile b/instrumentation/active_model_serializers/Gemfile
index abd1ea9e9..e4d2581d4 100644
--- a/instrumentation/active_model_serializers/Gemfile
+++ b/instrumentation/active_model_serializers/Gemfile
@@ -11,5 +11,8 @@ gemspec
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'opentelemetry-instrumentation-active_support', path: '../active_support'
-  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+  if RUBY_VERSION >= '3.4'
+    gem 'base64'
+    gem 'mutex_m'
+  end
 end
diff --git a/instrumentation/active_record/Gemfile b/instrumentation/active_record/Gemfile
index ff288dc76..5d3d05e15 100644
--- a/instrumentation/active_record/Gemfile
+++ b/instrumentation/active_record/Gemfile
@@ -12,5 +12,8 @@ group :test do
   gem 'byebug'
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'pry-byebug'
-  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+  if RUBY_VERSION >= '3.4'
+    gem 'base64'
+    gem 'mutex_m'
+  end
 end
diff --git a/instrumentation/active_storage/Gemfile b/instrumentation/active_storage/Gemfile
index abd1ea9e9..e4d2581d4 100644
--- a/instrumentation/active_storage/Gemfile
+++ b/instrumentation/active_storage/Gemfile
@@ -11,5 +11,8 @@ gemspec
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'opentelemetry-instrumentation-active_support', path: '../active_support'
-  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+  if RUBY_VERSION >= '3.4'
+    gem 'base64'
+    gem 'mutex_m'
+  end
 end
diff --git a/instrumentation/active_support/Gemfile b/instrumentation/active_support/Gemfile
index d4c603924..cb4d0e9ba 100644
--- a/instrumentation/active_support/Gemfile
+++ b/instrumentation/active_support/Gemfile
@@ -10,5 +10,8 @@ gemspec
 
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
-  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+  if RUBY_VERSION >= '3.4'
+    gem 'base64'
+    gem 'mutex_m'
+  end
 end
diff --git a/instrumentation/all/Gemfile b/instrumentation/all/Gemfile
index 4eecd3edd..2142f3e97 100644
--- a/instrumentation/all/Gemfile
+++ b/instrumentation/all/Gemfile
@@ -9,7 +9,10 @@ source 'https://rubygems.org'
 gemspec
 
 group :test do
-  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+  if RUBY_VERSION >= '3.4'
+    gem 'base64'
+    gem 'mutex_m'
+  end
 
   Dir.entries('../../helpers')
      .select { |entry| File.directory?(File.join('../../helpers', entry)) }
diff --git a/instrumentation/aws_lambda/Gemfile b/instrumentation/aws_lambda/Gemfile
index f29cfe9b9..9fe40be08 100644
--- a/instrumentation/aws_lambda/Gemfile
+++ b/instrumentation/aws_lambda/Gemfile
@@ -11,5 +11,8 @@ gemspec
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'webrick', '~> 1.7'
-  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+  if RUBY_VERSION >= '3.4'
+    gem 'base64'
+    gem 'mutex_m'
+  end
 end
diff --git a/instrumentation/aws_sdk/Gemfile b/instrumentation/aws_sdk/Gemfile
index f29cfe9b9..9fe40be08 100644
--- a/instrumentation/aws_sdk/Gemfile
+++ b/instrumentation/aws_sdk/Gemfile
@@ -11,5 +11,8 @@ gemspec
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'webrick', '~> 1.7'
-  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+  if RUBY_VERSION >= '3.4'
+    gem 'base64'
+    gem 'mutex_m'
+  end
 end
diff --git a/instrumentation/base/Gemfile b/instrumentation/base/Gemfile
index 293f70a5e..afb6912bf 100644
--- a/instrumentation/base/Gemfile
+++ b/instrumentation/base/Gemfile
@@ -9,5 +9,8 @@ source 'https://rubygems.org'
 gemspec
 
 group :test do
-  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+  if RUBY_VERSION >= '3.4'
+    gem 'base64'
+    gem 'mutex_m'
+  end
 end
diff --git a/instrumentation/bunny/Gemfile b/instrumentation/bunny/Gemfile
index e46552806..3b0bc1bdf 100644
--- a/instrumentation/bunny/Gemfile
+++ b/instrumentation/bunny/Gemfile
@@ -11,5 +11,8 @@ gemspec
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'pry-byebug'
-  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+  if RUBY_VERSION >= '3.4'
+    gem 'base64'
+    gem 'mutex_m'
+  end
 end
diff --git a/instrumentation/concurrent_ruby/Gemfile b/instrumentation/concurrent_ruby/Gemfile
index d4c603924..cb4d0e9ba 100644
--- a/instrumentation/concurrent_ruby/Gemfile
+++ b/instrumentation/concurrent_ruby/Gemfile
@@ -10,5 +10,8 @@ gemspec
 
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
-  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+  if RUBY_VERSION >= '3.4'
+    gem 'base64'
+    gem 'mutex_m'
+  end
 end
diff --git a/instrumentation/dalli/Gemfile b/instrumentation/dalli/Gemfile
index db9df6ab1..a3267745c 100644
--- a/instrumentation/dalli/Gemfile
+++ b/instrumentation/dalli/Gemfile
@@ -11,5 +11,8 @@ gemspec
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'pry'
-  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+  if RUBY_VERSION >= '3.4'
+    gem 'base64'
+    gem 'mutex_m'
+  end
 end
diff --git a/instrumentation/delayed_job/Gemfile b/instrumentation/delayed_job/Gemfile
index d4c603924..cb4d0e9ba 100644
--- a/instrumentation/delayed_job/Gemfile
+++ b/instrumentation/delayed_job/Gemfile
@@ -10,5 +10,8 @@ gemspec
 
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
-  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+  if RUBY_VERSION >= '3.4'
+    gem 'base64'
+    gem 'mutex_m'
+  end
 end
diff --git a/instrumentation/ethon/Gemfile b/instrumentation/ethon/Gemfile
index d4c603924..cb4d0e9ba 100644
--- a/instrumentation/ethon/Gemfile
+++ b/instrumentation/ethon/Gemfile
@@ -10,5 +10,8 @@ gemspec
 
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
-  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+  if RUBY_VERSION >= '3.4'
+    gem 'base64'
+    gem 'mutex_m'
+  end
 end
diff --git a/instrumentation/excon/Gemfile b/instrumentation/excon/Gemfile
index d4c603924..cb4d0e9ba 100644
--- a/instrumentation/excon/Gemfile
+++ b/instrumentation/excon/Gemfile
@@ -10,5 +10,8 @@ gemspec
 
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
-  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+  if RUBY_VERSION >= '3.4'
+    gem 'base64'
+    gem 'mutex_m'
+  end
 end
diff --git a/instrumentation/faraday/Gemfile b/instrumentation/faraday/Gemfile
index d4c603924..cb4d0e9ba 100644
--- a/instrumentation/faraday/Gemfile
+++ b/instrumentation/faraday/Gemfile
@@ -10,5 +10,8 @@ gemspec
 
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
-  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+  if RUBY_VERSION >= '3.4'
+    gem 'base64'
+    gem 'mutex_m'
+  end
 end
diff --git a/instrumentation/grape/Gemfile b/instrumentation/grape/Gemfile
index 9ff51bcb1..b9575b527 100644
--- a/instrumentation/grape/Gemfile
+++ b/instrumentation/grape/Gemfile
@@ -16,5 +16,8 @@ group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'opentelemetry-instrumentation-rack', path: '../rack'
   gem 'builder'
-  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+  if RUBY_VERSION >= '3.4'
+    gem 'base64'
+    gem 'mutex_m'
+  end
 end
diff --git a/instrumentation/graphql/Gemfile b/instrumentation/graphql/Gemfile
index e46552806..3b0bc1bdf 100644
--- a/instrumentation/graphql/Gemfile
+++ b/instrumentation/graphql/Gemfile
@@ -11,5 +11,8 @@ gemspec
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'pry-byebug'
-  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+  if RUBY_VERSION >= '3.4'
+    gem 'base64'
+    gem 'mutex_m'
+  end
 end
diff --git a/instrumentation/grpc/Gemfile b/instrumentation/grpc/Gemfile
index b7fe8f8a5..f87d40ffb 100644
--- a/instrumentation/grpc/Gemfile
+++ b/instrumentation/grpc/Gemfile
@@ -12,5 +12,8 @@ gemspec
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'pry'
-  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+  if RUBY_VERSION >= '3.4'
+    gem 'base64'
+    gem 'mutex_m'
+  end
 end
diff --git a/instrumentation/gruf/Gemfile b/instrumentation/gruf/Gemfile
index b4e1df3cd..208227775 100644
--- a/instrumentation/gruf/Gemfile
+++ b/instrumentation/gruf/Gemfile
@@ -14,5 +14,8 @@ gemspec
 
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
-  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+  if RUBY_VERSION >= '3.4'
+    gem 'base64'
+    gem 'mutex_m'
+  end
 end
diff --git a/instrumentation/http/Gemfile b/instrumentation/http/Gemfile
index e46552806..3b0bc1bdf 100644
--- a/instrumentation/http/Gemfile
+++ b/instrumentation/http/Gemfile
@@ -11,5 +11,8 @@ gemspec
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'pry-byebug'
-  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+  if RUBY_VERSION >= '3.4'
+    gem 'base64'
+    gem 'mutex_m'
+  end
 end
diff --git a/instrumentation/http_client/Gemfile b/instrumentation/http_client/Gemfile
index e46552806..3b0bc1bdf 100644
--- a/instrumentation/http_client/Gemfile
+++ b/instrumentation/http_client/Gemfile
@@ -11,5 +11,8 @@ gemspec
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'pry-byebug'
-  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+  if RUBY_VERSION >= '3.4'
+    gem 'base64'
+    gem 'mutex_m'
+  end
 end
diff --git a/instrumentation/httpx/Gemfile b/instrumentation/httpx/Gemfile
index 253e97984..88f25d67e 100644
--- a/instrumentation/httpx/Gemfile
+++ b/instrumentation/httpx/Gemfile
@@ -11,5 +11,8 @@ gemspec
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'pry-byebug', platform: 'ruby'
-  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+  if RUBY_VERSION >= '3.4'
+    gem 'base64'
+    gem 'mutex_m'
+  end
 end
diff --git a/instrumentation/koala/Gemfile b/instrumentation/koala/Gemfile
index e46552806..3b0bc1bdf 100644
--- a/instrumentation/koala/Gemfile
+++ b/instrumentation/koala/Gemfile
@@ -11,5 +11,8 @@ gemspec
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'pry-byebug'
-  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+  if RUBY_VERSION >= '3.4'
+    gem 'base64'
+    gem 'mutex_m'
+  end
 end
diff --git a/instrumentation/lmdb/Gemfile b/instrumentation/lmdb/Gemfile
index e46552806..3b0bc1bdf 100644
--- a/instrumentation/lmdb/Gemfile
+++ b/instrumentation/lmdb/Gemfile
@@ -11,5 +11,8 @@ gemspec
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'pry-byebug'
-  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+  if RUBY_VERSION >= '3.4'
+    gem 'base64'
+    gem 'mutex_m'
+  end
 end
diff --git a/instrumentation/mongo/Gemfile b/instrumentation/mongo/Gemfile
index d4c603924..cb4d0e9ba 100644
--- a/instrumentation/mongo/Gemfile
+++ b/instrumentation/mongo/Gemfile
@@ -10,5 +10,8 @@ gemspec
 
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
-  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+  if RUBY_VERSION >= '3.4'
+    gem 'base64'
+    gem 'mutex_m'
+  end
 end
diff --git a/instrumentation/mysql2/Gemfile b/instrumentation/mysql2/Gemfile
index 4ef86e850..ca7c8e776 100644
--- a/instrumentation/mysql2/Gemfile
+++ b/instrumentation/mysql2/Gemfile
@@ -13,5 +13,8 @@ group :test, :development do
   gem 'opentelemetry-helpers-sql', path: '../../helpers/sql'
   gem 'opentelemetry-helpers-mysql', path: '../../helpers/mysql'
   gem 'opentelemetry-helpers-sql-obfuscation', path: '../../helpers/sql-obfuscation'
-  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+  if RUBY_VERSION >= '3.4'
+    gem 'base64'
+    gem 'mutex_m'
+  end
 end
diff --git a/instrumentation/net_http/Gemfile b/instrumentation/net_http/Gemfile
index d4c603924..cb4d0e9ba 100644
--- a/instrumentation/net_http/Gemfile
+++ b/instrumentation/net_http/Gemfile
@@ -10,5 +10,8 @@ gemspec
 
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
-  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+  if RUBY_VERSION >= '3.4'
+    gem 'base64'
+    gem 'mutex_m'
+  end
 end
diff --git a/instrumentation/pg/Gemfile b/instrumentation/pg/Gemfile
index 904b07e19..393fb9ce5 100644
--- a/instrumentation/pg/Gemfile
+++ b/instrumentation/pg/Gemfile
@@ -13,5 +13,8 @@ group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'opentelemetry-helpers-sql', path: '../../helpers/sql'
   gem 'opentelemetry-helpers-sql-obfuscation', path: '../../helpers/sql-obfuscation'
-  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+  if RUBY_VERSION >= '3.4'
+    gem 'base64'
+    gem 'mutex_m'
+  end
 end
diff --git a/instrumentation/que/Gemfile b/instrumentation/que/Gemfile
index fa9661fd8..098ad1b91 100644
--- a/instrumentation/que/Gemfile
+++ b/instrumentation/que/Gemfile
@@ -15,5 +15,8 @@ group :test do
   gem 'opentelemetry-helpers-sql-obfuscation', path: '../../helpers/sql-obfuscation'
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'opentelemetry-instrumentation-pg', path: '../pg'
-  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+  if RUBY_VERSION >= '3.4'
+    gem 'base64'
+    gem 'mutex_m'
+  end
 end
diff --git a/instrumentation/racecar/Gemfile b/instrumentation/racecar/Gemfile
index f441ca843..453210306 100644
--- a/instrumentation/racecar/Gemfile
+++ b/instrumentation/racecar/Gemfile
@@ -14,5 +14,8 @@ gemspec
 
 group :development, :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
-  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+  if RUBY_VERSION >= '3.4'
+    gem 'base64'
+    gem 'mutex_m'
+  end
 end
diff --git a/instrumentation/rack/Gemfile b/instrumentation/rack/Gemfile
index fc98f7c79..cb6872035 100644
--- a/instrumentation/rack/Gemfile
+++ b/instrumentation/rack/Gemfile
@@ -12,5 +12,8 @@ group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'rack-test', '~> 2.1.0'
   gem 'pry-byebug'
-  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+  if RUBY_VERSION >= '3.4'
+    gem 'base64'
+    gem 'mutex_m'
+  end
 end
diff --git a/instrumentation/rails/Gemfile b/instrumentation/rails/Gemfile
index 7d6bcf048..25515e127 100644
--- a/instrumentation/rails/Gemfile
+++ b/instrumentation/rails/Gemfile
@@ -19,5 +19,8 @@ group :test, :development do
   gem 'opentelemetry-instrumentation-active_support', path: '../active_support'
   gem 'opentelemetry-instrumentation-action_view', path: '../action_view'
   gem 'opentelemetry-instrumentation-rack', path: '../rack'
-  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+  if RUBY_VERSION >= '3.4'
+    gem 'base64'
+    gem 'mutex_m'
+  end
 end
diff --git a/instrumentation/rake/Gemfile b/instrumentation/rake/Gemfile
index b4e1df3cd..208227775 100644
--- a/instrumentation/rake/Gemfile
+++ b/instrumentation/rake/Gemfile
@@ -14,5 +14,8 @@ gemspec
 
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
-  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+  if RUBY_VERSION >= '3.4'
+    gem 'base64'
+    gem 'mutex_m'
+  end
 end
diff --git a/instrumentation/rdkafka/Gemfile b/instrumentation/rdkafka/Gemfile
index d4c603924..cb4d0e9ba 100644
--- a/instrumentation/rdkafka/Gemfile
+++ b/instrumentation/rdkafka/Gemfile
@@ -10,5 +10,8 @@ gemspec
 
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
-  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+  if RUBY_VERSION >= '3.4'
+    gem 'base64'
+    gem 'mutex_m'
+  end
 end
diff --git a/instrumentation/redis/Gemfile b/instrumentation/redis/Gemfile
index d4c603924..cb4d0e9ba 100644
--- a/instrumentation/redis/Gemfile
+++ b/instrumentation/redis/Gemfile
@@ -10,5 +10,8 @@ gemspec
 
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
-  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+  if RUBY_VERSION >= '3.4'
+    gem 'base64'
+    gem 'mutex_m'
+  end
 end
diff --git a/instrumentation/resque/Gemfile b/instrumentation/resque/Gemfile
index 297f29154..370add599 100644
--- a/instrumentation/resque/Gemfile
+++ b/instrumentation/resque/Gemfile
@@ -12,5 +12,8 @@ group :test do
   gem 'activejob'
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'pry-byebug'
-  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+  if RUBY_VERSION >= '3.4'
+    gem 'base64'
+    gem 'mutex_m'
+  end
 end
diff --git a/instrumentation/restclient/Gemfile b/instrumentation/restclient/Gemfile
index d4c603924..cb4d0e9ba 100644
--- a/instrumentation/restclient/Gemfile
+++ b/instrumentation/restclient/Gemfile
@@ -10,5 +10,8 @@ gemspec
 
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
-  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+  if RUBY_VERSION >= '3.4'
+    gem 'base64'
+    gem 'mutex_m'
+  end
 end
diff --git a/instrumentation/rspec/Gemfile b/instrumentation/rspec/Gemfile
index 217c8d4bb..1f471f53b 100644
--- a/instrumentation/rspec/Gemfile
+++ b/instrumentation/rspec/Gemfile
@@ -11,5 +11,8 @@ gemspec
 group :test do
   gem 'rspec', '~> 3.0'
   gem 'opentelemetry-instrumentation-base', path: '../base'
-  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+  if RUBY_VERSION >= '3.4'
+    gem 'base64'
+    gem 'mutex_m'
+  end
 end
diff --git a/instrumentation/ruby_kafka/Gemfile b/instrumentation/ruby_kafka/Gemfile
index e46552806..3b0bc1bdf 100644
--- a/instrumentation/ruby_kafka/Gemfile
+++ b/instrumentation/ruby_kafka/Gemfile
@@ -11,5 +11,8 @@ gemspec
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'pry-byebug'
-  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+  if RUBY_VERSION >= '3.4'
+    gem 'base64'
+    gem 'mutex_m'
+  end
 end
diff --git a/instrumentation/sidekiq/Gemfile b/instrumentation/sidekiq/Gemfile
index a07c5c6a2..4eaed0573 100644
--- a/instrumentation/sidekiq/Gemfile
+++ b/instrumentation/sidekiq/Gemfile
@@ -12,5 +12,8 @@ group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'opentelemetry-instrumentation-redis', path: '../redis'
   gem 'pry-byebug'
-  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+  if RUBY_VERSION >= '3.4'
+    gem 'base64'
+    gem 'mutex_m'
+  end
 end
diff --git a/instrumentation/sinatra/Gemfile b/instrumentation/sinatra/Gemfile
index 66a662371..979b4b8d5 100644
--- a/instrumentation/sinatra/Gemfile
+++ b/instrumentation/sinatra/Gemfile
@@ -11,5 +11,8 @@ gemspec
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'opentelemetry-instrumentation-rack', path: '../rack'
-  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+  if RUBY_VERSION >= '3.4'
+    gem 'base64'
+    gem 'mutex_m'
+  end
 end
diff --git a/instrumentation/trilogy/Gemfile b/instrumentation/trilogy/Gemfile
index 6e850813b..76291fcae 100644
--- a/instrumentation/trilogy/Gemfile
+++ b/instrumentation/trilogy/Gemfile
@@ -14,5 +14,8 @@ group :test do
   gem 'opentelemetry-helpers-sql', path: '../../helpers/sql'
   gem 'opentelemetry-helpers-sql-obfuscation', path: '../../helpers/sql-obfuscation'
   gem 'opentelemetry-propagator-vitess', path: '../../propagator/vitess'
-  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+  if RUBY_VERSION >= '3.4'
+    gem 'base64'
+    gem 'mutex_m'
+  end
 end
diff --git a/processor/baggage/Gemfile b/processor/baggage/Gemfile
index 24ff11b6e..60fea68d1 100644
--- a/processor/baggage/Gemfile
+++ b/processor/baggage/Gemfile
@@ -6,5 +6,8 @@ source 'https://rubygems.org'
 gemspec
 
 group :test do
-  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+  if RUBY_VERSION >= '3.4'
+    gem 'base64'
+    gem 'mutex_m'
+  end
 end
diff --git a/propagator/ottrace/Gemfile b/propagator/ottrace/Gemfile
index b5c8d739f..f90da05eb 100644
--- a/propagator/ottrace/Gemfile
+++ b/propagator/ottrace/Gemfile
@@ -6,5 +6,8 @@ source 'https://rubygems.org'
 gemspec
 
 group :test do
-  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+  if RUBY_VERSION >= '3.4'
+    gem 'base64'
+    gem 'mutex_m'
+  end
 end
diff --git a/propagator/vitess/Gemfile b/propagator/vitess/Gemfile
index 4f53697a0..4e5d0180b 100644
--- a/propagator/vitess/Gemfile
+++ b/propagator/vitess/Gemfile
@@ -6,5 +6,8 @@ source 'https://rubygems.org'
 gemspec
 
 group :test do
-  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+  if RUBY_VERSION >= '3.4'
+    gem 'base64'
+    gem 'mutex_m'
+  end
 end
diff --git a/propagator/xray/Gemfile b/propagator/xray/Gemfile
index 495fad952..894ba545f 100644
--- a/propagator/xray/Gemfile
+++ b/propagator/xray/Gemfile
@@ -9,5 +9,8 @@ source 'https://rubygems.org'
 gemspec
 
 group :test do
-  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+  if RUBY_VERSION >= '3.4'
+    gem 'base64'
+    gem 'mutex_m'
+  end
 end
diff --git a/resources/azure/Gemfile b/resources/azure/Gemfile
index 33e51aa67..4e5a19cc9 100644
--- a/resources/azure/Gemfile
+++ b/resources/azure/Gemfile
@@ -11,5 +11,8 @@ gemspec
 group :development, :test do
   gem 'byebug' unless RUBY_PLATFORM == 'java'
   gem 'pry'
-  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+  if RUBY_VERSION >= '3.4'
+    gem 'base64'
+    gem 'mutex_m'
+  end
 end
diff --git a/resources/container/Gemfile b/resources/container/Gemfile
index 33e51aa67..4e5a19cc9 100644
--- a/resources/container/Gemfile
+++ b/resources/container/Gemfile
@@ -11,5 +11,8 @@ gemspec
 group :development, :test do
   gem 'byebug' unless RUBY_PLATFORM == 'java'
   gem 'pry'
-  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+  if RUBY_VERSION >= '3.4'
+    gem 'base64'
+    gem 'mutex_m'
+  end
 end
diff --git a/resources/google_cloud_platform/Gemfile b/resources/google_cloud_platform/Gemfile
index 33e51aa67..4e5a19cc9 100644
--- a/resources/google_cloud_platform/Gemfile
+++ b/resources/google_cloud_platform/Gemfile
@@ -11,5 +11,8 @@ gemspec
 group :development, :test do
   gem 'byebug' unless RUBY_PLATFORM == 'java'
   gem 'pry'
-  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+  if RUBY_VERSION >= '3.4'
+    gem 'base64'
+    gem 'mutex_m'
+  end
 end

From c45d4382364d14ad15ead4df2305952f0766415f Mon Sep 17 00:00:00 2001
From: Ariel Valentin <arielvalentin@github.com>
Date: Wed, 29 Jan 2025 23:15:49 -0600
Subject: [PATCH 07/14] squash: relax test

---
 .../test/instrumentation/graphql/instrumentation_test.rb      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/instrumentation/graphql/test/instrumentation/graphql/instrumentation_test.rb b/instrumentation/graphql/test/instrumentation/graphql/instrumentation_test.rb
index 580918fb8..70e8c04a3 100644
--- a/instrumentation/graphql/test/instrumentation/graphql/instrumentation_test.rb
+++ b/instrumentation/graphql/test/instrumentation/graphql/instrumentation_test.rb
@@ -54,7 +54,7 @@
           OpenTelemetry::TestHelpers.with_test_logger do |log|
             instrumentation.install(config)
             _(log.string).must_match(
-              /undefined method `trace_with'.*Old::Truck/
+              /undefined method.*trace_with.*Old::Truck/
             )
           end
         end
@@ -90,7 +90,7 @@
             instrumentation.install(config)
 
             _(log.string).must_match(
-              /undefined method `use'.*Old::Truck/
+              /undefined method.*use.*Old::Truck/
             )
           end
         end

From 4320cd4bc70cf25f846da4ad810c693f2110da12 Mon Sep 17 00:00:00 2001
From: Ariel Valentin <arielvalentin@github.com>
Date: Wed, 29 Jan 2025 23:21:31 -0600
Subject: [PATCH 08/14] squash: fix test

---
 .../aws_lambda/test/opentelemetry/instrumentation_test.rb       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/instrumentation/aws_lambda/test/opentelemetry/instrumentation_test.rb b/instrumentation/aws_lambda/test/opentelemetry/instrumentation_test.rb
index c45525c5a..713cc8423 100644
--- a/instrumentation/aws_lambda/test/opentelemetry/instrumentation_test.rb
+++ b/instrumentation/aws_lambda/test/opentelemetry/instrumentation_test.rb
@@ -95,7 +95,7 @@
         _(last_span.hex_span_id.size).must_equal 16
         _(last_span.hex_trace_id.size).must_equal 32
         _(last_span.trace_flags.sampled?).must_equal true
-        _(last_span.tracestate.to_h.to_s).must_equal '{"otel"=>"ff40ea9699e62af2-01"}'
+        _(last_span.tracestate.to_h).must_equal { 'otel' => 'ff40ea9699e62af2-01' }
       end
       event_v1['headers'].delete('traceparent')
       event_v1['headers'].delete('tracestate')

From a92c5fff5607977e38106a8b0dc68ec9a380cff9 Mon Sep 17 00:00:00 2001
From: Ariel Valentin <arielvalentin@github.com>
Date: Wed, 29 Jan 2025 23:34:11 -0600
Subject: [PATCH 09/14] squash: why you no work?

---
 instrumentation/rails/Gemfile                     | 1 +
 instrumentation/rails/test/railtie/test_helper.rb | 1 +
 2 files changed, 2 insertions(+)

diff --git a/instrumentation/rails/Gemfile b/instrumentation/rails/Gemfile
index 25515e127..73b3d2188 100644
--- a/instrumentation/rails/Gemfile
+++ b/instrumentation/rails/Gemfile
@@ -21,6 +21,7 @@ group :test, :development do
   gem 'opentelemetry-instrumentation-rack', path: '../rack'
   if RUBY_VERSION >= '3.4'
     gem 'base64'
+    gem 'drb'
     gem 'mutex_m'
   end
 end
diff --git a/instrumentation/rails/test/railtie/test_helper.rb b/instrumentation/rails/test/railtie/test_helper.rb
index 47fc82f4e..d33691ce3 100644
--- a/instrumentation/rails/test/railtie/test_helper.rb
+++ b/instrumentation/rails/test/railtie/test_helper.rb
@@ -13,6 +13,7 @@
 
 require 'bundler/setup'
 Bundler.require(:default, :development, :test)
+require 'drb'
 
 require_relative '../../test/railtie/dummy/config/environment'
 require 'rails/test_help'

From 0656c8f8561ff36c10f4c6647037156ced31ac80 Mon Sep 17 00:00:00 2001
From: Ariel Valentin <arielvalentin@github.com>
Date: Thu, 30 Jan 2025 00:29:25 -0600
Subject: [PATCH 10/14] squash: more dependencies

---
 instrumentation/mysql2/Gemfile     | 1 +
 instrumentation/racecar/Gemfile    | 1 +
 instrumentation/ruby_kafka/Gemfile | 1 +
 instrumentation/trilogy/Gemfile    | 1 +
 4 files changed, 4 insertions(+)

diff --git a/instrumentation/mysql2/Gemfile b/instrumentation/mysql2/Gemfile
index ca7c8e776..7d8ac2815 100644
--- a/instrumentation/mysql2/Gemfile
+++ b/instrumentation/mysql2/Gemfile
@@ -15,6 +15,7 @@ group :test, :development do
   gem 'opentelemetry-helpers-sql-obfuscation', path: '../../helpers/sql-obfuscation'
   if RUBY_VERSION >= '3.4'
     gem 'base64'
+    gem 'bigdecimal'
     gem 'mutex_m'
   end
 end
diff --git a/instrumentation/racecar/Gemfile b/instrumentation/racecar/Gemfile
index 453210306..8b4e6610d 100644
--- a/instrumentation/racecar/Gemfile
+++ b/instrumentation/racecar/Gemfile
@@ -13,6 +13,7 @@ source 'https://rubygems.org'
 gemspec
 
 group :development, :test do
+  gem 'activesupport'
   gem 'opentelemetry-instrumentation-base', path: '../base'
   if RUBY_VERSION >= '3.4'
     gem 'base64'
diff --git a/instrumentation/ruby_kafka/Gemfile b/instrumentation/ruby_kafka/Gemfile
index 3b0bc1bdf..19acd43ac 100644
--- a/instrumentation/ruby_kafka/Gemfile
+++ b/instrumentation/ruby_kafka/Gemfile
@@ -13,6 +13,7 @@ group :test do
   gem 'pry-byebug'
   if RUBY_VERSION >= '3.4'
     gem 'base64'
+    gem 'bigdecimal'
     gem 'mutex_m'
   end
 end
diff --git a/instrumentation/trilogy/Gemfile b/instrumentation/trilogy/Gemfile
index 76291fcae..94ce08991 100644
--- a/instrumentation/trilogy/Gemfile
+++ b/instrumentation/trilogy/Gemfile
@@ -16,6 +16,7 @@ group :test do
   gem 'opentelemetry-propagator-vitess', path: '../../propagator/vitess'
   if RUBY_VERSION >= '3.4'
     gem 'base64'
+    gem 'bigdecimal'
     gem 'mutex_m'
   end
 end

From 1ad31eb975b114358f72fb673b4deaa26234a6e7 Mon Sep 17 00:00:00 2001
From: Ariel Valentin <arielvalentin@github.com>
Date: Thu, 30 Jan 2025 00:41:44 -0600
Subject: [PATCH 11/14] squash: damage

---
 instrumentation/graphql/Appraisals | 29 ++++++-----------------------
 1 file changed, 6 insertions(+), 23 deletions(-)

diff --git a/instrumentation/graphql/Appraisals b/instrumentation/graphql/Appraisals
index 05298c160..5b6847baf 100644
--- a/instrumentation/graphql/Appraisals
+++ b/instrumentation/graphql/Appraisals
@@ -4,33 +4,16 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-# Max compatible version of 1.x
-appraise 'graphql-1.x' do
-  gem 'graphql', '~> 1.13'
-end
-
-# A bug was introduced in 2.0.18 that was fixed in 2.0.19
-appraise 'graphql-2.0.18' do
-  gem 'graphql', '2.0.18'
-end
-
 # Max compatible version of 2.0.x
-appraise 'graphql-2.0' do
-  gem 'graphql', '~> 2.0.27'
-end
-
-# Max compatible version of 2.1.x
-appraise 'graphql-2.1' do
-  gem 'graphql', '~> 2.1.8'
-end
 
-appraise 'graphql-c_parser-2.2.x' do
-  gem 'graphql', '~> 2.2.1'
-  gem 'graphql-c_parser', '~> 1.0.7'
+(0..4).each do |minor_version|
+  appraise "graphql-2.#{minor_version}.x" do
+    gem 'graphql', "~> 2.#{minor_version}.0"
+  end
 end
 
-appraise 'graphql-2.2.x' do
-  gem 'graphql', '~> 2.2.1', '< 3.0.0'
+(0..1).each do |minor_version|
+  gem 'graphql-c_parser', "~> 1.#{minor_version}.0"
 end
 
 appraise 'graphql-c_parser-latest' do

From cfc980e03fa3ea44eb383e0e0591fb61a58740d7 Mon Sep 17 00:00:00 2001
From: Ariel Valentin <arielvalentin@github.com>
Date: Thu, 30 Jan 2025 00:44:31 -0600
Subject: [PATCH 12/14] stop commiting after midnight

---
 instrumentation/graphql/Appraisals | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/instrumentation/graphql/Appraisals b/instrumentation/graphql/Appraisals
index 5b6847baf..123709c94 100644
--- a/instrumentation/graphql/Appraisals
+++ b/instrumentation/graphql/Appraisals
@@ -13,7 +13,9 @@
 end
 
 (0..1).each do |minor_version|
-  gem 'graphql-c_parser', "~> 1.#{minor_version}.0"
+  appraise "graphql-c_parser-1.#{minor_version}.x" do
+    gem 'graphql-c_parser', "~> 1.#{minor_version}.0"
+  end
 end
 
 appraise 'graphql-c_parser-latest' do

From 8cd1bca4c5bd35e9f8fd8d1722bffb7d3cd32c8f Mon Sep 17 00:00:00 2001
From: Ariel Valentin <arielvalentin@github.com>
Date: Thu, 30 Jan 2025 23:29:05 -0600
Subject: [PATCH 13/14] squash: tricky compatability

---
 instrumentation/graphql/Appraisals | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/instrumentation/graphql/Appraisals b/instrumentation/graphql/Appraisals
index 123709c94..52d9a9dd6 100644
--- a/instrumentation/graphql/Appraisals
+++ b/instrumentation/graphql/Appraisals
@@ -12,10 +12,13 @@
   end
 end
 
-(0..1).each do |minor_version|
-  appraise "graphql-c_parser-1.#{minor_version}.x" do
-    gem 'graphql-c_parser', "~> 1.#{minor_version}.0"
-  end
+appraise 'graphql-c_parser-1.0.x' do
+  gem 'graphql', '< 2.3.1'
+  gem 'graphql-c_parser', '~> 1.0.0'
+end
+
+appraise 'graphql-c_parser-1.x' do
+  gem 'graphql-c_parser', '~> 1.1'
 end
 
 appraise 'graphql-c_parser-latest' do

From 1d17a0d52e54d1d01301a983b4263527ac0dd11b Mon Sep 17 00:00:00 2001
From: Ariel Valentin <arielvalentin@github.com>
Date: Thu, 30 Jan 2025 23:31:16 -0600
Subject: [PATCH 14/14] squash: aws test fix?

---
 .../aws_lambda/test/opentelemetry/instrumentation_test.rb       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/instrumentation/aws_lambda/test/opentelemetry/instrumentation_test.rb b/instrumentation/aws_lambda/test/opentelemetry/instrumentation_test.rb
index df4d8c065..928419ac4 100644
--- a/instrumentation/aws_lambda/test/opentelemetry/instrumentation_test.rb
+++ b/instrumentation/aws_lambda/test/opentelemetry/instrumentation_test.rb
@@ -96,7 +96,7 @@
         _(last_span.hex_span_id.size).must_equal 16
         _(last_span.hex_trace_id.size).must_equal 32
         _(last_span.trace_flags.sampled?).must_equal true
-        _(last_span.tracestate).must_equal({ 'otel' => 'ff40ea9699e62af2-01' })
+        _(last_span.tracestate.to_h).must_equal({ 'otel' => 'ff40ea9699e62af2-01' })
       end
       event_v1['headers'].delete('traceparent')
       event_v1['headers'].delete('tracestate')