squash: update jruby

arielvalentin · arielvalentin · commit ea07e07169e4 · 2025-10-04T09:30:14.000-05:00
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -26,8 +26,8 @@ what happened and what you expected with a link to the relevant portion of the s
 
 Operating system details: Linux, Ubuntu 20.04 LTS
 RUBY_ENGINE: "ruby"
-RUBY_VERSION: "3.1.1"
-RUBY_DESCRIPTION: "ruby 3.1.1p18 (2022-02-18 revision 53f5fc4236) [arm64-darwin21]"
+RUBY_VERSION: "3.4"
+RUBY_DESCRIPTION: "ruby 3.4.1 (2024-12-25 revision 48d4efcb85)"
 
 **Share a simplified reproduction if possible**
 
diff --git a/.github/workflows/ci-contrib.yml b/.github/workflows/ci-contrib.yml
@@ -57,7 +57,7 @@ jobs:
         uses: ./.github/actions/test_gem
         with:
           gem: "opentelemetry-helpers-${{ matrix.gem }}"
-          ruby: "jruby-9.4.12.0"
+          ruby: "jruby-10.0.2.0"
 
   propagators:
     strategy:
@@ -97,7 +97,7 @@ jobs:
         uses: ./.github/actions/test_gem
         with:
           gem: "opentelemetry-propagator-${{ matrix.gem }}"
-          ruby: "jruby-9.4.12.0"
+          ruby: "jruby-10.0.2.0"
 
   resource-detectors:
     strategy:
@@ -138,7 +138,7 @@ jobs:
         uses: ./.github/actions/test_gem
         with:
           gem: "opentelemetry-${{ matrix.gem }}"
-          ruby: "jruby-9.4.12.0"
+          ruby: "jruby-10.0.2.0"
 
   processors:
     strategy:
@@ -176,7 +176,7 @@ jobs:
         uses: ./.github/actions/test_gem
         with:
           gem: "opentelemetry-processor-${{ matrix.gem }}"
-          ruby: "jruby-9.4.12.0"
+          ruby: "jruby-10.0.2.0"
 
   samplers:
     strategy:
@@ -214,4 +214,4 @@ jobs:
         uses: ./.github/actions/test_gem
         with:
           gem: "opentelemetry-sampler-${{ matrix.gem }}"
-          ruby: "jruby-9.4.12.0"
+          ruby: "jruby-10.0.2.0"
diff --git a/.github/workflows/ci-instrumentation-with-services.yml b/.github/workflows/ci-instrumentation-with-services.yml
@@ -55,7 +55,7 @@ jobs:
         uses: ./.github/actions/test_gem
         with:
           gem:  "opentelemetry-instrumentation-${{ matrix.gem }}"
-          ruby: "jruby-9.4.12.0"
+          ruby: "jruby-10.0.2.0"
     services:
       memcached:
         image: memcached:alpine
diff --git a/.github/workflows/ci-instrumentation.yml b/.github/workflows/ci-instrumentation.yml
@@ -112,4 +112,4 @@ jobs:
         uses: ./.github/actions/test_gem
         with:
           gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
-          ruby: "jruby-9.4.12.0"
+          ruby: "jruby-10.0.2.0"
diff --git a/.github/workflows/installation-tests.yml b/.github/workflows/installation-tests.yml
@@ -21,7 +21,6 @@ jobs:
           - 3.4
           - 3.3
           - 3.2
-          - 3.1
     name: ${{ matrix.ruby-version }}
     runs-on: ubuntu-latest
     steps:
diff --git a/.github/workflows/release-hook-on-closed.yml b/.github/workflows/release-hook-on-closed.yml
@@ -14,7 +14,7 @@ jobs:
       pull-requests: write # required for updating release PRs
     if: ${{ github.repository == 'open-telemetry/opentelemetry-ruby-contrib' }}
     env:
-      ruby_version: "3.1"
+      ruby-version: "3.2"
     runs-on: ubuntu-latest
     steps:
       - name: Install Ruby ${{ env.ruby_version }}
diff --git a/.github/workflows/release-hook-on-push.yml b/.github/workflows/release-hook-on-push.yml
@@ -15,7 +15,7 @@ jobs:
       pull-requests: write # required for updating release PRs
     if: ${{ github.repository == 'open-telemetry/opentelemetry-ruby-contrib' }}
     env:
-      ruby_version: "3.1"
+      ruby-version: "3.2"
     runs-on: ubuntu-latest
     steps:
       - name: Install Ruby ${{ env.ruby_version }}
diff --git a/.github/workflows/release-perform.yml b/.github/workflows/release-perform.yml
@@ -24,7 +24,7 @@ jobs:
       pull-requests: write # required for creating release PRs
     if: ${{ github.repository == 'open-telemetry/opentelemetry-ruby-contrib' }}
     env:
-      ruby_version: "3.1"
+      ruby-version: "3.2"
     runs-on: ubuntu-latest
     steps:
       - name: Install Ruby ${{ env.ruby_version }}
diff --git a/.github/workflows/release-please.yaml b/.github/workflows/release-please.yaml
@@ -59,7 +59,7 @@ jobs:
 
       - uses: ruby/setup-ruby@v1.263.0
         with:
-          ruby-version: "3.1"
+          ruby-version: "3.2"
           bundler: latest
           bundler-cache: false
           working-directory: ${{ matrix.path }}
diff --git a/.github/workflows/release-request-weekly.yml b/.github/workflows/release-request-weekly.yml
@@ -14,7 +14,7 @@ jobs:
       pull-requests: write # required for creating release PRs
     if: ${{ github.repository == 'open-telemetry/opentelemetry-ruby-contrib' }}
     env:
-      ruby_version: "3.1"
+      ruby-version: "3.2"
     runs-on: ubuntu-latest
     steps:
       - name: Install Ruby ${{ env.ruby_version }}
diff --git a/.github/workflows/release-request.yml b/.github/workflows/release-request.yml
@@ -18,7 +18,7 @@ jobs:
       pull-requests: write # required for creating release PRs
     if: ${{ github.repository == 'open-telemetry/opentelemetry-ruby-contrib' }}
     env:
-      ruby_version: "3.1"
+      ruby-version: "3.2"
     runs-on: ubuntu-latest
     steps:
       - name: Install Ruby ${{ env.ruby_version }}
diff --git a/.github/workflows/release-retry.yml b/.github/workflows/release-retry.yml
@@ -21,7 +21,7 @@ jobs:
       pull-requests: write # required for creating release PRs
     if: ${{ github.repository == 'open-telemetry/opentelemetry-ruby-contrib' }}
     env:
-      ruby_version: "3.1"
+      ruby-version: "3.2"
     runs-on: ubuntu-latest
     steps:
       - name: Install Ruby ${{ env.ruby_version }}
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -1,7 +1,7 @@
 plugins: rubocop-performance
 
 AllCops:
-  TargetRubyVersion: '3.1'
+  TargetRubyVersion: '3.2'
   NewCops: enable
   Exclude:
     - Rakefile
diff --git a/instrumentation/action_mailer/Appraisals b/instrumentation/action_mailer/Appraisals
@@ -4,20 +4,12 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-%w[7.0.0 7.1.0].each do |version|
+%w[7.1.0 7.2.0].each do |version|
   appraise "action_mailer-#{version}" do
     gem 'rails', "~> #{version}"
   end
 end
 
-if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.1.0')
-  %w[7.2.0].each do |version|
-    appraise "action_mailer-#{version}" do
-      gem 'rails', "~> #{version}"
-    end
-  end
-
-  appraise 'action_mailer-latest' do
-    gem 'rails'
-  end
+appraise 'action_mailer-latest' do
+  gem 'rails'
 end
diff --git a/instrumentation/action_pack/Appraisals b/instrumentation/action_pack/Appraisals
@@ -4,20 +4,12 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-%w[7.0.0 7.1.0].each do |version|
+%w[7.1.0 7.2.0].each do |version|
   appraise "action_pack-#{version}" do
     gem 'rails', "~> #{version}"
   end
 end
 
-if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.1.0')
-  %w[7.2.0].each do |version|
-    appraise "action_pack-#{version}" do
-      gem 'rails', "~> #{version}"
-    end
-  end
-
-  appraise 'action_pack-latest' do
-    gem 'rails'
-  end
+appraise 'action_pack-latest' do
+  gem 'rails'
 end
diff --git a/instrumentation/action_view/Appraisals b/instrumentation/action_view/Appraisals
@@ -4,20 +4,12 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-%w[7.0.0 7.1.0].each do |version|
+%w[7.1.0 7.2.0].each do |version|
   appraise "action_view-#{version}" do
     gem 'rails', "~> #{version}"
   end
 end
 
-if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.1.0')
-  %w[7.2.0].each do |version|
-    appraise "action_view-#{version}" do
-      gem 'rails', "~> #{version}"
-    end
-  end
-
-  appraise 'action_view-latest' do
-    gem 'rails'
-  end
+appraise 'action_view-latest' do
+  gem 'rails'
 end
diff --git a/instrumentation/active_job/Appraisals b/instrumentation/active_job/Appraisals
@@ -4,20 +4,12 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-%w[7.0.0 7.1.0].each do |version|
+%w[7.1.0 7.2.0].each do |version|
   appraise "activejob-#{version}" do
     gem 'activejob', "~> #{version}"
   end
 end
 
-if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.1.0')
-  %w[7.2.0].each do |version|
-    appraise "activejob-#{version}" do
-      gem 'activejob', "~> #{version}"
-    end
-  end
-
-  appraise 'activejob-latest' do
-    gem 'activejob'
-  end
+appraise 'activejob-latest' do
+  gem 'activejob'
 end
diff --git a/instrumentation/active_record/Appraisals b/instrumentation/active_record/Appraisals
@@ -4,23 +4,14 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-%w[7.0.0 7.1.0].each do |version|
+%w[7.1.0 7.2.0].each do |version|
   appraise "activerecord-#{version}" do
     gem 'sqlite3', '~> 1.4'
     gem 'activerecord', "~> #{version}"
   end
 end
 
-if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.1.0')
-  %w[7.2.0].each do |version|
-    appraise "activerecord-#{version}" do
-      gem 'sqlite3', '~> 1.4'
-      gem 'activerecord', "~> #{version}"
-    end
-  end
-
-  appraise 'activerecord-latest' do
-    gem 'sqlite3', '>= 2.1'
-    gem 'activerecord'
-  end
+appraise 'activerecord-latest' do
+  gem 'sqlite3', '>= 2.1'
+  gem 'activerecord'
 end
diff --git a/instrumentation/active_storage/Appraisals b/instrumentation/active_storage/Appraisals
@@ -4,26 +4,16 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-%w[7.0.0 7.1.0].each do |version|
+%w[7.1.0 7.2.0].each do |version|
   appraise "activestorage-#{version}" do
     gem 'sqlite3', '~> 1.4'
     gem 'image_processing', '~> 1.2'
     gem 'rails', "~> #{version}"
   end
 end
 
-if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.1.0')
-  %w[7.2.0].each do |version|
-    appraise "activestorage-#{version}" do
-      gem 'sqlite3', '~> 1.4'
-      gem 'image_processing', '~> 1.2'
-      gem 'rails', "~> #{version}"
-    end
-  end
-
-  appraise 'activestorage-latest' do
-    gem 'sqlite3', '>= 2.1'
-    gem 'image_processing', '~> 1.2'
-    gem 'rails'
-  end
+appraise 'activestorage-latest' do
+  gem 'sqlite3', '>= 2.1'
+  gem 'image_processing', '~> 1.2'
+  gem 'rails'
 end
diff --git a/instrumentation/active_support/Appraisals b/instrumentation/active_support/Appraisals
@@ -4,20 +4,12 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-%w[7.0.0 7.1.0].each do |version|
+%w[7.1.0 7.2.0].each do |version|
   appraise "activesupport-#{version}" do
     gem 'activesupport', "~> #{version}"
   end
 end
 
-if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.1.0')
-  %w[7.2.0].each do |version|
-    appraise "activesupport-#{version}" do
-      gem 'activesupport', "~> #{version}"
-    end
-  end
-
-  appraise 'activesupport-latest' do
-    gem 'activesupport'
-  end
+appraise 'activesupport-latest' do
+  gem 'activesupport'
 end
diff --git a/instrumentation/delayed_job/Appraisals b/instrumentation/delayed_job/Appraisals
@@ -4,23 +4,14 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-%w[7.0.0 7.1.0].each do |version|
+%w[7.1.0 7.2.0].each do |version|
   appraise "delayed_job_4.1-activejob-#{version}" do
     gem 'delayed_job', '~> 4.1'
     gem 'activejob', "~> #{version}"
   end
 end
 
-if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.1.0')
-  %w[7.2.0].each do |version|
-    appraise "delayed_job-4.1-activejob-#{version}" do
-      gem 'delayed_job', '~> 4.1'
-      gem 'activejob', "~> #{version}"
-    end
-  end
-
-  appraise 'delayed_job-latest' do
-    gem 'delayed_job'
-    gem 'activejob'
-  end
+appraise 'delayed_job-latest' do
+  gem 'delayed_job'
+  gem 'activejob'
 end
diff --git a/instrumentation/que/Appraisals b/instrumentation/que/Appraisals
@@ -11,11 +11,7 @@ end
 
 appraise 'que-2.x' do
   gem 'que', '~> 2.4'
-  if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.1.0')
-    gem 'activerecord', '~> 7.2.0'
-  else
-    gem 'activerecord'
-  end
+  gem 'activerecord', '~> 7.2.0'
 end
 
 appraise 'que-latest' do
diff --git a/instrumentation/rails/Appraisals b/instrumentation/rails/Appraisals
@@ -4,20 +4,12 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-%w[7.0.0 7.1.0].each do |version|
+%w[7.1.0 7.2.0].each do |version|
   appraise "rails-#{version}" do
     gem 'rails', "~> #{version}"
   end
 end
 
-if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.1.0')
-  %w[7.2.0].each do |version|
-    appraise "rails-#{version}" do
-      gem 'rails', "~> #{version}"
-    end
-  end
-
-  appraise 'rails-latest' do
-    gem 'rails'
-  end
+appraise 'rails-latest' do
+  gem 'rails'
 end
