diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d45cfead1..31570e7ee 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -52,25 +52,26 @@ jobs: gem: "${{ matrix.gem }}" ruby: "3.3" - name: "Test Ruby 3.2" - uses: ./.github/actions/test_gem - with: - gem: "${{ matrix.gem }}" - ruby: "3.2" - - name: "Test Ruby 3.1" if: "${{ matrix.os == 'ubuntu-latest' }}" uses: ./.github/actions/test_gem with: gem: "${{ matrix.gem }}" - ruby: "3.1" + ruby: "3.2" yard: true rubocop: true build: true + - name: "Test Ruby 3.2" + if: "${{ matrix.os != 'ubuntu-latest' }}" + uses: ./.github/actions/test_gem + with: + gem: "${{ matrix.gem }}" + ruby: "3.2" - name: "Test JRuby" if: "${{ matrix.os == 'ubuntu-latest' }}" uses: ./.github/actions/test_gem with: gem: "${{ matrix.gem }}" - ruby: "jruby" + ruby: "jruby-10.0.2.0" - name: "Test truffleruby" if: "${{ matrix.os == 'ubuntu-latest' }}" uses: ./.github/actions/test_gem @@ -121,32 +122,32 @@ jobs: gem: "${{ matrix.gem }}" ruby: "3.3" - name: "Test Ruby 3.2" - if: "${{ matrix.gem != 'opentelemetry-exporter-jaeger' }}" + if: "${{ matrix.gem != 'opentelemetry-exporter-jaeger' && matrix.os == 'ubuntu-latest' }}" uses: ./.github/actions/test_gem with: gem: "${{ matrix.gem }}" ruby: "3.2" - - name: "Test Ruby 3.1" - if: "${{ matrix.os == 'ubuntu-latest' }}" - uses: ./.github/actions/test_gem - with: - gem: "${{ matrix.gem }}" - ruby: "3.1" yard: true rubocop: true build: true + - name: "Test Ruby 3.2" + if: "${{ matrix.gem != 'opentelemetry-exporter-jaeger' && matrix.os != 'ubuntu-latest' }}" + uses: ./.github/actions/test_gem + with: + gem: "${{ matrix.gem }}" + ruby: "3.2" - name: "Test Zipkin with JRuby" if: "${{ matrix.os == 'ubuntu-latest' && matrix.gem == 'opentelemetry-exporter-zipkin' }}" uses: ./.github/actions/test_gem with: gem: "${{ matrix.gem }}" - ruby: "jruby" + ruby: "jruby-10.0.2.0" - name: "Test Jaeger with JRuby" if: "${{ matrix.os == 'ubuntu-latest' && matrix.gem == 'opentelemetry-exporter-jaeger' }}" uses: ./.github/actions/test_gem with: gem: "${{ matrix.gem }}" - ruby: "jruby-9.4" + ruby: "jruby-10.0.2.0" - name: "Truffleruby Filter" id: truffleruby_skip shell: bash @@ -189,25 +190,26 @@ jobs: gem: "${{ matrix.gem }}" ruby: "3.3" - name: "Test Ruby 3.2" - uses: ./.github/actions/test_gem - with: - gem: "${{ matrix.gem }}" - ruby: "3.2" - - name: "Test Ruby 3.1" if: "${{ matrix.os == 'ubuntu-latest' }}" uses: ./.github/actions/test_gem with: gem: "${{ matrix.gem }}" - ruby: "3.1" + ruby: "3.2" yard: true rubocop: true build: true + - name: "Test Ruby 3.2" + if: "${{ matrix.os != 'ubuntu-latest' }}" + uses: ./.github/actions/test_gem + with: + gem: "${{ matrix.gem }}" + ruby: "3.2" - name: "Test JRuby" if: "${{ matrix.os == 'ubuntu-latest' }}" uses: ./.github/actions/test_gem with: gem: "${{ matrix.gem }}" - ruby: "jruby" + ruby: "jruby-10.0.2.0" - name: "Test truffleruby" if: "${{ matrix.os == 'ubuntu-latest' }}" uses: ./.github/actions/test_gem diff --git a/api/opentelemetry-api.gemspec b/api/opentelemetry-api.gemspec index 5ae67c120..196e91863 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.1' + spec.required_ruby_version = '>= 3.2' spec.add_dependency 'logger' spec.add_development_dependency 'benchmark-ipsa', '~> 0.2.0' diff --git a/common/opentelemetry-common.gemspec b/common/opentelemetry-common.gemspec index 173c68539..d3a040475 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.1' + spec.required_ruby_version = '>= 3.2' spec.add_dependency 'opentelemetry-api', '~> 1.0' diff --git a/contrib/rubocop.yml b/contrib/rubocop.yml index 61dd9afe2..44b21430d 100644 --- a/contrib/rubocop.yml +++ b/contrib/rubocop.yml @@ -7,7 +7,7 @@ plugins: AllCops: NewCops: disable SuggestExtensions: false - TargetRubyVersion: "3.1" + TargetRubyVersion: "3.2" Exclude: - "vendor/**/*" diff --git a/exporter/jaeger/opentelemetry-exporter-jaeger.gemspec b/exporter/jaeger/opentelemetry-exporter-jaeger.gemspec index fe8de2ad5..8d4e58e66 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.2' + spec.required_ruby_version = '>= 3.1' spec.add_dependency 'base64', '>= 0.2.0' spec.add_dependency 'opentelemetry-api', '~> 1.1' diff --git a/exporter/otlp-common/opentelemetry-exporter-otlp-common.gemspec b/exporter/otlp-common/opentelemetry-exporter-otlp-common.gemspec index f18f3ba07..86f02989d 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.1' + spec.required_ruby_version = '>= 3.2' 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 3cd2e1e3c..f7897f308 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.1' + spec.required_ruby_version = '>= 3.2' 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 f5990309e..b51464dc3 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.1' + spec.required_ruby_version = '>= 3.2' 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 7063b23a5..cc364296e 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.1' + spec.required_ruby_version = '>= 3.2' 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 81e710eae..66a0ece13 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.1' + spec.required_ruby_version = '>= 3.2' 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 e0dfd6b52..76ec6e9d4 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.1' + spec.required_ruby_version = '>= 3.2' 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 f09b1a9b4..f0e6069ba 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.1' + spec.required_ruby_version = '>= 3.2' 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 fe42b1822..969b9a69e 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.1' + spec.required_ruby_version = '>= 3.2' spec.add_dependency 'opentelemetry-api', '~> 1.0' diff --git a/logs_sdk/opentelemetry-logs-sdk.gemspec b/logs_sdk/opentelemetry-logs-sdk.gemspec index c35de5f38..328945b32 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.1' + spec.required_ruby_version = '>= 3.2' 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 26a587f9f..daf8412ad 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.1' + spec.required_ruby_version = '>= 3.2' spec.add_dependency 'opentelemetry-api', '~> 1.0' diff --git a/metrics_sdk/opentelemetry-metrics-sdk.gemspec b/metrics_sdk/opentelemetry-metrics-sdk.gemspec index f725a4fad..335af61d4 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.1' + spec.required_ruby_version = '>= 3.2' 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 c8869dc4b..7190a0ea4 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.1' + spec.required_ruby_version = '>= 3.2' spec.add_dependency 'opentelemetry-api', '~> 1.1' diff --git a/propagator/jaeger/opentelemetry-propagator-jaeger.gemspec b/propagator/jaeger/opentelemetry-propagator-jaeger.gemspec index d666ab8fa..6a760757e 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.1' + spec.required_ruby_version = '< 3.2' spec.add_dependency 'opentelemetry-api', '~> 1.1' diff --git a/registry/opentelemetry-registry.gemspec b/registry/opentelemetry-registry.gemspec index cf4003409..6f66c21c4 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.1' + spec.required_ruby_version = '>= 3.2' spec.add_dependency 'opentelemetry-api', '~> 1.1' diff --git a/sdk/opentelemetry-sdk.gemspec b/sdk/opentelemetry-sdk.gemspec index 20bf7b998..604e8a739 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.1' + spec.required_ruby_version = '>= 3.2' spec.add_dependency 'logger' spec.add_dependency 'opentelemetry-api', '~> 1.1' diff --git a/sdk_experimental/opentelemetry-sdk-experimental.gemspec b/sdk_experimental/opentelemetry-sdk-experimental.gemspec index 7ca4d5ad6..8e131a844 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.1' + spec.required_ruby_version = '>= 3.2' 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 814fd1123..7906dabda 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.1' + spec.required_ruby_version = '>= 3.2' spec.add_dependency 'opentelemetry-api', '~> 1.0' diff --git a/test_helpers/opentelemetry-test-helpers.gemspec b/test_helpers/opentelemetry-test-helpers.gemspec index f8212b174..aec5f2e6c 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.1' + spec.required_ruby_version = '>= 3.2' spec.add_development_dependency 'bundler', '>= 1.17' spec.add_development_dependency 'minitest', '~> 5.0'