Skip to content

Commit 35c6a21

Browse files
arielvalentinarielvalentin
authored
Merge branch 'main' into ruby-3.4
2 parents 9696d05 + fb9cdf4 commit 35c6a21

File tree

188 files changed

+2491
-351
lines changed

Some content is hidden

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

188 files changed

+2491
-351
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.207.0
87+
uses: ruby/setup-ruby@v1.214.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.207.0
98+
uses: ruby/setup-ruby@v1.214.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: 8 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:
@@ -51,13 +52,14 @@ jobs:
5152
ruby: "3.1"
5253
yard: true
5354
rubocop: true
55+
coverage: true
5456
build: true
5557
- name: "Test JRuby"
5658
if: "${{ matrix.os == 'ubuntu-latest' }}"
5759
uses: ./.github/actions/test_gem
5860
with:
5961
gem: "opentelemetry-helpers-${{ matrix.gem }}"
60-
ruby: "jruby-9.4.9.0"
62+
ruby: "jruby-9.4.10.0"
6163

6264
propagators:
6365
strategy:
@@ -101,7 +103,7 @@ jobs:
101103
uses: ./.github/actions/test_gem
102104
with:
103105
gem: "opentelemetry-propagator-${{ matrix.gem }}"
104-
ruby: "jruby-9.4.9.0"
106+
ruby: "jruby-9.4.10.0"
105107

106108
resource-detectors:
107109
strategy:
@@ -139,13 +141,14 @@ jobs:
139141
ruby: "3.1"
140142
yard: true
141143
rubocop: true
144+
coverage: true
142145
build: true
143146
- name: "Test JRuby"
144147
if: "${{ matrix.os == 'ubuntu-latest' }}"
145148
uses: ./.github/actions/test_gem
146149
with:
147150
gem: "opentelemetry-${{ matrix.gem }}"
148-
ruby: "jruby-9.4.9.0"
151+
ruby: "jruby-9.4.10.0"
149152

150153
processors:
151154
strategy:
@@ -181,10 +184,11 @@ jobs:
181184
ruby: "3.1"
182185
yard: true
183186
rubocop: true
187+
coverage: true
184188
build: true
185189
- name: "Test JRuby"
186190
if: "${{ matrix.os == 'ubuntu-latest' && steps.jruby_skip.outputs.skip == 'false' }}"
187191
uses: ./.github/actions/test_gem
188192
with:
189193
gem: "opentelemetry-processor-${{ matrix.gem }}"
190-
ruby: "jruby-9.4.9.0"
194+
ruby: "jruby-9.4.10.0"

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,13 @@ jobs:
5151
ruby: "3.1"
5252
yard: true
5353
rubocop: true
54+
coverage: true
5455
build: true
5556
- name: "Test JRuby"
5657
uses: ./.github/actions/test_gem
5758
with:
5859
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
59-
ruby: "jruby-9.4.9.0"
60+
ruby: "jruby-9.4.10.0"
6061
services:
6162
memcached:
6263
image: memcached:alpine
@@ -102,6 +103,7 @@ jobs:
102103
ruby: "3.1"
103104
yard: true
104105
rubocop: true
106+
coverage: true
105107
build: true
106108
services:
107109
mysql:
@@ -144,6 +146,7 @@ jobs:
144146
ruby: "3.1"
145147
yard: true
146148
rubocop: true
149+
coverage: true
147150
build: true
148151
services:
149152
zookeeper:
@@ -202,6 +205,7 @@ jobs:
202205
ruby: "3.1"
203206
yard: true
204207
rubocop: true
208+
coverage: true
205209
build: true
206210
services:
207211
redis:
@@ -251,6 +255,7 @@ jobs:
251255
ruby: "3.1"
252256
yard: true
253257
rubocop: true
258+
coverage: true
254259
build: true
255260
services:
256261
postgres:
@@ -297,6 +302,7 @@ jobs:
297302
ruby: "3.1"
298303
yard: true
299304
rubocop: true
305+
coverage: true
300306
build: true
301307
services:
302308
rabbitmq:

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

Lines changed: 5 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
@@ -77,10 +78,11 @@ jobs:
7778
- name: "Test Ruby 3.1"
7879
uses: ./.github/actions/test_gem
7980
with:
80-
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
81+
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
8182
ruby: "3.1"
8283
yard: true
8384
rubocop: true
85+
coverage: true
8486
build: true
8587
- name: "JRuby Filter"
8688
id: jruby_skip
@@ -91,6 +93,7 @@ jobs:
9193
[[ "${{ matrix.gem }}" == "action_view" ]] && echo "skip=true" >> $GITHUB_OUTPUT
9294
[[ "${{ matrix.gem }}" == "active_model_serializers" ]] && echo "skip=true" >> $GITHUB_OUTPUT
9395
[[ "${{ matrix.gem }}" == "active_record" ]] && echo "skip=true" >> $GITHUB_OUTPUT
96+
[[ "${{ matrix.gem }}" == "active_storage" ]] && echo "skip=true" >> $GITHUB_OUTPUT
9497
[[ "${{ matrix.gem }}" == "active_support" ]] && echo "skip=true" >> $GITHUB_OUTPUT
9598
[[ "${{ matrix.gem }}" == "aws_sdk" ]] && echo "skip=true" >> $GITHUB_OUTPUT
9699
[[ "${{ matrix.gem }}" == "aws_lambda" ]] && echo "skip=true" >> $GITHUB_OUTPUT
@@ -111,4 +114,4 @@ jobs:
111114
uses: ./.github/actions/test_gem
112115
with:
113116
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
114-
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.207.0
28+
- uses: ruby/setup-ruby@v1.214.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.207.0
15+
uses: ruby/setup-ruby@v1.214.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.207.0
16+
uses: ruby/setup-ruby@v1.214.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.207.0
25+
uses: ruby/setup-ruby@v1.214.0
2626
with:
2727
ruby-version: ${{ env.ruby_version }}
2828
- name: Checkout repo

‎.github/workflows/release-please.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
chmod 0600 $HOME/.gem/credentials
5151
printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
5252
53-
- uses: ruby/setup-ruby@v1.207.0
53+
- uses: ruby/setup-ruby@v1.214.0
5454
with:
5555
ruby-version: "3.1"
5656
bundler: latest

0 commit comments

Comments
 (0)