Skip to content

Commit 1fc6949

Browse files
arielvalentinarielvalentin
authored
ci: Add Ruby 3.4 build (#1347)
* ci: Add Ruby 3.4 build * squash: use a separate cache key * Revert "squash: use a separate cache key" This reverts commit 78cb4d2. * squash: copy paste error * squash: 3.4 workaround * squash: mas cosas * squash: relax test * squash: fix test * squash: why you no work? * squash: more dependencies * squash: damage * stop commiting after midnight * squash: tricky compatability * squash: aws test fix?
1 parent 4673272 commit 1fc6949

File tree

64 files changed

+330
-27
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+330
-27
lines changed

‎.github/workflows/ci-contrib.yml

+20
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ jobs:
3030
runs-on: ${{ matrix.os }}
3131
steps:
3232
- uses: actions/checkout@v4
33+
- name: "Test Ruby 3.4"
34+
uses: ./.github/actions/test_gem
35+
with:
36+
gem: "opentelemetry-helpers-${{ matrix.gem }}"
37+
ruby: "3.4"
3338
- name: "Test Ruby 3.3"
3439
uses: ./.github/actions/test_gem
3540
with:
@@ -70,6 +75,11 @@ jobs:
7075
runs-on: ${{ matrix.os }}
7176
steps:
7277
- uses: actions/checkout@v4
78+
- name: "Test Ruby 3.4"
79+
uses: ./.github/actions/test_gem
80+
with:
81+
gem: "opentelemetry-propagator-${{ matrix.gem }}"
82+
ruby: "3.4"
7383
- name: "Test Ruby 3.3"
7484
uses: ./.github/actions/test_gem
7585
with:
@@ -109,6 +119,11 @@ jobs:
109119
runs-on: ${{ matrix.os }}
110120
steps:
111121
- uses: actions/checkout@v4
122+
- name: "Test Ruby 3.4"
123+
uses: ./.github/actions/test_gem
124+
with:
125+
gem: "opentelemetry-${{ matrix.gem }}"
126+
ruby: "3.4"
112127
- name: "Test Ruby 3.3"
113128
uses: ./.github/actions/test_gem
114129
with:
@@ -147,6 +162,11 @@ jobs:
147162
runs-on: ${{ matrix.os }}
148163
steps:
149164
- uses: actions/checkout@v4
165+
- name: "Test Ruby 3.4"
166+
uses: ./.github/actions/test_gem
167+
with:
168+
gem: "opentelemetry-processor-${{ matrix.gem }}"
169+
ruby: "3.4"
150170
- name: "Test Ruby 3.3"
151171
uses: ./.github/actions/test_gem
152172
with:

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

+30
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ jobs:
2929
runs-on: ${{ matrix.os }}
3030
steps:
3131
- uses: actions/checkout@v4
32+
- name: "Test Ruby 3.4"
33+
uses: ./.github/actions/test_gem
34+
with:
35+
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
36+
ruby: "3.4"
3237
- name: "Test Ruby 3.3"
3338
uses: ./.github/actions/test_gem
3439
with:
@@ -76,6 +81,11 @@ jobs:
7681
runs-on: ${{ matrix.os }}
7782
steps:
7883
- uses: actions/checkout@v4
84+
- name: "Test Ruby 3.4"
85+
uses: ./.github/actions/test_gem
86+
with:
87+
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
88+
ruby: "3.4"
7989
- name: "Test Ruby 3.3"
8090
uses: ./.github/actions/test_gem
8191
with:
@@ -114,6 +124,11 @@ jobs:
114124
runs-on: ${{ matrix.os }}
115125
steps:
116126
- uses: actions/checkout@v4
127+
- name: "Test Ruby 3.4"
128+
uses: ./.github/actions/test_gem
129+
with:
130+
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
131+
ruby: "3.4"
117132
- name: "Test Ruby 3.3"
118133
uses: ./.github/actions/test_gem
119134
with:
@@ -168,6 +183,11 @@ jobs:
168183
runs-on: ${{ matrix.os }}
169184
steps:
170185
- uses: actions/checkout@v4
186+
- name: "Test Ruby 3.4"
187+
uses: ./.github/actions/test_gem
188+
with:
189+
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
190+
ruby: "3.4"
171191
- name: "Test Ruby 3.3"
172192
uses: ./.github/actions/test_gem
173193
with:
@@ -213,6 +233,11 @@ jobs:
213233
runs-on: ${{ matrix.os }}
214234
steps:
215235
- uses: actions/checkout@v4
236+
- name: "Test Ruby 3.4"
237+
uses: ./.github/actions/test_gem
238+
with:
239+
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
240+
ruby: "3.4"
216241
- name: "Test Ruby 3.3"
217242
uses: ./.github/actions/test_gem
218243
with:
@@ -255,6 +280,11 @@ jobs:
255280
runs-on: ${{ matrix.os }}
256281
steps:
257282
- uses: actions/checkout@v4
283+
- name: "Test Ruby 3.4"
284+
uses: ./.github/actions/test_gem
285+
with:
286+
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
287+
ruby: "3.4"
258288
- name: "Test Ruby 3.3"
259289
uses: ./.github/actions/test_gem
260290
with:

‎.github/workflows/ci-instrumentation.yml

+5
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,11 @@ jobs:
6060
runs-on: ${{ matrix.os }}
6161
steps:
6262
- uses: actions/checkout@v4
63+
- name: "Test Ruby 3.4"
64+
uses: ./.github/actions/test_gem
65+
with:
66+
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
67+
ruby: "3.4"
6368
- name: "Test Ruby 3.3"
6469
uses: ./.github/actions/test_gem
6570
with:

‎helpers/mysql/Gemfile

+7
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,10 @@
77
source 'https://rubygems.org'
88

99
gemspec
10+
11+
group :test do
12+
if RUBY_VERSION >= '3.4'
13+
gem 'base64'
14+
gem 'mutex_m'
15+
end
16+
end

‎helpers/sql-obfuscation/Gemfile

+7
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,10 @@
77
source 'https://rubygems.org'
88

99
gemspec
10+
11+
group :test do
12+
if RUBY_VERSION >= '3.4'
13+
gem 'base64'
14+
gem 'mutex_m'
15+
end
16+
end

‎helpers/sql/Gemfile

+7
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,10 @@ source 'https://rubygems.org'
1111
# then target specific versions in the Appraisals file.
1212

1313
gemspec
14+
15+
group :test do
16+
if RUBY_VERSION >= '3.4'
17+
gem 'base64'
18+
gem 'mutex_m'
19+
end
20+
end

‎instrumentation/CONTRIBUTING.md

+5
Original file line numberDiff line numberDiff line change
@@ -353,6 +353,11 @@ If we determine the service container slows down the test suite significantly, i
353353
runs-on: ${{ matrix.os }}
354354
steps:
355355
- uses: actions/checkout@v4
356+
- name: "Test Ruby 3.4"
357+
uses: ./.github/actions/test_gem
358+
with:
359+
gem: "opentelemetry-helpers-${{ matrix.gem }}"
360+
ruby: "3.4"
356361
- name: "Test Ruby 3.3"
357362
uses: ./.github/actions/test_gem
358363
with:

‎instrumentation/action_mailer/Gemfile

+4
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,8 @@ group :test do
1414
# Add jar-dependencies gem only if the Ruby runtime is JRuby
1515
# https://github.com/jruby/jruby/issues/7262
1616
gem 'jar-dependencies', '0.4.1', platforms: :jruby
17+
if RUBY_VERSION >= '3.4'
18+
gem 'base64'
19+
gem 'mutex_m'
20+
end
1721
end

‎instrumentation/action_pack/Gemfile

+4
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,8 @@ group :test do
1212
gem 'opentelemetry-instrumentation-base', path: '../../instrumentation/base'
1313
gem 'opentelemetry-instrumentation-rack', path: '../../instrumentation/rack'
1414
gem 'pry-byebug'
15+
if RUBY_VERSION >= '3.4'
16+
gem 'base64'
17+
gem 'mutex_m'
18+
end
1519
end

‎instrumentation/action_view/Gemfile

+4
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,8 @@ group :test do
1212
gem 'opentelemetry-instrumentation-base', path: '../base'
1313
gem 'opentelemetry-instrumentation-active_support', path: '../active_support'
1414
gem 'pry-byebug'
15+
if RUBY_VERSION >= '3.4'
16+
gem 'base64'
17+
gem 'mutex_m'
18+
end
1519
end

‎instrumentation/active_job/Gemfile

+4
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,8 @@ gemspec
1010

1111
group :test do
1212
gem 'opentelemetry-instrumentation-base', path: '../base'
13+
if RUBY_VERSION >= '3.4'
14+
gem 'base64'
15+
gem 'mutex_m'
16+
end
1317
end

‎instrumentation/active_model_serializers/Gemfile

+4
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,8 @@ gemspec
1111
group :test do
1212
gem 'opentelemetry-instrumentation-base', path: '../base'
1313
gem 'opentelemetry-instrumentation-active_support', path: '../active_support'
14+
if RUBY_VERSION >= '3.4'
15+
gem 'base64'
16+
gem 'mutex_m'
17+
end
1418
end

‎instrumentation/active_record/Gemfile

+4
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,8 @@ group :test do
1212
gem 'byebug'
1313
gem 'opentelemetry-instrumentation-base', path: '../base'
1414
gem 'pry-byebug'
15+
if RUBY_VERSION >= '3.4'
16+
gem 'base64'
17+
gem 'mutex_m'
18+
end
1519
end

‎instrumentation/active_storage/Gemfile

+4
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,8 @@ gemspec
1111
group :test do
1212
gem 'opentelemetry-instrumentation-base', path: '../base'
1313
gem 'opentelemetry-instrumentation-active_support', path: '../active_support'
14+
if RUBY_VERSION >= '3.4'
15+
gem 'base64'
16+
gem 'mutex_m'
17+
end
1418
end

‎instrumentation/active_support/Gemfile

+4
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,8 @@ gemspec
1010

1111
group :test do
1212
gem 'opentelemetry-instrumentation-base', path: '../base'
13+
if RUBY_VERSION >= '3.4'
14+
gem 'base64'
15+
gem 'mutex_m'
16+
end
1317
end

‎instrumentation/all/Gemfile

+5
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ source 'https://rubygems.org'
99
gemspec
1010

1111
group :test do
12+
if RUBY_VERSION >= '3.4'
13+
gem 'base64'
14+
gem 'mutex_m'
15+
end
16+
1217
Dir.entries('../../helpers')
1318
.select { |entry| File.directory?(File.join('../../helpers', entry)) }
1419
.reject { |entry| %w[. ..].include?(entry) } # rubocop:disable Performance/CollectionLiteralInLoop

‎instrumentation/aws_lambda/Gemfile

+4
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,8 @@ gemspec
1111
group :test do
1212
gem 'opentelemetry-instrumentation-base', path: '../base'
1313
gem 'webrick', '~> 1.7'
14+
if RUBY_VERSION >= '3.4'
15+
gem 'base64'
16+
gem 'mutex_m'
17+
end
1418
end

‎instrumentation/aws_lambda/test/opentelemetry/instrumentation_test.rb

+1-2
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,7 @@
9696
_(last_span.hex_span_id.size).must_equal 16
9797
_(last_span.hex_trace_id.size).must_equal 32
9898
_(last_span.trace_flags.sampled?).must_equal true
99-
100-
assert_equal last_span.tracestate, { 'otel' => 'ff40ea9699e62af2-01' }
99+
_(last_span.tracestate.to_h).must_equal({ 'otel' => 'ff40ea9699e62af2-01' })
101100
end
102101
event_v1['headers'].delete('traceparent')
103102
event_v1['headers'].delete('tracestate')

‎instrumentation/aws_sdk/Gemfile

+4
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,8 @@ gemspec
1111
group :test do
1212
gem 'opentelemetry-instrumentation-base', path: '../base'
1313
gem 'webrick', '~> 1.7'
14+
if RUBY_VERSION >= '3.4'
15+
gem 'base64'
16+
gem 'mutex_m'
17+
end
1418
end

‎instrumentation/base/Gemfile

+7
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,10 @@
77
source 'https://rubygems.org'
88

99
gemspec
10+
11+
group :test do
12+
if RUBY_VERSION >= '3.4'
13+
gem 'base64'
14+
gem 'mutex_m'
15+
end
16+
end

‎instrumentation/bunny/Gemfile

+4
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,8 @@ gemspec
1111
group :test do
1212
gem 'opentelemetry-instrumentation-base', path: '../base'
1313
gem 'pry-byebug'
14+
if RUBY_VERSION >= '3.4'
15+
gem 'base64'
16+
gem 'mutex_m'
17+
end
1418
end

‎instrumentation/concurrent_ruby/Gemfile

+4
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,8 @@ gemspec
1010

1111
group :test do
1212
gem 'opentelemetry-instrumentation-base', path: '../base'
13+
if RUBY_VERSION >= '3.4'
14+
gem 'base64'
15+
gem 'mutex_m'
16+
end
1317
end

‎instrumentation/dalli/Gemfile

+4
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,8 @@ gemspec
1111
group :test do
1212
gem 'opentelemetry-instrumentation-base', path: '../base'
1313
gem 'pry'
14+
if RUBY_VERSION >= '3.4'
15+
gem 'base64'
16+
gem 'mutex_m'
17+
end
1418
end

‎instrumentation/delayed_job/Gemfile

+4
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,8 @@ gemspec
1010

1111
group :test do
1212
gem 'opentelemetry-instrumentation-base', path: '../base'
13+
if RUBY_VERSION >= '3.4'
14+
gem 'base64'
15+
gem 'mutex_m'
16+
end
1317
end

‎instrumentation/ethon/Gemfile

+4
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,8 @@ gemspec
1010

1111
group :test do
1212
gem 'opentelemetry-instrumentation-base', path: '../base'
13+
if RUBY_VERSION >= '3.4'
14+
gem 'base64'
15+
gem 'mutex_m'
16+
end
1317
end

‎instrumentation/excon/Gemfile

+4
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,8 @@ gemspec
1010

1111
group :test do
1212
gem 'opentelemetry-instrumentation-base', path: '../base'
13+
if RUBY_VERSION >= '3.4'
14+
gem 'base64'
15+
gem 'mutex_m'
16+
end
1317
end

‎instrumentation/faraday/Gemfile

+4
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,8 @@ gemspec
1010

1111
group :test do
1212
gem 'opentelemetry-instrumentation-base', path: '../base'
13+
if RUBY_VERSION >= '3.4'
14+
gem 'base64'
15+
gem 'mutex_m'
16+
end
1317
end

‎instrumentation/grape/Gemfile

+4
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,8 @@ group :test do
1616
gem 'opentelemetry-instrumentation-base', path: '../base'
1717
gem 'opentelemetry-instrumentation-rack', path: '../rack'
1818
gem 'builder'
19+
if RUBY_VERSION >= '3.4'
20+
gem 'base64'
21+
gem 'mutex_m'
22+
end
1923
end

0 commit comments

Comments
 (0)