Merge branch 'main' into ruby-3.4

.github/workflows/ci-contrib.yml

@@ -49,12 +49,6 @@ jobs:
         with:
           gem: "opentelemetry-helpers-${{ matrix.gem }}"
           ruby: "3.1"
-      - name: "Test Ruby 3.0"
-        if: "${{ matrix.os == 'ubuntu-latest' }}"
-        uses: ./.github/actions/test_gem
-        with:
-          gem: "opentelemetry-helpers-${{ matrix.gem }}"
-          ruby: "3.0"
           yard: true
           rubocop: true
           build: true
@@ -99,12 +93,6 @@ jobs:
         with:
           gem: "opentelemetry-propagator-${{ matrix.gem }}"
           ruby: "3.1"
-      - name: "Test Ruby 3.0"
-        if: "${{ matrix.os == 'ubuntu-latest' }}"
-        uses: ./.github/actions/test_gem
-        with:
-          gem: "opentelemetry-propagator-${{ matrix.gem }}"
-          ruby: "3.0"
           yard: true
           rubocop: true
           build: true
@@ -149,15 +137,9 @@ jobs:
         with:
           gem: "opentelemetry-${{ matrix.gem }}"
           ruby: "3.1"
-      - name: "Test Ruby 3.0"
-        if: "${{ matrix.os == 'ubuntu-latest' }}"
-        uses: ./.github/actions/test_gem
-        with:
-          gem: "opentelemetry-${{ matrix.gem }}"
           yard: true
           rubocop: true
           build: true
-          ruby: "3.0"
       - name: "Test JRuby"
         if: "${{ matrix.os == 'ubuntu-latest' }}"
         uses: ./.github/actions/test_gem
@@ -197,12 +179,6 @@ jobs:
         with:
           gem:  "opentelemetry-processor-${{ matrix.gem }}"
           ruby: "3.1"
-      - name: "Test Ruby 3.0"
-        if: "${{ matrix.os == 'ubuntu-latest' }}"
-        uses: ./.github/actions/test_gem
-        with:
-          gem:  "opentelemetry-processor-${{ matrix.gem }}"
-          ruby: "3.0"
           yard: true
           rubocop: true
           build: true

.github/workflows/ci-instrumentation-with-services.yml

@@ -49,11 +49,6 @@ jobs:
         with:
           gem:  "opentelemetry-instrumentation-${{ matrix.gem }}"
           ruby: "3.1"
-      - name: "Test Ruby 3.0"
-        uses: ./.github/actions/test_gem
-        with:
-          gem:  "opentelemetry-instrumentation-${{ matrix.gem }}"
-          ruby: "3.0"
           yard: true
           rubocop: true
           build: true
@@ -105,11 +100,6 @@ jobs:
         with:
           gem:  "opentelemetry-instrumentation-${{ matrix.gem }}"
           ruby: "3.1"
-      - name: "Test Ruby 3.0"
-        uses: ./.github/actions/test_gem
-        with:
-          gem:  "opentelemetry-instrumentation-${{ matrix.gem }}"
-          ruby: "3.0"
           yard: true
           rubocop: true
           build: true
@@ -152,11 +142,6 @@ jobs:
         with:
           gem:  "opentelemetry-instrumentation-${{ matrix.gem }}"
           ruby: "3.1"
-      - name: "Test Ruby 3.0"
-        uses: ./.github/actions/test_gem
-        with:
-          gem:  "opentelemetry-instrumentation-${{ matrix.gem }}"
-          ruby: "3.0"
           yard: true
           rubocop: true
           build: true
@@ -215,11 +200,6 @@ jobs:
         with:
           gem:  "opentelemetry-instrumentation-${{ matrix.gem }}"
           ruby: "3.1"
-      - name: "Test Ruby 3.0"
-        uses: ./.github/actions/test_gem
-        with:
-          gem:  "opentelemetry-instrumentation-${{ matrix.gem }}"
-          ruby: "3.0"
           yard: true
           rubocop: true
           build: true
@@ -269,11 +249,6 @@ jobs:
         with:
           gem:  "opentelemetry-instrumentation-${{ matrix.gem }}"
           ruby: "3.1"
-      - name: "Test Ruby 3.0"
-        uses: ./.github/actions/test_gem
-        with:
-          gem:  "opentelemetry-instrumentation-${{ matrix.gem }}"
-          ruby: "3.0"
           yard: true
           rubocop: true
           build: true
@@ -320,11 +295,6 @@ jobs:
         with:
           gem:  "opentelemetry-instrumentation-${{ matrix.gem }}"
           ruby: "3.1"
-      - name: "Test Ruby 3.0"
-        uses: ./.github/actions/test_gem
-        with:
-          gem:  "opentelemetry-instrumentation-${{ matrix.gem }}"
-          ruby: "3.0"
           yard: true
           rubocop: true
           build: true

.github/workflows/ci-instrumentation.yml

@@ -79,12 +79,6 @@ jobs:
         with:
           gem:  "opentelemetry-instrumentation-${{ matrix.gem }}"
           ruby: "3.1"
-      - name: "Test Ruby 3.0"
-        if: "${{ matrix.os == 'ubuntu-latest' }}"
-        uses: ./.github/actions/test_gem
-        with:
-          gem:  "opentelemetry-instrumentation-${{ matrix.gem }}"
-          ruby: "3.0"
           yard: true
           rubocop: true
           build: true

.github/workflows/release-hook-on-closed.yml

@@ -8,7 +8,7 @@ jobs:
   release-process-request:
     if: ${{ github.repository == 'open-telemetry/opentelemetry-ruby-contrib' }}
     env:
-      ruby_version: "3.0"
+      ruby_version: "3.1"
     runs-on: ubuntu-latest
     steps:
       - name: Install Ruby ${{ env.ruby_version }}

.github/workflows/release-hook-on-push.yml

@@ -9,7 +9,7 @@ jobs:
   release-update-open-requests:
     if: ${{ github.repository == 'open-telemetry/opentelemetry-ruby-contrib' }}
     env:
-      ruby_version: "3.0"
+      ruby_version: "3.1"
     runs-on: ubuntu-latest
     steps:
       - name: Install Ruby ${{ env.ruby_version }}

.github/workflows/release-perform.yml

@@ -18,7 +18,7 @@ jobs:
   release-perform:
     if: ${{ github.repository == 'open-telemetry/opentelemetry-ruby-contrib' }}
     env:
-      ruby_version: "3.0"
+      ruby_version: "3.1"
     runs-on: ubuntu-latest
     steps:
       - name: Install Ruby ${{ env.ruby_version }}

.github/workflows/release-please.yaml

@@ -52,7 +52,7 @@ jobs:
 
       - uses: ruby/[email protected]
         with:
-          ruby-version: "3.0"
+          ruby-version: "3.1"
           bundler: latest
           bundler-cache: false
           working-directory: ${{ matrix.path }}

.github/workflows/release-request-weekly.yml

@@ -8,7 +8,7 @@ jobs:
   release-request:
     if: ${{ github.repository == 'open-telemetry/opentelemetry-ruby-contrib' }}
     env:
-      ruby_version: "3.0"
+      ruby_version: "3.1"
     runs-on: ubuntu-latest
     steps:
       - name: Install Ruby ${{ env.ruby_version }}

.github/workflows/release-request.yml

@@ -12,7 +12,7 @@ jobs:
   release-request:
     if: ${{ github.repository == 'open-telemetry/opentelemetry-ruby-contrib' }}
     env:
-      ruby_version: "3.0"
+      ruby_version: "3.1"
     runs-on: ubuntu-latest
     steps:
       - name: Install Ruby ${{ env.ruby_version }}

.github/workflows/release-retry.yml

@@ -15,7 +15,7 @@ jobs:
   release-retry:
     if: ${{ github.repository == 'open-telemetry/opentelemetry-ruby-contrib' }}
     env:
-      ruby_version: "3.0"
+      ruby_version: "3.1"
     runs-on: ubuntu-latest
     steps:
       - name: Install Ruby ${{ env.ruby_version }}

.instrumentation_generator/instrumentation_generator.rb

@@ -61,7 +61,7 @@ def add_to_instrumentation_all
     insert_into_file("#{instrumentation_all_path}/Gemfile", gemfile_text, after: "gemspec\n")
 
     gemspec_text = "\n  spec.add_dependency '#{instrumentation_gem_name}', '~> 0.0.0'"
-    insert_into_file("#{instrumentation_all_path}/opentelemetry-instrumentation-all.gemspec", gemspec_text, after: "spec.required_ruby_version = '>= 3.0'\n")
+    insert_into_file("#{instrumentation_all_path}/opentelemetry-instrumentation-all.gemspec", gemspec_text, after: "spec.required_ruby_version = '>= 3.1'\n")
 
     all_rb_text = "\nrequire '#{instrumentation_gem_name}'"
     insert_into_file("#{instrumentation_all_path}/lib/opentelemetry/instrumentation/all.rb", all_rb_text, after: "# SPDX-License-Identifier: Apache-2.0\n")

.instrumentation_generator/templates/gemspec.tt

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
                Dir.glob('*.md') +
                ['LICENSE', '.yardopts']
   spec.require_paths = ['lib']
-  spec.required_ruby_version = '>= 3.0'
+  spec.required_ruby_version = '>= 3.1'
 
   spec.add_dependency 'opentelemetry-api', '~> <%= opentelemetry_version %>'
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> <%= instrumentation_base_version %>'

.release-please-manifest.json

@@ -1,55 +1,55 @@
 {
-  "helpers/mysql": "0.1.1",
-  "helpers/sql-obfuscation": "0.2.0",
-  "instrumentation/action_mailer": "0.2.0",
-  "instrumentation/action_pack": "0.10.0",
-  "instrumentation/action_view": "0.7.3",
-  "instrumentation/active_job": "0.7.8",
-  "instrumentation/active_model_serializers": "0.20.2",
-  "instrumentation/active_record": "0.8.1",
-  "instrumentation/active_support": "0.6.0",
-  "instrumentation/all": "0.69.0",
-  "instrumentation/aws_lambda": "0.1.1",
-  "instrumentation/aws_sdk": "0.7.0",
-  "instrumentation/base": "0.22.6",
-  "instrumentation/bunny": "0.21.4",
-  "instrumentation/concurrent_ruby": "0.21.4",
-  "instrumentation/dalli": "0.25.4",
-  "instrumentation/delayed_job": "0.22.4",
-  "instrumentation/ethon": "0.21.8",
-  "instrumentation/excon": "0.22.4",
-  "instrumentation/faraday": "0.24.6",
-  "instrumentation/grape": "0.2.0",
-  "instrumentation/graphql": "0.28.4",
-  "instrumentation/gruf": "0.2.1",
-  "instrumentation/http": "0.23.4",
-  "instrumentation/http_client": "0.22.7",
-  "instrumentation/httpx": "0.1.2",
-  "instrumentation/koala": "0.20.5",
-  "instrumentation/lmdb": "0.22.3",
-  "instrumentation/mongo": "0.22.4",
-  "instrumentation/mysql2": "0.28.0",
-  "instrumentation/net_http": "0.22.7",
-  "instrumentation/pg": "0.29.0",
-  "instrumentation/que": "0.8.4",
-  "instrumentation/racecar": "0.3.4",
-  "instrumentation/rack": "0.25.0",
-  "instrumentation/rails": "0.33.0",
-  "instrumentation/rake": "0.2.2",
-  "instrumentation/rdkafka": "0.4.8",
-  "instrumentation/redis": "0.25.7",
-  "instrumentation/resque": "0.5.2",
-  "instrumentation/restclient": "0.22.7",
-  "instrumentation/rspec": "0.3.3",
-  "instrumentation/ruby_kafka": "0.21.3",
-  "instrumentation/sidekiq": "0.25.7",
-  "instrumentation/sinatra": "0.24.1",
-  "instrumentation/trilogy": "0.60.0",
-  "processor/baggage": "0.2.0",
-  "propagator/ottrace": "0.21.3",
-  "propagator/vitess": "0.1.0",
-  "propagator/xray": "0.22.2",
-  "resources/azure": "0.1.0",
-  "resources/container": "0.1.1",
-  "resources/google_cloud_platform": "0.1.0"
+  "helpers/mysql": "0.2.0",
+  "helpers/sql-obfuscation": "0.3.0",
+  "instrumentation/action_mailer": "0.4.0",
+  "instrumentation/action_pack": "0.11.0",
+  "instrumentation/action_view": "0.9.0",
+  "instrumentation/active_job": "0.8.0",
+  "instrumentation/active_model_serializers": "0.22.0",
+  "instrumentation/active_record": "0.9.0",
+  "instrumentation/active_support": "0.8.0",
+  "instrumentation/all": "0.72.0",
+  "instrumentation/aws_lambda": "0.2.0",
+  "instrumentation/aws_sdk": "0.8.0",
+  "instrumentation/base": "0.23.0",
+  "instrumentation/bunny": "0.22.0",
+  "instrumentation/concurrent_ruby": "0.22.0",
+  "instrumentation/dalli": "0.26.0",
+  "instrumentation/delayed_job": "0.23.0",
+  "instrumentation/ethon": "0.22.0",
+  "instrumentation/excon": "0.23.0",
+  "instrumentation/faraday": "0.26.0",
+  "instrumentation/grape": "0.3.0",
+  "instrumentation/graphql": "0.29.0",
+  "instrumentation/gruf": "0.3.0",
+  "instrumentation/http": "0.24.0",
+  "instrumentation/http_client": "0.23.0",
+  "instrumentation/httpx": "0.2.0",
+  "instrumentation/koala": "0.21.0",
+  "instrumentation/lmdb": "0.23.0",
+  "instrumentation/mongo": "0.23.0",
+  "instrumentation/mysql2": "0.29.0",
+  "instrumentation/net_http": "0.23.0",
+  "instrumentation/pg": "0.30.0",
+  "instrumentation/que": "0.9.0",
+  "instrumentation/racecar": "0.4.0",
+  "instrumentation/rack": "0.26.0",
+  "instrumentation/rails": "0.35.0",
+  "instrumentation/rake": "0.3.0",
+  "instrumentation/rdkafka": "0.5.0",
+  "instrumentation/redis": "0.26.0",
+  "instrumentation/resque": "0.6.0",
+  "instrumentation/restclient": "0.23.0",
+  "instrumentation/rspec": "0.4.0",
+  "instrumentation/ruby_kafka": "0.22.0",
+  "instrumentation/sidekiq": "0.26.0",
+  "instrumentation/sinatra": "0.25.0",
+  "instrumentation/trilogy": "0.61.0",
+  "processor/baggage": "0.3.0",
+  "propagator/ottrace": "0.22.0",
+  "propagator/vitess": "0.2.0",
+  "propagator/xray": "0.23.0",
+  "resources/azure": "0.2.0",
+  "resources/container": "0.2.0",
+  "resources/google_cloud_platform": "0.2.0"
 }

.rubocop.yml

@@ -1,7 +1,7 @@
 require: rubocop-performance
 
 AllCops:
-  TargetRubyVersion: '3.0'
+  TargetRubyVersion: '3.1'
   NewCops: enable
   Exclude:
     - Rakefile
@@ -38,6 +38,12 @@ Metrics/PerceivedComplexity:
 Naming/FileName:
   Exclude:
     - '**/opentelemetry-*'
+### TODO: Enable this is a separate PR
+Naming/BlockForwarding:
+  Enabled: false
+Style/ArgumentsForwarding:
+  Enabled: false
+#######################
 Style/Documentation:
   Exclude:
     - "**/test/**/*"

POST_INSTALL_MESSAGE

@@ -1,3 +0,0 @@
-Ruby 3.0 has reached EoL 2024-04-23. OTel Ruby Contrib gems will no longer accept new features or bug fixes for Ruby 3.0 after 2025-01-15. Please upgrade to Ruby 3.1 or higher to continue receiving updates.
-
-Rails 6.1 has reached EoL 2024-10-01. OTel Ruby Contrib gems will no longer accept new features or bug fixes for Rails 6.1 after 2025-01-15. Please upgrade to Rails 7.0 or higher to continue receiving updates.

README.md

@@ -75,7 +75,9 @@ This repository also contains libraries to aid with interoperability with vendor
 
 OpenTelemetry Ruby follows the [versioning and stability document][otel-versioning] in the OpenTelemetry specification. Notably, we adhere to the outlined version numbering exception, which states that experimental signals may have a `0.x` version number.
 
-### Library Compatibility
+### Ruby and Library Compatibility
+
+All libraries in this repository require Ruby Versions 3.1 or newer.
 
 This project is managed on a volunteer basis and therefore we have limited capacity to support compatibility with unmaintained or EOL libraries.
 

helpers/mysql/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Release History: opentelemetry-helpers-mysql
 
+### v0.2.0 / 2025-01-16
+
+* BREAKING CHANGE: Set minimum supported version to Ruby 3.1
+
+* ADDED: Set minimum supported version to Ruby 3.1
+
 ### v0.1.2 / 2024-11-26
 
 * (No significant changes)

helpers/mysql/lib/opentelemetry/helpers/mysql/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Helpers
     module MySQL
-      VERSION = '0.1.2'
+      VERSION = '0.2.0'
     end
   end
 end

helpers/mysql/opentelemetry-helpers-mysql.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
                Dir.glob('*.md') +
                ['LICENSE', '.yardopts']
   spec.require_paths = ['lib']
-  spec.required_ruby_version = '>= 3.0'
+  spec.required_ruby_version = '>= 3.1'
 
   spec.add_dependency 'opentelemetry-api', '~> 1.0'
   spec.add_dependency 'opentelemetry-common', '~> 0.21'