Skip to content

Commit 834855d

Browse files
committed
merge
2 parents 2c880da + ca00ab0 commit 834855d

File tree

309 files changed

+6615
-1111
lines changed

Some content is hidden

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

309 files changed

+6615
-1111
lines changed

.cspell.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ words:
3838
- gemfile
3939
- Gitter
4040
- gruf
41+
- hibachrach
4142
- HTTPX
4243
- httpx
4344
- instrumenter
@@ -82,3 +83,4 @@ words:
8283
- Xuan
8384
- yardoc
8485
- rackup
86+
- 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.239.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.239.0
9999
with:
100100
ruby-version: "${{ inputs.ruby }}"
101101
bundler: "latest"

.github/workflows/check-spelling.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- uses: actions/checkout@v4
12-
- uses: streetsidesoftware/cspell-action@v6
12+
- uses: streetsidesoftware/cspell-action@v7
1313
with:
1414
# Files should be consistent with check:spelling files
1515
files: |

.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
@@ -193,6 +195,49 @@ jobs:
193195
gem: "opentelemetry-processor-${{ matrix.gem }}"
194196
ruby: "jruby-9.4.12.0"
195197

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"
240+
196241
zero-code-instrumentation:
197242
strategy:
198243
fail-fast: false

.github/workflows/ci-markdownlint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ jobs:
1111

1212
# equivalent cli: markdownlint-cli2 "**/*.md" "#**/CHANGELOG.md" --config .markdownlint.json
1313
- name: "Markdown Lint Check"
14-
uses: DavidAnson/markdownlint-cli2-action@v19
14+
uses: DavidAnson/markdownlint-cli2-action@v20
15+
continue-on-error: true
1516
with:
1617
fix: false
1718
globs: |
1819
**/*.md
1920
!**/CHANGELOG.md
20-
continue-on-error: true

.github/workflows/fossa.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
steps:
1616
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1717

18-
- uses: fossas/fossa-action@93a52ecf7c3ac7eb40f5de77fd69b1a19524de94 # v1.5.0
18+
- uses: fossas/fossa-action@3ebcea1862c6ffbd5cf1b4d0bd6b3fe7bd6f2cac # v1.7.0
1919
with:
2020
api-key: ${{secrets.FOSSA_API_KEY}}
2121
team: OpenTelemetry

.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.244.0
2929
with:
3030
ruby-version: ${{ matrix.ruby-version }}
3131
- name: "Install Latest Gem Versions on ${{ matrix.ruby-version }}"
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
name: OSSF Scorecard
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
schedule:
8+
- cron: "18 23 * * 6" # once a week
9+
workflow_dispatch:
10+
11+
permissions: read-all
12+
13+
jobs:
14+
analysis:
15+
if: ${{ github.repository == 'open-telemetry/opentelemetry-ruby-contrib' }}
16+
runs-on: ubuntu-latest
17+
permissions:
18+
# Needed for Code scanning upload
19+
security-events: write
20+
# Needed for GitHub OIDC token if publish_results is true
21+
id-token: write
22+
steps:
23+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
24+
with:
25+
persist-credentials: false
26+
27+
- uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
28+
with:
29+
results_file: results.sarif
30+
results_format: sarif
31+
publish_results: true
32+
33+
# Upload the results as artifacts (optional). Commenting out will disable
34+
# uploads of run results in SARIF format to the repository Actions tab.
35+
# https://docs.github.com/en/actions/advanced-guides/storing-workflow-data-as-artifacts
36+
- name: "Upload artifact"
37+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
38+
with:
39+
name: SARIF file
40+
path: results.sarif
41+
retention-days: 5
42+
43+
# Upload the results to GitHub's code scanning dashboard (optional).
44+
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
45+
- name: "Upload to code-scanning"
46+
uses: github/codeql-action/upload-sarif@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
47+
with:
48+
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.244.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.244.0
1717
with:
1818
ruby-version: ${{ env.ruby_version }}
1919
- name: Checkout repo

0 commit comments

Comments
 (0)