Skip to content

Commit f9f8172

Browse files
Merge branch 'main' into remove-simplecov-require
2 parents 5150701 + e006eb6 commit f9f8172

File tree

124 files changed

+4640
-312
lines changed

Some content is hidden

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

124 files changed

+4640
-312
lines changed

.cspell.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,3 +82,4 @@ words:
8282
- webmocks
8383
- Xuan
8484
- yardoc
85+
- traceparent

.github/actions/test_gem/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ runs:
8484
# ...but not for appraisals, sadly.
8585
- name: Install Ruby ${{ inputs.ruby }} with dependencies
8686
if: "${{ steps.setup.outputs.appraisals == 'false' }}"
87-
uses: ruby/setup-ruby@v1.221.0
87+
uses: ruby/setup-ruby@v1.237.0
8888
with:
8989
ruby-version: "${{ inputs.ruby }}"
9090
working-directory: "${{ steps.setup.outputs.gem_dir }}"
@@ -95,7 +95,7 @@ runs:
9595
# If we're using appraisals, do it all manually.
9696
- name: Install Ruby ${{ inputs.ruby }} without dependencies
9797
if: "${{ steps.setup.outputs.appraisals == 'true' }}"
98-
uses: ruby/setup-ruby@v1.221.0
98+
uses: ruby/setup-ruby@v1.237.0
9999
with:
100100
ruby-version: "${{ inputs.ruby }}"
101101
bundler: "latest"

.github/workflows/ci-contrib.yml

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ jobs:
6969
- ottrace
7070
- vitess
7171
- xray
72+
- google_cloud_trace_context
7273
os:
7374
- ubuntu-latest
7475
name: "propagator-${{ matrix.gem }} / ${{ matrix.os }}"
@@ -110,6 +111,7 @@ jobs:
110111
fail-fast: false
111112
matrix:
112113
gem:
114+
- resource-detector-aws
113115
- resource-detector-azure
114116
- resource-detector-container
115117
- resource-detector-google_cloud_platform
@@ -192,3 +194,46 @@ jobs:
192194
with:
193195
gem: "opentelemetry-processor-${{ matrix.gem }}"
194196
ruby: "jruby-9.4.12.0"
197+
198+
samplers:
199+
strategy:
200+
fail-fast: false
201+
matrix:
202+
gem:
203+
- xray
204+
os:
205+
- ubuntu-latest
206+
name: "samplers-${{ matrix.gem }} / ${{ matrix.os }}"
207+
runs-on: ${{ matrix.os }}
208+
steps:
209+
- uses: actions/checkout@v4
210+
- name: "Test Ruby 3.4"
211+
uses: ./.github/actions/test_gem
212+
with:
213+
gem: "opentelemetry-sampler-${{ matrix.gem }}"
214+
ruby: "3.4"
215+
- name: "Test Ruby 3.3"
216+
uses: ./.github/actions/test_gem
217+
with:
218+
gem: "opentelemetry-sampler-${{ matrix.gem }}"
219+
ruby: "3.3"
220+
- name: "Test Ruby 3.2"
221+
uses: ./.github/actions/test_gem
222+
with:
223+
gem: "opentelemetry-sampler-${{ matrix.gem }}"
224+
ruby: "3.2"
225+
- name: "Test Ruby 3.1"
226+
uses: ./.github/actions/test_gem
227+
with:
228+
gem: "opentelemetry-sampler-${{ matrix.gem }}"
229+
ruby: "3.1"
230+
yard: true
231+
rubocop: true
232+
coverage: true
233+
build: true
234+
- name: "Test JRuby"
235+
if: "${{ matrix.os == 'ubuntu-latest' }}"
236+
uses: ./.github/actions/test_gem
237+
with:
238+
gem: "opentelemetry-sampler-${{ matrix.gem }}"
239+
ruby: "jruby-9.4.12.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.221.0
28+
- uses: ruby/setup-ruby@v1.237.0
2929
with:
3030
ruby-version: ${{ matrix.ruby-version }}
3131
- name: "Install Latest Gem Versions on ${{ matrix.ruby-version }}"

.github/workflows/ossf-scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@ jobs:
4343
# Upload the results to GitHub's code scanning dashboard (optional).
4444
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
4545
- name: "Upload to code-scanning"
46-
uses: github/codeql-action/upload-sarif@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
46+
uses: github/codeql-action/upload-sarif@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
4747
with:
4848
sarif_file: results.sarif

.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.221.0
15+
uses: ruby/setup-ruby@v1.237.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.221.0
16+
uses: ruby/setup-ruby@v1.237.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.221.0
25+
uses: ruby/setup-ruby@v1.237.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.221.0
53+
- uses: ruby/setup-ruby@v1.237.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.221.0
15+
uses: ruby/setup-ruby@v1.237.0
1616
with:
1717
ruby-version: ${{ env.ruby_version }}
1818
- name: Checkout repo

0 commit comments

Comments
 (0)