Skip to content

Commit 9d97512

Browse files
kaylareopellekaylareopelle
authored
Merge branch 'main' into que
2 parents c08fdd1 + 8ca4fc6 commit 9d97512

File tree

257 files changed

+3241
-475
lines changed

Some content is hidden

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

257 files changed

+3241
-475
lines changed

‎.github/actions/test_gem/action.yml‎

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,16 @@ inputs:
1919
required: false
2020
type: boolean
2121
default: false
22+
coverage:
23+
description: Enforce test coverage
24+
required: false
25+
type: boolean
26+
default: false
27+
minimum_coverage:
28+
description: Minimum test coverage
29+
required: false
30+
type: string
31+
default: 85
2232
build:
2333
description: Build gem
2434
required: false
@@ -62,11 +72,19 @@ runs:
6272
fi
6373
fi
6474
75+
# Install ImageMagick for active_storage testing.
76+
# Unfortunately, as of ubuntu-24.04, ImageMagick is no longer pre-installed in Github Actions.
77+
# See https://github.com/actions/runner-images/issues/10772
78+
- name: Install ImageMagick for active_storage testing
79+
if: "${{ inputs.gem == 'opentelemetry-instrumentation-active_storage' }}"
80+
shell: bash
81+
run: sudo apt update && sudo apt install -y imagemagick
82+
6583
# Install ruby and bundle dependencies and cache!
6684
# ...but not for appraisals, sadly.
6785
- name: Install Ruby ${{ inputs.ruby }} with dependencies
6886
if: "${{ steps.setup.outputs.appraisals == 'false' }}"
69-
uses: ruby/setup-ruby@v1.213.0
87+
uses: ruby/setup-ruby@v1.215.0
7088
with:
7189
ruby-version: "${{ inputs.ruby }}"
7290
working-directory: "${{ steps.setup.outputs.gem_dir }}"
@@ -77,7 +95,7 @@ runs:
7795
# If we're using appraisals, do it all manually.
7896
- name: Install Ruby ${{ inputs.ruby }} without dependencies
7997
if: "${{ steps.setup.outputs.appraisals == 'true' }}"
80-
uses: ruby/setup-ruby@v1.213.0
98+
uses: ruby/setup-ruby@v1.215.0
8199
with:
82100
ruby-version: "${{ inputs.ruby }}"
83101
bundler: "latest"
@@ -153,6 +171,14 @@ runs:
153171
bundle exec rake rubocop
154172
working-directory: "${{ steps.setup.outputs.gem_dir }}"
155173

174+
- name: Coverage
175+
shell: bash
176+
if: "${{ inputs.coverage == 'true' }}"
177+
# This starts a new simplecov run which tracks nothing of its own,
178+
# but merges with the existing coverage reports generated during testing.
179+
run: 'bundle exec ruby -e ''require "simplecov"; SimpleCov.minimum_coverage(${{ inputs.minimum_coverage }})'''
180+
working-directory: "${{ steps.setup.outputs.gem_dir }}"
181+
156182
- name: Build Gem
157183
shell: bash
158184
if: "${{ inputs.build == 'true' }}"

‎.github/dependabot.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ updates:
99
directory: "/"
1010
schedule:
1111
interval: weekly
12+
- package-ecosystem: bundler
13+
directory: "/helpers/sql"
14+
schedule:
15+
interval: weekly
1216
- package-ecosystem: bundler
1317
directory: "/helpers/mysql"
1418
schedule:

‎.github/workflows/ci-contrib.yml‎

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ jobs:
2121
fail-fast: false
2222
matrix:
2323
gem:
24+
- sql
2425
- mysql
2526
- sql-obfuscation
2627
os:
@@ -29,6 +30,11 @@ jobs:
2930
runs-on: ${{ matrix.os }}
3031
steps:
3132
- 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"
3238
- name: "Test Ruby 3.3"
3339
uses: ./.github/actions/test_gem
3440
with:
@@ -46,13 +52,14 @@ jobs:
4652
ruby: "3.1"
4753
yard: true
4854
rubocop: true
55+
coverage: true
4956
build: true
5057
- name: "Test JRuby"
5158
if: "${{ matrix.os == 'ubuntu-latest' }}"
5259
uses: ./.github/actions/test_gem
5360
with:
5461
gem: "opentelemetry-helpers-${{ matrix.gem }}"
55-
ruby: "jruby-9.4.9.0"
62+
ruby: "jruby-9.4.10.0"
5663

5764
propagators:
5865
strategy:
@@ -68,6 +75,11 @@ jobs:
6875
runs-on: ${{ matrix.os }}
6976
steps:
7077
- 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"
7183
- name: "Test Ruby 3.3"
7284
uses: ./.github/actions/test_gem
7385
with:
@@ -91,7 +103,7 @@ jobs:
91103
uses: ./.github/actions/test_gem
92104
with:
93105
gem: "opentelemetry-propagator-${{ matrix.gem }}"
94-
ruby: "jruby-9.4.9.0"
106+
ruby: "jruby-9.4.10.0"
95107

96108
resource-detectors:
97109
strategy:
@@ -107,6 +119,11 @@ jobs:
107119
runs-on: ${{ matrix.os }}
108120
steps:
109121
- 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"
110127
- name: "Test Ruby 3.3"
111128
uses: ./.github/actions/test_gem
112129
with:
@@ -124,13 +141,14 @@ jobs:
124141
ruby: "3.1"
125142
yard: true
126143
rubocop: true
144+
coverage: true
127145
build: true
128146
- name: "Test JRuby"
129147
if: "${{ matrix.os == 'ubuntu-latest' }}"
130148
uses: ./.github/actions/test_gem
131149
with:
132150
gem: "opentelemetry-${{ matrix.gem }}"
133-
ruby: "jruby-9.4.9.0"
151+
ruby: "jruby-9.4.10.0"
134152

135153
processors:
136154
strategy:
@@ -144,6 +162,11 @@ jobs:
144162
runs-on: ${{ matrix.os }}
145163
steps:
146164
- 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"
147170
- name: "Test Ruby 3.3"
148171
uses: ./.github/actions/test_gem
149172
with:
@@ -161,10 +184,11 @@ jobs:
161184
ruby: "3.1"
162185
yard: true
163186
rubocop: true
187+
coverage: true
164188
build: true
165189
- name: "Test JRuby"
166190
if: "${{ matrix.os == 'ubuntu-latest' && steps.jruby_skip.outputs.skip == 'false' }}"
167191
uses: ./.github/actions/test_gem
168192
with:
169193
gem: "opentelemetry-processor-${{ matrix.gem }}"
170-
ruby: "jruby-9.4.9.0"
194+
ruby: "jruby-9.4.10.0"

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

Lines changed: 37 additions & 1 deletion
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:
@@ -46,12 +51,13 @@ jobs:
4651
ruby: "3.1"
4752
yard: true
4853
rubocop: true
54+
coverage: true
4955
build: true
5056
- name: "Test JRuby"
5157
uses: ./.github/actions/test_gem
5258
with:
5359
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
54-
ruby: "jruby-9.4.9.0"
60+
ruby: "jruby-9.4.10.0"
5561
services:
5662
memcached:
5763
image: memcached:alpine
@@ -75,6 +81,11 @@ jobs:
7581
runs-on: ${{ matrix.os }}
7682
steps:
7783
- 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"
7889
- name: "Test Ruby 3.3"
7990
uses: ./.github/actions/test_gem
8091
with:
@@ -92,6 +103,7 @@ jobs:
92103
ruby: "3.1"
93104
yard: true
94105
rubocop: true
106+
coverage: true
95107
build: true
96108
services:
97109
mysql:
@@ -112,6 +124,11 @@ jobs:
112124
runs-on: ${{ matrix.os }}
113125
steps:
114126
- 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"
115132
- name: "Test Ruby 3.3"
116133
uses: ./.github/actions/test_gem
117134
with:
@@ -129,6 +146,7 @@ jobs:
129146
ruby: "3.1"
130147
yard: true
131148
rubocop: true
149+
coverage: true
132150
build: true
133151
services:
134152
zookeeper:
@@ -165,6 +183,11 @@ jobs:
165183
runs-on: ${{ matrix.os }}
166184
steps:
167185
- 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"
168191
- name: "Test Ruby 3.3"
169192
uses: ./.github/actions/test_gem
170193
with:
@@ -182,6 +205,7 @@ jobs:
182205
ruby: "3.1"
183206
yard: true
184207
rubocop: true
208+
coverage: true
185209
build: true
186210
services:
187211
redis:
@@ -209,6 +233,11 @@ jobs:
209233
runs-on: ${{ matrix.os }}
210234
steps:
211235
- 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"
212241
- name: "Test Ruby 3.3"
213242
uses: ./.github/actions/test_gem
214243
with:
@@ -226,6 +255,7 @@ jobs:
226255
ruby: "3.1"
227256
yard: true
228257
rubocop: true
258+
coverage: true
229259
build: true
230260
services:
231261
postgres:
@@ -250,6 +280,11 @@ jobs:
250280
runs-on: ${{ matrix.os }}
251281
steps:
252282
- 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"
253288
- name: "Test Ruby 3.3"
254289
uses: ./.github/actions/test_gem
255290
with:
@@ -267,6 +302,7 @@ jobs:
267302
ruby: "3.1"
268303
yard: true
269304
rubocop: true
305+
coverage: true
270306
build: true
271307
services:
272308
rabbitmq:

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ jobs:
2727
- active_job
2828
- active_model_serializers
2929
- active_record
30+
- active_storage
3031
- active_support
3132
- all
3233
- aws_sdk
@@ -59,6 +60,11 @@ jobs:
5960
runs-on: ${{ matrix.os }}
6061
steps:
6162
- 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"
6268
- name: "Test Ruby 3.3"
6369
uses: ./.github/actions/test_gem
6470
with:
@@ -72,10 +78,11 @@ jobs:
7278
- name: "Test Ruby 3.1"
7379
uses: ./.github/actions/test_gem
7480
with:
75-
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
81+
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
7682
ruby: "3.1"
7783
yard: true
7884
rubocop: true
85+
coverage: true
7986
build: true
8087
- name: "JRuby Filter"
8188
id: jruby_skip
@@ -86,6 +93,7 @@ jobs:
8693
[[ "${{ matrix.gem }}" == "action_view" ]] && echo "skip=true" >> $GITHUB_OUTPUT
8794
[[ "${{ matrix.gem }}" == "active_model_serializers" ]] && echo "skip=true" >> $GITHUB_OUTPUT
8895
[[ "${{ matrix.gem }}" == "active_record" ]] && echo "skip=true" >> $GITHUB_OUTPUT
96+
[[ "${{ matrix.gem }}" == "active_storage" ]] && echo "skip=true" >> $GITHUB_OUTPUT
8997
[[ "${{ matrix.gem }}" == "active_support" ]] && echo "skip=true" >> $GITHUB_OUTPUT
9098
[[ "${{ matrix.gem }}" == "aws_sdk" ]] && echo "skip=true" >> $GITHUB_OUTPUT
9199
[[ "${{ matrix.gem }}" == "aws_lambda" ]] && echo "skip=true" >> $GITHUB_OUTPUT
@@ -106,4 +114,4 @@ jobs:
106114
uses: ./.github/actions/test_gem
107115
with:
108116
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
109-
ruby: "jruby-9.4.9.0"
117+
ruby: "jruby-9.4.10.0"

‎.github/workflows/installation-tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- uses: actions/checkout@v4
2626
# ATTENTION: Dependabot does not know how to update shared actions file.
2727
# If you see it update setup-ruby here also update it as part of actions/test_gem/action.yml
28-
- uses: ruby/setup-ruby@v1.213.0
28+
- uses: ruby/setup-ruby@v1.215.0
2929
with:
3030
ruby-version: ${{ matrix.ruby-version }}
3131
- name: "Install Latest Gem Versions on ${{ matrix.ruby-version }}"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Install Ruby ${{ env.ruby_version }}
15-
uses: ruby/setup-ruby@v1.213.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‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Install Ruby ${{ env.ruby_version }}
16-
uses: ruby/setup-ruby@v1.213.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‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
runs-on: ubuntu-latest
2323
steps:
2424
- name: Install Ruby ${{ env.ruby_version }}
25-
uses: ruby/setup-ruby@v1.213.0
25+
uses: ruby/setup-ruby@v1.215.0
2626
with:
2727
ruby-version: ${{ env.ruby_version }}
2828
- name: Checkout repo

0 commit comments

Comments
 (0)