diff --git a/.github/actions/test_gem/action.yml b/.github/actions/test_gem/action.yml index 009270fd81..ccfcdb4d33 100644 --- a/.github/actions/test_gem/action.yml +++ b/.github/actions/test_gem/action.yml @@ -58,21 +58,21 @@ runs: # ...but not for appraisals, sadly. - name: Install Ruby ${{ inputs.ruby }} with dependencies if: "${{ steps.setup.outputs.appraisals == 'false' }}" - uses: ruby/setup-ruby@v1.190.0 + uses: ruby/setup-ruby@v1.215.0 with: ruby-version: "${{ inputs.ruby }}" working-directory: "${{ steps.setup.outputs.gem_dir }}" - bundler: "2.5.17" + bundler: "latest" bundler-cache: true cache-version: "v1-${{ 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.190.0 + uses: ruby/setup-ruby@v1.215.0 with: ruby-version: "${{ inputs.ruby }}" - bundler: "2.5.17" + bundler: "latest" working-directory: "${{ steps.setup.outputs.gem_dir }}" - name: Install dependencies and generate appraisals if: "${{ steps.setup.outputs.appraisals == 'true' }}" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e5b4956795..287d92e389 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -54,12 +54,6 @@ jobs: with: gem: "${{ matrix.gem }}" ruby: "3.1" - - name: "Test Ruby 3.0" - if: "${{ matrix.os == 'ubuntu-latest' }}" - uses: ./.github/actions/test_gem - with: - gem: "${{ matrix.gem }}" - ruby: "3.0" yard: true rubocop: true build: true @@ -119,12 +113,6 @@ jobs: with: gem: "${{ matrix.gem }}" ruby: "3.1" - - name: "Test Ruby 3.0" - if: "${{ matrix.os == 'ubuntu-latest' }}" - uses: ./.github/actions/test_gem - with: - gem: "${{ matrix.gem }}" - ruby: "3.0" yard: true rubocop: true build: true @@ -193,12 +181,6 @@ jobs: with: gem: "${{ matrix.gem }}" ruby: "3.1" - - name: "Test Ruby 3.0" - if: "${{ matrix.os == 'ubuntu-latest' }}" - uses: ./.github/actions/test_gem - with: - gem: "${{ matrix.gem }}" - ruby: "3.0" yard: true rubocop: true build: true diff --git a/.github/workflows/release-hook-on-closed.yml b/.github/workflows/release-hook-on-closed.yml index 9b125d3f3f..9cf2ef3d60 100644 --- a/.github/workflows/release-hook-on-closed.yml +++ b/.github/workflows/release-hook-on-closed.yml @@ -8,11 +8,11 @@ jobs: release-process-request: if: ${{ github.repository == 'open-telemetry/opentelemetry-ruby' }} env: - ruby_version: "3.0" + ruby_version: "3.1" runs-on: ubuntu-latest steps: - name: Install Ruby ${{ env.ruby_version }} - uses: ruby/setup-ruby@v1.190.0 + uses: ruby/setup-ruby@v1.215.0 with: ruby-version: ${{ env.ruby_version }} - name: Checkout repo diff --git a/.github/workflows/release-hook-on-push.yml b/.github/workflows/release-hook-on-push.yml index 5afad6cdc3..11569a4236 100644 --- a/.github/workflows/release-hook-on-push.yml +++ b/.github/workflows/release-hook-on-push.yml @@ -9,11 +9,11 @@ jobs: release-update-open-requests: if: ${{ github.repository == 'open-telemetry/opentelemetry-ruby' }} env: - ruby_version: "3.0" + ruby_version: "3.1" runs-on: ubuntu-latest steps: - name: Install Ruby ${{ env.ruby_version }} - uses: ruby/setup-ruby@v1.190.0 + uses: ruby/setup-ruby@v1.215.0 with: ruby-version: ${{ env.ruby_version }} - name: Checkout repo diff --git a/.github/workflows/release-perform.yml b/.github/workflows/release-perform.yml index a4ac5d06b5..e660500519 100644 --- a/.github/workflows/release-perform.yml +++ b/.github/workflows/release-perform.yml @@ -18,11 +18,11 @@ jobs: release-perform: if: ${{ github.repository == 'open-telemetry/opentelemetry-ruby' }} env: - ruby_version: "3.0" + ruby_version: "3.1" runs-on: ubuntu-latest steps: - name: Install Ruby ${{ env.ruby_version }} - uses: ruby/setup-ruby@v1.190.0 + uses: ruby/setup-ruby@v1.215.0 with: ruby-version: ${{ env.ruby_version }} - name: Checkout repo diff --git a/.github/workflows/release-request-weekly.yml b/.github/workflows/release-request-weekly.yml index 20a80a562d..eac3f92d13 100644 --- a/.github/workflows/release-request-weekly.yml +++ b/.github/workflows/release-request-weekly.yml @@ -8,11 +8,11 @@ jobs: release-request: if: ${{ github.repository == 'open-telemetry/opentelemetry-ruby' }} env: - ruby_version: "3.0" + ruby_version: "3.1" runs-on: ubuntu-latest steps: - name: Install Ruby ${{ env.ruby_version }} - uses: ruby/setup-ruby@v1.190.0 + uses: ruby/setup-ruby@v1.215.0 with: ruby-version: ${{ env.ruby_version }} - name: Checkout repo diff --git a/.github/workflows/release-request.yml b/.github/workflows/release-request.yml index 1b7d21f60f..69d147f96b 100644 --- a/.github/workflows/release-request.yml +++ b/.github/workflows/release-request.yml @@ -12,11 +12,11 @@ jobs: release-request: if: ${{ github.repository == 'open-telemetry/opentelemetry-ruby' }} env: - ruby_version: "3.0" + ruby_version: "3.1" runs-on: ubuntu-latest steps: - name: Install Ruby ${{ env.ruby_version }} - uses: ruby/setup-ruby@v1.190.0 + uses: ruby/setup-ruby@v1.215.0 with: ruby-version: ${{ env.ruby_version }} - name: Checkout repo diff --git a/.github/workflows/release-retry.yml b/.github/workflows/release-retry.yml index 1e67aed366..2fb9fc527e 100644 --- a/.github/workflows/release-retry.yml +++ b/.github/workflows/release-retry.yml @@ -15,11 +15,11 @@ jobs: release-retry: if: ${{ github.repository == 'open-telemetry/opentelemetry-ruby' }} env: - ruby_version: "3.0" + ruby_version: "3.1" runs-on: ubuntu-latest steps: - name: Install Ruby ${{ env.ruby_version }} - uses: ruby/setup-ruby@v1.190.0 + uses: ruby/setup-ruby@v1.215.0 with: ruby-version: ${{ env.ruby_version }} - name: Checkout repo diff --git a/Dockerfile b/Dockerfile index 1585415294..e08269d1a0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # Configuration for Ruby base image -ARG ALPINE_VERSION=3.13 -ARG RUBY_VERSION=3.0.0 +ARG ALPINE_VERSION=3.21 +ARG RUBY_VERSION=3.1.6 FROM ruby:"${RUBY_VERSION}-alpine${ALPINE_VERSION}" as ruby diff --git a/api/opentelemetry-api.gemspec b/api/opentelemetry-api.gemspec index f18bfeec02..50681eb1f4 100644 --- a/api/opentelemetry-api.gemspec +++ b/api/opentelemetry-api.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_development_dependency 'benchmark-ipsa', '~> 0.2.0' spec.add_development_dependency 'bundler', '>= 1.17' diff --git a/common/opentelemetry-common.gemspec b/common/opentelemetry-common.gemspec index fbc2837d16..173c68539c 100644 --- a/common/opentelemetry-common.gemspec +++ b/common/opentelemetry-common.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' diff --git a/contrib/rubocop.yml b/contrib/rubocop.yml index a8a17bd710..f77c78bde1 100644 --- a/contrib/rubocop.yml +++ b/contrib/rubocop.yml @@ -1,7 +1,7 @@ AllCops: NewCops: disable SuggestExtensions: false - TargetRubyVersion: "3.0" + TargetRubyVersion: "3.1" Exclude: - "vendor/**/*" diff --git a/exporter/jaeger/opentelemetry-exporter-jaeger.gemspec b/exporter/jaeger/opentelemetry-exporter-jaeger.gemspec index 6b043a91f4..c62579c115 100644 --- a/exporter/jaeger/opentelemetry-exporter-jaeger.gemspec +++ b/exporter/jaeger/opentelemetry-exporter-jaeger.gemspec @@ -24,7 +24,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.1' spec.add_dependency 'opentelemetry-common', '~> 0.20' diff --git a/exporter/otlp-common/opentelemetry-exporter-otlp-common.gemspec b/exporter/otlp-common/opentelemetry-exporter-otlp-common.gemspec index 23ac0dd50a..b1acd6b82f 100644 --- a/exporter/otlp-common/opentelemetry-exporter-otlp-common.gemspec +++ b/exporter/otlp-common/opentelemetry-exporter-otlp-common.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 'googleapis-common-protos-types', '~> 1.3' spec.add_dependency 'google-protobuf', '~> 3.19' diff --git a/exporter/otlp-grpc/opentelemetry-exporter-otlp-grpc.gemspec b/exporter/otlp-grpc/opentelemetry-exporter-otlp-grpc.gemspec index 0a1c789cf4..24f86773df 100644 --- a/exporter/otlp-grpc/opentelemetry-exporter-otlp-grpc.gemspec +++ b/exporter/otlp-grpc/opentelemetry-exporter-otlp-grpc.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 'grpc' spec.add_dependency 'opentelemetry-api', '~> 1.1' diff --git a/exporter/otlp-http/opentelemetry-exporter-otlp-http.gemspec b/exporter/otlp-http/opentelemetry-exporter-otlp-http.gemspec index 7d12b22337..d6f658f79e 100644 --- a/exporter/otlp-http/opentelemetry-exporter-otlp-http.gemspec +++ b/exporter/otlp-http/opentelemetry-exporter-otlp-http.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.1' spec.add_dependency 'opentelemetry-common', '~> 0.20' diff --git a/exporter/otlp-logs/opentelemetry-exporter-otlp-logs.gemspec b/exporter/otlp-logs/opentelemetry-exporter-otlp-logs.gemspec index d1c69fceec..7242e474a6 100644 --- a/exporter/otlp-logs/opentelemetry-exporter-otlp-logs.gemspec +++ b/exporter/otlp-logs/opentelemetry-exporter-otlp-logs.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 'googleapis-common-protos-types', '~> 1.3' spec.add_dependency 'google-protobuf', '>= 3.18' diff --git a/exporter/otlp-metrics/opentelemetry-exporter-otlp-metrics.gemspec b/exporter/otlp-metrics/opentelemetry-exporter-otlp-metrics.gemspec index bbcd01844a..9fb222a594 100644 --- a/exporter/otlp-metrics/opentelemetry-exporter-otlp-metrics.gemspec +++ b/exporter/otlp-metrics/opentelemetry-exporter-otlp-metrics.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 'googleapis-common-protos-types', '~> 1.3' spec.add_dependency 'google-protobuf', '>= 3.18', '< 5.0' diff --git a/exporter/otlp/opentelemetry-exporter-otlp.gemspec b/exporter/otlp/opentelemetry-exporter-otlp.gemspec index 0371621bbd..5f871ad926 100644 --- a/exporter/otlp/opentelemetry-exporter-otlp.gemspec +++ b/exporter/otlp/opentelemetry-exporter-otlp.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 'googleapis-common-protos-types', '~> 1.3' spec.add_dependency 'google-protobuf', '>= 3.18' diff --git a/exporter/zipkin/opentelemetry-exporter-zipkin.gemspec b/exporter/zipkin/opentelemetry-exporter-zipkin.gemspec index 40d86cde57..efe07ca7b1 100644 --- a/exporter/zipkin/opentelemetry-exporter-zipkin.gemspec +++ b/exporter/zipkin/opentelemetry-exporter-zipkin.gemspec @@ -24,7 +24,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 'csv', '~> 3.1' spec.add_dependency 'opentelemetry-api', '~> 1.1' diff --git a/logs_api/opentelemetry-logs-api.gemspec b/logs_api/opentelemetry-logs-api.gemspec index 0426ff8759..adb8adeaa9 100644 --- a/logs_api/opentelemetry-logs-api.gemspec +++ b/logs_api/opentelemetry-logs-api.gemspec @@ -22,7 +22,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' diff --git a/logs_sdk/opentelemetry-logs-sdk.gemspec b/logs_sdk/opentelemetry-logs-sdk.gemspec index 766cf6be5d..cfd6fc108c 100644 --- a/logs_sdk/opentelemetry-logs-sdk.gemspec +++ b/logs_sdk/opentelemetry-logs-sdk.gemspec @@ -22,7 +22,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.2' spec.add_dependency 'opentelemetry-logs-api', '~> 0.1' diff --git a/metrics_api/opentelemetry-metrics-api.gemspec b/metrics_api/opentelemetry-metrics-api.gemspec index ea541bc429..26a587f9f0 100644 --- a/metrics_api/opentelemetry-metrics-api.gemspec +++ b/metrics_api/opentelemetry-metrics-api.gemspec @@ -22,7 +22,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' diff --git a/metrics_sdk/opentelemetry-metrics-sdk.gemspec b/metrics_sdk/opentelemetry-metrics-sdk.gemspec index 3de7a61519..f725a4fad6 100644 --- a/metrics_sdk/opentelemetry-metrics-sdk.gemspec +++ b/metrics_sdk/opentelemetry-metrics-sdk.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.1' spec.add_dependency 'opentelemetry-metrics-api', '~> 0.2' diff --git a/propagator/b3/opentelemetry-propagator-b3.gemspec b/propagator/b3/opentelemetry-propagator-b3.gemspec index 3a75351735..c8869dc4bd 100644 --- a/propagator/b3/opentelemetry-propagator-b3.gemspec +++ b/propagator/b3/opentelemetry-propagator-b3.gemspec @@ -24,7 +24,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.1' diff --git a/propagator/jaeger/opentelemetry-propagator-jaeger.gemspec b/propagator/jaeger/opentelemetry-propagator-jaeger.gemspec index 4016ede97d..d666ab8fa2 100644 --- a/propagator/jaeger/opentelemetry-propagator-jaeger.gemspec +++ b/propagator/jaeger/opentelemetry-propagator-jaeger.gemspec @@ -24,7 +24,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.1' diff --git a/registry/opentelemetry-registry.gemspec b/registry/opentelemetry-registry.gemspec index 9b9371e736..cf40034098 100644 --- a/registry/opentelemetry-registry.gemspec +++ b/registry/opentelemetry-registry.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.1' diff --git a/sdk/opentelemetry-sdk.gemspec b/sdk/opentelemetry-sdk.gemspec index decb49270f..66bf706505 100644 --- a/sdk/opentelemetry-sdk.gemspec +++ b/sdk/opentelemetry-sdk.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.1' spec.add_dependency 'opentelemetry-common', '~> 0.20' diff --git a/sdk_experimental/opentelemetry-sdk-experimental.gemspec b/sdk_experimental/opentelemetry-sdk-experimental.gemspec index 647d71ee2e..7ca4d5ad6a 100644 --- a/sdk_experimental/opentelemetry-sdk-experimental.gemspec +++ b/sdk_experimental/opentelemetry-sdk-experimental.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.1' spec.add_dependency 'opentelemetry-sdk', '~> 1.2' diff --git a/semantic_conventions/opentelemetry-semantic_conventions.gemspec b/semantic_conventions/opentelemetry-semantic_conventions.gemspec index 2eae221991..556a3673a2 100644 --- a/semantic_conventions/opentelemetry-semantic_conventions.gemspec +++ b/semantic_conventions/opentelemetry-semantic_conventions.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' diff --git a/test_helpers/opentelemetry-test-helpers.gemspec b/test_helpers/opentelemetry-test-helpers.gemspec index faab90233b..aa98fb8102 100644 --- a/test_helpers/opentelemetry-test-helpers.gemspec +++ b/test_helpers/opentelemetry-test-helpers.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_development_dependency 'bundler', '>= 1.17' spec.add_development_dependency 'minitest', '~> 5.0'