Skip to content

Commit 59d1bf8

Browse files
arielvalentinkaylareopelle
arielvalentin
and
kaylareopelle
authored
feat: Suppport 3.1 Min Version (#1802)
Co-authored-by: Kayla Reopelle <87386821+kaylareopelle@users.noreply.github.com>
1 parent 0bee6a3 commit 59d1bf8

31 files changed

+40
-58
lines changed

‎.github/actions/test_gem/action.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -58,21 +58,21 @@ runs:
5858
# ...but not for appraisals, sadly.
5959
- name: Install Ruby ${{ inputs.ruby }} with dependencies
6060
if: "${{ steps.setup.outputs.appraisals == 'false' }}"
61-
uses: ruby/setup-ruby@v1.190.0
61+
uses: ruby/setup-ruby@v1.215.0
6262
with:
6363
ruby-version: "${{ inputs.ruby }}"
6464
working-directory: "${{ steps.setup.outputs.gem_dir }}"
65-
bundler: "2.5.17"
65+
bundler: "latest"
6666
bundler-cache: true
6767
cache-version: "v1-${{ steps.setup.outputs.cache_key }}"
6868

6969
# If we're using appraisals, do it all manually.
7070
- name: Install Ruby ${{ inputs.ruby }} without dependencies
7171
if: "${{ steps.setup.outputs.appraisals == 'true' }}"
72-
uses: ruby/setup-ruby@v1.190.0
72+
uses: ruby/setup-ruby@v1.215.0
7373
with:
7474
ruby-version: "${{ inputs.ruby }}"
75-
bundler: "2.5.17"
75+
bundler: "latest"
7676
working-directory: "${{ steps.setup.outputs.gem_dir }}"
7777
- name: Install dependencies and generate appraisals
7878
if: "${{ steps.setup.outputs.appraisals == 'true' }}"

‎.github/workflows/ci.yml

-18
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,6 @@ jobs:
5454
with:
5555
gem: "${{ matrix.gem }}"
5656
ruby: "3.1"
57-
- name: "Test Ruby 3.0"
58-
if: "${{ matrix.os == 'ubuntu-latest' }}"
59-
uses: ./.github/actions/test_gem
60-
with:
61-
gem: "${{ matrix.gem }}"
62-
ruby: "3.0"
6357
yard: true
6458
rubocop: true
6559
build: true
@@ -119,12 +113,6 @@ jobs:
119113
with:
120114
gem: "${{ matrix.gem }}"
121115
ruby: "3.1"
122-
- name: "Test Ruby 3.0"
123-
if: "${{ matrix.os == 'ubuntu-latest' }}"
124-
uses: ./.github/actions/test_gem
125-
with:
126-
gem: "${{ matrix.gem }}"
127-
ruby: "3.0"
128116
yard: true
129117
rubocop: true
130118
build: true
@@ -193,12 +181,6 @@ jobs:
193181
with:
194182
gem: "${{ matrix.gem }}"
195183
ruby: "3.1"
196-
- name: "Test Ruby 3.0"
197-
if: "${{ matrix.os == 'ubuntu-latest' }}"
198-
uses: ./.github/actions/test_gem
199-
with:
200-
gem: "${{ matrix.gem }}"
201-
ruby: "3.0"
202184
yard: true
203185
rubocop: true
204186
build: true

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ jobs:
88
release-process-request:
99
if: ${{ github.repository == 'open-telemetry/opentelemetry-ruby' }}
1010
env:
11-
ruby_version: "3.0"
11+
ruby_version: "3.1"
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Install Ruby ${{ env.ruby_version }}
15-
uses: ruby/setup-ruby@v1.190.0
15+
uses: ruby/setup-ruby@v1.215.0
1616
with:
1717
ruby-version: ${{ env.ruby_version }}
1818
- name: Checkout repo

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ jobs:
99
release-update-open-requests:
1010
if: ${{ github.repository == 'open-telemetry/opentelemetry-ruby' }}
1111
env:
12-
ruby_version: "3.0"
12+
ruby_version: "3.1"
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Install Ruby ${{ env.ruby_version }}
16-
uses: ruby/setup-ruby@v1.190.0
16+
uses: ruby/setup-ruby@v1.215.0
1717
with:
1818
ruby-version: ${{ env.ruby_version }}
1919
- name: Checkout repo

‎.github/workflows/release-perform.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ jobs:
1818
release-perform:
1919
if: ${{ github.repository == 'open-telemetry/opentelemetry-ruby' }}
2020
env:
21-
ruby_version: "3.0"
21+
ruby_version: "3.1"
2222
runs-on: ubuntu-latest
2323
steps:
2424
- name: Install Ruby ${{ env.ruby_version }}
25-
uses: ruby/setup-ruby@v1.190.0
25+
uses: ruby/setup-ruby@v1.215.0
2626
with:
2727
ruby-version: ${{ env.ruby_version }}
2828
- name: Checkout repo

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ jobs:
88
release-request:
99
if: ${{ github.repository == 'open-telemetry/opentelemetry-ruby' }}
1010
env:
11-
ruby_version: "3.0"
11+
ruby_version: "3.1"
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Install Ruby ${{ env.ruby_version }}
15-
uses: ruby/setup-ruby@v1.190.0
15+
uses: ruby/setup-ruby@v1.215.0
1616
with:
1717
ruby-version: ${{ env.ruby_version }}
1818
- name: Checkout repo

‎.github/workflows/release-request.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ jobs:
1212
release-request:
1313
if: ${{ github.repository == 'open-telemetry/opentelemetry-ruby' }}
1414
env:
15-
ruby_version: "3.0"
15+
ruby_version: "3.1"
1616
runs-on: ubuntu-latest
1717
steps:
1818
- name: Install Ruby ${{ env.ruby_version }}
19-
uses: ruby/setup-ruby@v1.190.0
19+
uses: ruby/setup-ruby@v1.215.0
2020
with:
2121
ruby-version: ${{ env.ruby_version }}
2222
- name: Checkout repo

‎.github/workflows/release-retry.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ jobs:
1515
release-retry:
1616
if: ${{ github.repository == 'open-telemetry/opentelemetry-ruby' }}
1717
env:
18-
ruby_version: "3.0"
18+
ruby_version: "3.1"
1919
runs-on: ubuntu-latest
2020
steps:
2121
- name: Install Ruby ${{ env.ruby_version }}
22-
uses: ruby/setup-ruby@v1.190.0
22+
uses: ruby/setup-ruby@v1.215.0
2323
with:
2424
ruby-version: ${{ env.ruby_version }}
2525
- name: Checkout repo

‎Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Configuration for Ruby base image
2-
ARG ALPINE_VERSION=3.13
3-
ARG RUBY_VERSION=3.0.0
2+
ARG ALPINE_VERSION=3.21
3+
ARG RUBY_VERSION=3.1.6
44

55
FROM ruby:"${RUBY_VERSION}-alpine${ALPINE_VERSION}" as ruby
66

‎api/opentelemetry-api.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
2323
::Dir.glob('*.md') +
2424
['LICENSE', '.yardopts']
2525
spec.require_paths = ['lib']
26-
spec.required_ruby_version = '>= 3.0'
26+
spec.required_ruby_version = '>= 3.1'
2727

2828
spec.add_development_dependency 'benchmark-ipsa', '~> 0.2.0'
2929
spec.add_development_dependency 'bundler', '>= 1.17'

‎common/opentelemetry-common.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
2323
::Dir.glob('*.md') +
2424
['LICENSE', '.yardopts']
2525
spec.require_paths = ['lib']
26-
spec.required_ruby_version = '>= 3.0'
26+
spec.required_ruby_version = '>= 3.1'
2727

2828
spec.add_dependency 'opentelemetry-api', '~> 1.0'
2929

‎contrib/rubocop.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
AllCops:
22
NewCops: disable
33
SuggestExtensions: false
4-
TargetRubyVersion: "3.0"
4+
TargetRubyVersion: "3.1"
55
Exclude:
66
- "vendor/**/*"
77

‎exporter/jaeger/opentelemetry-exporter-jaeger.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
2424
::Dir.glob('*.md') +
2525
['LICENSE', '.yardopts']
2626
spec.require_paths = ['lib']
27-
spec.required_ruby_version = '>= 3.0'
27+
spec.required_ruby_version = '>= 3.1'
2828

2929
spec.add_dependency 'opentelemetry-api', '~> 1.1'
3030
spec.add_dependency 'opentelemetry-common', '~> 0.20'

‎exporter/otlp-common/opentelemetry-exporter-otlp-common.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
2323
::Dir.glob('*.md') +
2424
['LICENSE', '.yardopts']
2525
spec.require_paths = ['lib']
26-
spec.required_ruby_version = '>= 3.0'
26+
spec.required_ruby_version = '>= 3.1'
2727

2828
spec.add_dependency 'googleapis-common-protos-types', '~> 1.3'
2929
spec.add_dependency 'google-protobuf', '~> 3.19'

‎exporter/otlp-grpc/opentelemetry-exporter-otlp-grpc.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
2323
::Dir.glob('*.md') +
2424
['LICENSE', '.yardopts']
2525
spec.require_paths = ['lib']
26-
spec.required_ruby_version = '>= 3.0'
26+
spec.required_ruby_version = '>= 3.1'
2727

2828
spec.add_dependency 'grpc'
2929
spec.add_dependency 'opentelemetry-api', '~> 1.1'

‎exporter/otlp-http/opentelemetry-exporter-otlp-http.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
2323
::Dir.glob('*.md') +
2424
['LICENSE', '.yardopts']
2525
spec.require_paths = ['lib']
26-
spec.required_ruby_version = '>= 3.0'
26+
spec.required_ruby_version = '>= 3.1'
2727

2828
spec.add_dependency 'opentelemetry-api', '~> 1.1'
2929
spec.add_dependency 'opentelemetry-common', '~> 0.20'

‎exporter/otlp-logs/opentelemetry-exporter-otlp-logs.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
2323
::Dir.glob('*.md') +
2424
['LICENSE', '.yardopts']
2525
spec.require_paths = ['lib']
26-
spec.required_ruby_version = '>= 3.0'
26+
spec.required_ruby_version = '>= 3.1'
2727

2828
spec.add_dependency 'googleapis-common-protos-types', '~> 1.3'
2929
spec.add_dependency 'google-protobuf', '>= 3.18'

‎exporter/otlp-metrics/opentelemetry-exporter-otlp-metrics.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
2323
::Dir.glob('*.md') +
2424
['LICENSE', '.yardopts']
2525
spec.require_paths = ['lib']
26-
spec.required_ruby_version = '>= 3.0'
26+
spec.required_ruby_version = '>= 3.1'
2727

2828
spec.add_dependency 'googleapis-common-protos-types', '~> 1.3'
2929
spec.add_dependency 'google-protobuf', '>= 3.18', '< 5.0'

‎exporter/otlp/opentelemetry-exporter-otlp.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
2323
::Dir.glob('*.md') +
2424
['LICENSE', '.yardopts']
2525
spec.require_paths = ['lib']
26-
spec.required_ruby_version = '>= 3.0'
26+
spec.required_ruby_version = '>= 3.1'
2727

2828
spec.add_dependency 'googleapis-common-protos-types', '~> 1.3'
2929
spec.add_dependency 'google-protobuf', '>= 3.18'

‎exporter/zipkin/opentelemetry-exporter-zipkin.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
2424
::Dir.glob('*.md') +
2525
['LICENSE', '.yardopts']
2626
spec.require_paths = ['lib']
27-
spec.required_ruby_version = '>= 3.0'
27+
spec.required_ruby_version = '>= 3.1'
2828

2929
spec.add_dependency 'csv', '~> 3.1'
3030
spec.add_dependency 'opentelemetry-api', '~> 1.1'

‎logs_api/opentelemetry-logs-api.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
2222
Dir.glob('*.md') +
2323
['LICENSE', '.yardopts']
2424
spec.require_paths = ['lib']
25-
spec.required_ruby_version = '>= 3.0'
25+
spec.required_ruby_version = '>= 3.1'
2626

2727
spec.add_dependency 'opentelemetry-api', '~> 1.0'
2828

‎logs_sdk/opentelemetry-logs-sdk.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
2222
::Dir.glob('*.md') +
2323
['LICENSE', '.yardopts']
2424
spec.require_paths = ['lib']
25-
spec.required_ruby_version = '>= 3.0'
25+
spec.required_ruby_version = '>= 3.1'
2626

2727
spec.add_dependency 'opentelemetry-api', '~> 1.2'
2828
spec.add_dependency 'opentelemetry-logs-api', '~> 0.1'

‎metrics_api/opentelemetry-metrics-api.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
2222
::Dir.glob('*.md') +
2323
['LICENSE', '.yardopts']
2424
spec.require_paths = ['lib']
25-
spec.required_ruby_version = '>= 3.0'
25+
spec.required_ruby_version = '>= 3.1'
2626

2727
spec.add_dependency 'opentelemetry-api', '~> 1.0'
2828

‎metrics_sdk/opentelemetry-metrics-sdk.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
2323
::Dir.glob('*.md') +
2424
['LICENSE', '.yardopts']
2525
spec.require_paths = ['lib']
26-
spec.required_ruby_version = '>= 3.0'
26+
spec.required_ruby_version = '>= 3.1'
2727

2828
spec.add_dependency 'opentelemetry-api', '~> 1.1'
2929
spec.add_dependency 'opentelemetry-metrics-api', '~> 0.2'

‎propagator/b3/opentelemetry-propagator-b3.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
2424
::Dir.glob('*.md') +
2525
['LICENSE', '.yardopts']
2626
spec.require_paths = ['lib']
27-
spec.required_ruby_version = '>= 3.0'
27+
spec.required_ruby_version = '>= 3.1'
2828

2929
spec.add_dependency 'opentelemetry-api', '~> 1.1'
3030

‎propagator/jaeger/opentelemetry-propagator-jaeger.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
2424
::Dir.glob('*.md') +
2525
['LICENSE', '.yardopts']
2626
spec.require_paths = ['lib']
27-
spec.required_ruby_version = '>= 3.0'
27+
spec.required_ruby_version = '>= 3.1'
2828

2929
spec.add_dependency 'opentelemetry-api', '~> 1.1'
3030

‎registry/opentelemetry-registry.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
2323
::Dir.glob('*.md') +
2424
['LICENSE', '.yardopts']
2525
spec.require_paths = ['lib']
26-
spec.required_ruby_version = '>= 3.0'
26+
spec.required_ruby_version = '>= 3.1'
2727

2828
spec.add_dependency 'opentelemetry-api', '~> 1.1'
2929

‎sdk/opentelemetry-sdk.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
2323
::Dir.glob('*.md') +
2424
['LICENSE', '.yardopts']
2525
spec.require_paths = ['lib']
26-
spec.required_ruby_version = '>= 3.0'
26+
spec.required_ruby_version = '>= 3.1'
2727

2828
spec.add_dependency 'opentelemetry-api', '~> 1.1'
2929
spec.add_dependency 'opentelemetry-common', '~> 0.20'

‎sdk_experimental/opentelemetry-sdk-experimental.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
2323
::Dir.glob('*.md') +
2424
['LICENSE', '.yardopts']
2525
spec.require_paths = ['lib']
26-
spec.required_ruby_version = '>= 3.0'
26+
spec.required_ruby_version = '>= 3.1'
2727

2828
spec.add_dependency 'opentelemetry-api', '~> 1.1'
2929
spec.add_dependency 'opentelemetry-sdk', '~> 1.2'

‎semantic_conventions/opentelemetry-semantic_conventions.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
2323
Dir.glob('*.md') +
2424
['LICENSE', '.yardopts']
2525
spec.require_paths = ['lib']
26-
spec.required_ruby_version = '>= 3.0'
26+
spec.required_ruby_version = '>= 3.1'
2727

2828
spec.add_dependency 'opentelemetry-api', '~> 1.0'
2929

‎test_helpers/opentelemetry-test-helpers.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
2323
Dir.glob('*.md') +
2424
['LICENSE', '.yardopts']
2525
spec.require_paths = ['lib']
26-
spec.required_ruby_version = '>= 3.0'
26+
spec.required_ruby_version = '>= 3.1'
2727

2828
spec.add_development_dependency 'bundler', '>= 1.17'
2929
spec.add_development_dependency 'minitest', '~> 5.0'

0 commit comments

Comments
 (0)