Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: Add Ruby 3.4 build #1347

Merged
merged 16 commits into from
Jan 31, 2025
Merged

ci: Add Ruby 3.4 build #1347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
43ebe17
ci: Add Ruby 3.4 build
arielvalentin Jan 16, 2025
78cb4d2
squash: use a separate cache key
arielvalentin Jan 30, 2025
ecc88cb
Revert "squash: use a separate cache key"
arielvalentin Jan 30, 2025
bfc55bd
squash: copy paste error
arielvalentin Jan 30, 2025
736fd8a
squash: 3.4 workaround
arielvalentin Jan 30, 2025
4f2a037
squash: mas cosas
arielvalentin Jan 30, 2025
c45d438
squash: relax test
arielvalentin Jan 30, 2025
4320cd4
squash: fix test
arielvalentin Jan 30, 2025
a92c5ff
squash: why you no work?
arielvalentin Jan 30, 2025
0656c8f
squash: more dependencies
arielvalentin Jan 30, 2025
1ad31eb
squash: damage
arielvalentin Jan 30, 2025
cfc980e
stop commiting after midnight
arielvalentin Jan 30, 2025
3f6e0a9
Merge branch 'main' into ruby-3.4
arielvalentin Jan 30, 2025
8cd1bca
squash: tricky compatability
arielvalentin Jan 31, 2025
1d17a0d
squash: aws test fix?
arielvalentin Jan 31, 2025
462e4cc
Merge branch 'main' into ruby-3.4
arielvalentin Jan 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions .github/workflows/ci-contrib.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
- name: "Test Ruby 3.4"
uses: ./.github/actions/test_gem
with:
gem: "opentelemetry-helpers-${{ matrix.gem }}"
ruby: "3.4"
- name: "Test Ruby 3.3"
uses: ./.github/actions/test_gem
with:
Expand Down Expand Up @@ -70,6 +75,11 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
- name: "Test Ruby 3.4"
uses: ./.github/actions/test_gem
with:
gem: "opentelemetry-propagator-${{ matrix.gem }}"
ruby: "3.4"
- name: "Test Ruby 3.3"
uses: ./.github/actions/test_gem
with:
Expand Down Expand Up @@ -109,6 +119,11 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
- name: "Test Ruby 3.4"
uses: ./.github/actions/test_gem
with:
gem: "opentelemetry-${{ matrix.gem }}"
ruby: "3.4"
- name: "Test Ruby 3.3"
uses: ./.github/actions/test_gem
with:
Expand Down Expand Up @@ -147,6 +162,11 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
- name: "Test Ruby 3.4"
uses: ./.github/actions/test_gem
with:
gem: "opentelemetry-processor-${{ matrix.gem }}"
ruby: "3.4"
- name: "Test Ruby 3.3"
uses: ./.github/actions/test_gem
with:
Expand Down
30 changes: 30 additions & 0 deletions .github/workflows/ci-instrumentation-with-services.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
- name: "Test Ruby 3.4"
uses: ./.github/actions/test_gem
with:
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
ruby: "3.4"
- name: "Test Ruby 3.3"
uses: ./.github/actions/test_gem
with:
Expand Down Expand Up @@ -76,6 +81,11 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
- name: "Test Ruby 3.4"
uses: ./.github/actions/test_gem
with:
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
ruby: "3.4"
- name: "Test Ruby 3.3"
uses: ./.github/actions/test_gem
with:
Expand Down Expand Up @@ -114,6 +124,11 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
- name: "Test Ruby 3.4"
uses: ./.github/actions/test_gem
with:
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
ruby: "3.4"
- name: "Test Ruby 3.3"
uses: ./.github/actions/test_gem
with:
Expand Down Expand Up @@ -168,6 +183,11 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
- name: "Test Ruby 3.4"
uses: ./.github/actions/test_gem
with:
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
ruby: "3.4"
- name: "Test Ruby 3.3"
uses: ./.github/actions/test_gem
with:
Expand Down Expand Up @@ -213,6 +233,11 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
- name: "Test Ruby 3.4"
uses: ./.github/actions/test_gem
with:
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
ruby: "3.4"
- name: "Test Ruby 3.3"
uses: ./.github/actions/test_gem
with:
Expand Down Expand Up @@ -255,6 +280,11 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
- name: "Test Ruby 3.4"
uses: ./.github/actions/test_gem
with:
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
ruby: "3.4"
- name: "Test Ruby 3.3"
uses: ./.github/actions/test_gem
with:
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/ci-instrumentation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,11 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
- name: "Test Ruby 3.4"
uses: ./.github/actions/test_gem
with:
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
ruby: "3.4"
- name: "Test Ruby 3.3"
uses: ./.github/actions/test_gem
with:
Expand Down
7 changes: 7 additions & 0 deletions helpers/mysql/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,10 @@
source 'https://rubygems.org'

gemspec

group :test do
if RUBY_VERSION >= '3.4'
gem 'base64'
gem 'mutex_m'
end
end
7 changes: 7 additions & 0 deletions helpers/sql-obfuscation/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,10 @@
source 'https://rubygems.org'

gemspec

group :test do
if RUBY_VERSION >= '3.4'
gem 'base64'
gem 'mutex_m'
end
end
7 changes: 7 additions & 0 deletions helpers/sql/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,10 @@ source 'https://rubygems.org'
# then target specific versions in the Appraisals file.

gemspec

group :test do
if RUBY_VERSION >= '3.4'
gem 'base64'
gem 'mutex_m'
end
end
5 changes: 5 additions & 0 deletions instrumentation/CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,11 @@ If we determine the service container slows down the test suite significantly, i
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
- name: "Test Ruby 3.4"
uses: ./.github/actions/test_gem
with:
gem: "opentelemetry-helpers-${{ matrix.gem }}"
ruby: "3.4"
- name: "Test Ruby 3.3"
uses: ./.github/actions/test_gem
with:
Expand Down
4 changes: 4 additions & 0 deletions instrumentation/action_mailer/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,8 @@ group :test do
# Add jar-dependencies gem only if the Ruby runtime is JRuby
# https://github.com/jruby/jruby/issues/7262
gem 'jar-dependencies', '0.4.1', platforms: :jruby
if RUBY_VERSION >= '3.4'
gem 'base64'
gem 'mutex_m'
end
end
4 changes: 4 additions & 0 deletions instrumentation/action_pack/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,8 @@ group :test do
gem 'opentelemetry-instrumentation-base', path: '../../instrumentation/base'
gem 'opentelemetry-instrumentation-rack', path: '../../instrumentation/rack'
gem 'pry-byebug'
if RUBY_VERSION >= '3.4'
gem 'base64'
gem 'mutex_m'
end
end
4 changes: 4 additions & 0 deletions instrumentation/action_view/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,8 @@ group :test do
gem 'opentelemetry-instrumentation-base', path: '../base'
gem 'opentelemetry-instrumentation-active_support', path: '../active_support'
gem 'pry-byebug'
if RUBY_VERSION >= '3.4'
gem 'base64'
gem 'mutex_m'
end
end
4 changes: 4 additions & 0 deletions instrumentation/active_job/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,8 @@ gemspec

group :test do
gem 'opentelemetry-instrumentation-base', path: '../base'
if RUBY_VERSION >= '3.4'
gem 'base64'
gem 'mutex_m'
end
end
4 changes: 4 additions & 0 deletions instrumentation/active_model_serializers/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,8 @@ gemspec
group :test do
gem 'opentelemetry-instrumentation-base', path: '../base'
gem 'opentelemetry-instrumentation-active_support', path: '../active_support'
if RUBY_VERSION >= '3.4'
gem 'base64'
gem 'mutex_m'
end
end
4 changes: 4 additions & 0 deletions instrumentation/active_record/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,8 @@ group :test do
gem 'byebug'
gem 'opentelemetry-instrumentation-base', path: '../base'
gem 'pry-byebug'
if RUBY_VERSION >= '3.4'
gem 'base64'
gem 'mutex_m'
end
end
4 changes: 4 additions & 0 deletions instrumentation/active_storage/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,8 @@ gemspec
group :test do
gem 'opentelemetry-instrumentation-base', path: '../base'
gem 'opentelemetry-instrumentation-active_support', path: '../active_support'
if RUBY_VERSION >= '3.4'
gem 'base64'
gem 'mutex_m'
end
end
4 changes: 4 additions & 0 deletions instrumentation/active_support/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,8 @@ gemspec

group :test do
gem 'opentelemetry-instrumentation-base', path: '../base'
if RUBY_VERSION >= '3.4'
gem 'base64'
gem 'mutex_m'
end
end
5 changes: 5 additions & 0 deletions instrumentation/all/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ source 'https://rubygems.org'
gemspec

group :test do
if RUBY_VERSION >= '3.4'
gem 'base64'
gem 'mutex_m'
end

Dir.entries('../../helpers')
.select { |entry| File.directory?(File.join('../../helpers', entry)) }
.reject { |entry| %w[. ..].include?(entry) } # rubocop:disable Performance/CollectionLiteralInLoop
Expand Down
4 changes: 4 additions & 0 deletions instrumentation/aws_lambda/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,8 @@ gemspec
group :test do
gem 'opentelemetry-instrumentation-base', path: '../base'
gem 'webrick', '~> 1.7'
if RUBY_VERSION >= '3.4'
gem 'base64'
gem 'mutex_m'
end
end
3 changes: 1 addition & 2 deletions instrumentation/aws_lambda/test/opentelemetry/instrumentation_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,7 @@
_(last_span.hex_span_id.size).must_equal 16
_(last_span.hex_trace_id.size).must_equal 32
_(last_span.trace_flags.sampled?).must_equal true

assert_equal last_span.tracestate, { 'otel' => 'ff40ea9699e62af2-01' }
_(last_span.tracestate.to_h).must_equal({ 'otel' => 'ff40ea9699e62af2-01' })
end
event_v1['headers'].delete('traceparent')
event_v1['headers'].delete('tracestate')
Expand Down
4 changes: 4 additions & 0 deletions instrumentation/aws_sdk/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,8 @@ gemspec
group :test do
gem 'opentelemetry-instrumentation-base', path: '../base'
gem 'webrick', '~> 1.7'
if RUBY_VERSION >= '3.4'
gem 'base64'
gem 'mutex_m'
end
end
7 changes: 7 additions & 0 deletions instrumentation/base/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,10 @@
source 'https://rubygems.org'

gemspec

group :test do
if RUBY_VERSION >= '3.4'
gem 'base64'
gem 'mutex_m'
end
end
4 changes: 4 additions & 0 deletions instrumentation/bunny/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,8 @@ gemspec
group :test do
gem 'opentelemetry-instrumentation-base', path: '../base'
gem 'pry-byebug'
if RUBY_VERSION >= '3.4'
gem 'base64'
gem 'mutex_m'
end
end
4 changes: 4 additions & 0 deletions instrumentation/concurrent_ruby/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,8 @@ gemspec

group :test do
gem 'opentelemetry-instrumentation-base', path: '../base'
if RUBY_VERSION >= '3.4'
gem 'base64'
gem 'mutex_m'
end
end
4 changes: 4 additions & 0 deletions instrumentation/dalli/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,8 @@ gemspec
group :test do
gem 'opentelemetry-instrumentation-base', path: '../base'
gem 'pry'
if RUBY_VERSION >= '3.4'
gem 'base64'
gem 'mutex_m'
end
end
4 changes: 4 additions & 0 deletions instrumentation/delayed_job/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,8 @@ gemspec

group :test do
gem 'opentelemetry-instrumentation-base', path: '../base'
if RUBY_VERSION >= '3.4'
gem 'base64'
gem 'mutex_m'
end
end
4 changes: 4 additions & 0 deletions instrumentation/ethon/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,8 @@ gemspec

group :test do
gem 'opentelemetry-instrumentation-base', path: '../base'
if RUBY_VERSION >= '3.4'
gem 'base64'
gem 'mutex_m'
end
end
4 changes: 4 additions & 0 deletions instrumentation/excon/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,8 @@ gemspec

group :test do
gem 'opentelemetry-instrumentation-base', path: '../base'
if RUBY_VERSION >= '3.4'
gem 'base64'
gem 'mutex_m'
end
end
4 changes: 4 additions & 0 deletions instrumentation/faraday/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,8 @@ gemspec

group :test do
gem 'opentelemetry-instrumentation-base', path: '../base'
if RUBY_VERSION >= '3.4'
gem 'base64'
gem 'mutex_m'
end
end
4 changes: 4 additions & 0 deletions instrumentation/grape/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,8 @@ group :test do
gem 'opentelemetry-instrumentation-base', path: '../base'
gem 'opentelemetry-instrumentation-rack', path: '../rack'
gem 'builder'
if RUBY_VERSION >= '3.4'
gem 'base64'
gem 'mutex_m'
end
end
Loading
Loading