Skip to content

Commit cfe9734

Browse files
arielvalentinarielvalentin
authored
Merge branch 'main' into redis-5.x
2 parents 8090e29 + fb9cdf4 commit cfe9734

File tree

117 files changed

+1851
-293
lines changed

Some content is hidden

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

117 files changed

+1851
-293
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.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.213.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/workflows/ci-contrib.yml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,14 @@ jobs:
4747
ruby: "3.1"
4848
yard: true
4949
rubocop: true
50+
coverage: true
5051
build: true
5152
- name: "Test JRuby"
5253
if: "${{ matrix.os == 'ubuntu-latest' }}"
5354
uses: ./.github/actions/test_gem
5455
with:
5556
gem: "opentelemetry-helpers-${{ matrix.gem }}"
56-
ruby: "jruby-9.4.9.0"
57+
ruby: "jruby-9.4.10.0"
5758

5859
propagators:
5960
strategy:
@@ -92,7 +93,7 @@ jobs:
9293
uses: ./.github/actions/test_gem
9394
with:
9495
gem: "opentelemetry-propagator-${{ matrix.gem }}"
95-
ruby: "jruby-9.4.9.0"
96+
ruby: "jruby-9.4.10.0"
9697

9798
resource-detectors:
9899
strategy:
@@ -125,13 +126,14 @@ jobs:
125126
ruby: "3.1"
126127
yard: true
127128
rubocop: true
129+
coverage: true
128130
build: true
129131
- name: "Test JRuby"
130132
if: "${{ matrix.os == 'ubuntu-latest' }}"
131133
uses: ./.github/actions/test_gem
132134
with:
133135
gem: "opentelemetry-${{ matrix.gem }}"
134-
ruby: "jruby-9.4.9.0"
136+
ruby: "jruby-9.4.10.0"
135137

136138
processors:
137139
strategy:
@@ -162,10 +164,11 @@ jobs:
162164
ruby: "3.1"
163165
yard: true
164166
rubocop: true
167+
coverage: true
165168
build: true
166169
- name: "Test JRuby"
167170
if: "${{ matrix.os == 'ubuntu-latest' && steps.jruby_skip.outputs.skip == 'false' }}"
168171
uses: ./.github/actions/test_gem
169172
with:
170173
gem: "opentelemetry-processor-${{ matrix.gem }}"
171-
ruby: "jruby-9.4.9.0"
174+
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
@@ -46,12 +46,13 @@ jobs:
4646
ruby: "3.1"
4747
yard: true
4848
rubocop: true
49+
coverage: true
4950
build: true
5051
- name: "Test JRuby"
5152
uses: ./.github/actions/test_gem
5253
with:
5354
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
54-
ruby: "jruby-9.4.9.0"
55+
ruby: "jruby-9.4.10.0"
5556
services:
5657
memcached:
5758
image: memcached:alpine
@@ -92,6 +93,7 @@ jobs:
9293
ruby: "3.1"
9394
yard: true
9495
rubocop: true
96+
coverage: true
9597
build: true
9698
services:
9799
mysql:
@@ -129,6 +131,7 @@ jobs:
129131
ruby: "3.1"
130132
yard: true
131133
rubocop: true
134+
coverage: true
132135
build: true
133136
services:
134137
zookeeper:
@@ -182,6 +185,7 @@ jobs:
182185
ruby: "3.1"
183186
yard: true
184187
rubocop: true
188+
coverage: true
185189
build: true
186190
services:
187191
redis:
@@ -226,6 +230,7 @@ jobs:
226230
ruby: "3.1"
227231
yard: true
228232
rubocop: true
233+
coverage: true
229234
build: true
230235
services:
231236
postgres:
@@ -267,6 +272,7 @@ jobs:
267272
ruby: "3.1"
268273
yard: true
269274
rubocop: true
275+
coverage: true
270276
build: true
271277
services:
272278
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
@@ -72,10 +73,11 @@ jobs:
7273
- name: "Test Ruby 3.1"
7374
uses: ./.github/actions/test_gem
7475
with:
75-
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
76+
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
7677
ruby: "3.1"
7778
yard: true
7879
rubocop: true
80+
coverage: true
7981
build: true
8082
- name: "JRuby Filter"
8183
id: jruby_skip
@@ -86,6 +88,7 @@ jobs:
8688
[[ "${{ matrix.gem }}" == "action_view" ]] && echo "skip=true" >> $GITHUB_OUTPUT
8789
[[ "${{ matrix.gem }}" == "active_model_serializers" ]] && echo "skip=true" >> $GITHUB_OUTPUT
8890
[[ "${{ matrix.gem }}" == "active_record" ]] && echo "skip=true" >> $GITHUB_OUTPUT
91+
[[ "${{ matrix.gem }}" == "active_storage" ]] && echo "skip=true" >> $GITHUB_OUTPUT
8992
[[ "${{ matrix.gem }}" == "active_support" ]] && echo "skip=true" >> $GITHUB_OUTPUT
9093
[[ "${{ matrix.gem }}" == "aws_sdk" ]] && echo "skip=true" >> $GITHUB_OUTPUT
9194
[[ "${{ matrix.gem }}" == "aws_lambda" ]] && echo "skip=true" >> $GITHUB_OUTPUT
@@ -106,4 +109,4 @@ jobs:
106109
uses: ./.github/actions/test_gem
107110
with:
108111
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
109-
ruby: "jruby-9.4.9.0"
112+
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.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.213.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.213.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.213.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.213.0
53+
- uses: ruby/setup-ruby@v1.214.0
5454
with:
5555
ruby-version: "3.1"
5656
bundler: latest

‎.github/workflows/release-request-weekly.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.214.0
1616
with:
1717
ruby-version: ${{ env.ruby_version }}
1818
- name: Checkout repo

0 commit comments

Comments
 (0)