Skip to content

Commit 960e19a

Browse files
Merge branch 'main' into xray-lambda-propagator
2 parents 74884b1 + 26b6e2a commit 960e19a

File tree

59 files changed

+1731
-108
lines changed

Some content is hidden

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

59 files changed

+1731
-108
lines changed

.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.229.0
87+
uses: ruby/setup-ruby@v1.231.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.229.0
98+
uses: ruby/setup-ruby@v1.231.0
9999
with:
100100
ruby-version: "${{ inputs.ruby }}"
101101
bundler: "latest"

.github/workflows/ci-contrib.yml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,3 +193,46 @@ jobs:
193193
with:
194194
gem: "opentelemetry-processor-${{ matrix.gem }}"
195195
ruby: "jruby-9.4.12.0"
196+
197+
samplers:
198+
strategy:
199+
fail-fast: false
200+
matrix:
201+
gem:
202+
- xray
203+
os:
204+
- ubuntu-latest
205+
name: "samplers-${{ matrix.gem }} / ${{ matrix.os }}"
206+
runs-on: ${{ matrix.os }}
207+
steps:
208+
- uses: actions/checkout@v4
209+
- name: "Test Ruby 3.4"
210+
uses: ./.github/actions/test_gem
211+
with:
212+
gem: "opentelemetry-sampler-${{ matrix.gem }}"
213+
ruby: "3.4"
214+
- name: "Test Ruby 3.3"
215+
uses: ./.github/actions/test_gem
216+
with:
217+
gem: "opentelemetry-sampler-${{ matrix.gem }}"
218+
ruby: "3.3"
219+
- name: "Test Ruby 3.2"
220+
uses: ./.github/actions/test_gem
221+
with:
222+
gem: "opentelemetry-sampler-${{ matrix.gem }}"
223+
ruby: "3.2"
224+
- name: "Test Ruby 3.1"
225+
uses: ./.github/actions/test_gem
226+
with:
227+
gem: "opentelemetry-sampler-${{ matrix.gem }}"
228+
ruby: "3.1"
229+
yard: true
230+
rubocop: true
231+
coverage: true
232+
build: true
233+
- name: "Test JRuby"
234+
if: "${{ matrix.os == 'ubuntu-latest' }}"
235+
uses: ./.github/actions/test_gem
236+
with:
237+
gem: "opentelemetry-sampler-${{ matrix.gem }}"
238+
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.229.0
28+
- uses: ruby/setup-ruby@v1.231.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.229.0
15+
uses: ruby/setup-ruby@v1.231.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.229.0
16+
uses: ruby/setup-ruby@v1.231.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.229.0
25+
uses: ruby/setup-ruby@v1.231.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.229.0
53+
- uses: ruby/setup-ruby@v1.231.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.229.0
15+
uses: ruby/setup-ruby@v1.231.0
1616
with:
1717
ruby-version: ${{ env.ruby_version }}
1818
- name: Checkout repo

.github/workflows/release-request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- name: Install Ruby ${{ env.ruby_version }}
19-
uses: ruby/setup-ruby@v1.229.0
19+
uses: ruby/setup-ruby@v1.231.0
2020
with:
2121
ruby-version: ${{ env.ruby_version }}
2222
- name: Checkout repo

.github/workflows/release-retry.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ubuntu-latest
2020
steps:
2121
- name: Install Ruby ${{ env.ruby_version }}
22-
uses: ruby/setup-ruby@v1.229.0
22+
uses: ruby/setup-ruby@v1.231.0
2323
with:
2424
ruby-version: ${{ env.ruby_version }}
2525
- name: Checkout repo

0 commit comments

Comments
 (0)