Skip to content

Commit 86d5725

Browse files
Merge branch 'main' into xray-sampler-pr2
2 parents db51e10 + 5d5ce06 commit 86d5725

File tree

77 files changed

+4340
-748
lines changed

Some content is hidden

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

77 files changed

+4340
-748
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,4 +76,4 @@ end
7676
OpenTelemetry.tracer_provider.shutdown
7777
```
7878

79-
<sub>**Tip**: [React](https://github.blog/news-insights/product-news/add-reactions-to-pull-requests-issues-and-comments/) with 👍 to help prioritize this issue. Please use comments to provide useful context, avoiding `+1` or `me too`, to help us triage it. Learn more [here](https://opentelemetry.io/community/end-user/issue-participation/).</sub>
79+
<sub>**Tip**: [React](https://github.blog/news-insights/product-news/add-reactions-to-pull-requests-issues-and-comments/) with 👍 to help prioritize this issue. Please use comments to provide useful context, avoiding `+1` or `me too`, to help us triage it. Learn more [in our end user docs](https://opentelemetry.io/community/end-user/issue-participation/).</sub>

.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.254.0
87+
uses: ruby/setup-ruby@v1.255.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.254.0
98+
uses: ruby/setup-ruby@v1.255.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
@@ -11,7 +11,7 @@ jobs:
1111
name: SPELLING check
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v4
14+
- uses: actions/checkout@v5
1515
- uses: streetsidesoftware/cspell-action@v7
1616
with:
1717
# Files should be consistent with check:spelling files

.github/workflows/ci-contrib.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
name: "helpers-${{ matrix.gem }} / ${{ matrix.os }}"
3333
runs-on: ${{ matrix.os }}
3434
steps:
35-
- uses: actions/checkout@v4
35+
- uses: actions/checkout@v5
3636
- name: "Test Ruby 3.4"
3737
uses: ./.github/actions/test_gem
3838
with:
@@ -78,7 +78,7 @@ jobs:
7878
name: "propagator-${{ matrix.gem }} / ${{ matrix.os }}"
7979
runs-on: ${{ matrix.os }}
8080
steps:
81-
- uses: actions/checkout@v4
81+
- uses: actions/checkout@v5
8282
- name: "Test Ruby 3.4"
8383
uses: ./.github/actions/test_gem
8484
with:
@@ -123,7 +123,7 @@ jobs:
123123
name: "opentelemetry-${{ matrix.gem }} / ${{ matrix.os }}"
124124
runs-on: ${{ matrix.os }}
125125
steps:
126-
- uses: actions/checkout@v4
126+
- uses: actions/checkout@v5
127127
- name: "Test Ruby 3.4"
128128
uses: ./.github/actions/test_gem
129129
with:
@@ -166,7 +166,7 @@ jobs:
166166
name: "processors-${{ matrix.gem }} / ${{ matrix.os }}"
167167
runs-on: ${{ matrix.os }}
168168
steps:
169-
- uses: actions/checkout@v4
169+
- uses: actions/checkout@v5
170170
- name: "Test Ruby 3.4"
171171
uses: ./.github/actions/test_gem
172172
with:
@@ -209,7 +209,7 @@ jobs:
209209
name: "samplers-${{ matrix.gem }} / ${{ matrix.os }}"
210210
runs-on: ${{ matrix.os }}
211211
steps:
212-
- uses: actions/checkout@v4
212+
- uses: actions/checkout@v5
213213
- name: "Test Ruby 3.4"
214214
uses: ./.github/actions/test_gem
215215
with:

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
name: other / ${{ matrix.gem }} / ${{ matrix.os }}
3232
runs-on: ${{ matrix.os }}
3333
steps:
34-
- uses: actions/checkout@v4
34+
- uses: actions/checkout@v5
3535
- name: "Test Ruby 3.4"
3636
uses: ./.github/actions/test_gem
3737
with:
@@ -83,7 +83,7 @@ jobs:
8383
name: mysql / ${{ matrix.gem }} / ${{ matrix.os }}
8484
runs-on: ${{ matrix.os }}
8585
steps:
86-
- uses: actions/checkout@v4
86+
- uses: actions/checkout@v5
8787
- name: "Test Ruby 3.4"
8888
uses: ./.github/actions/test_gem
8989
with:
@@ -126,7 +126,7 @@ jobs:
126126
name: kafka / ${{ matrix.gem }} / ${{ matrix.os }}
127127
runs-on: ${{ matrix.os }}
128128
steps:
129-
- uses: actions/checkout@v4
129+
- uses: actions/checkout@v5
130130
- name: "Test Ruby 3.4"
131131
uses: ./.github/actions/test_gem
132132
with:
@@ -185,7 +185,7 @@ jobs:
185185
name: redis / ${{ matrix.gem }} / ${{ matrix.os }}
186186
runs-on: ${{ matrix.os }}
187187
steps:
188-
- uses: actions/checkout@v4
188+
- uses: actions/checkout@v5
189189
- name: "Test Ruby 3.4"
190190
uses: ./.github/actions/test_gem
191191
with:
@@ -235,7 +235,7 @@ jobs:
235235
name: postgresql / ${{ matrix.gem }} / ${{ matrix.os }}
236236
runs-on: ${{ matrix.os }}
237237
steps:
238-
- uses: actions/checkout@v4
238+
- uses: actions/checkout@v5
239239
- name: "Test Ruby 3.4"
240240
uses: ./.github/actions/test_gem
241241
with:
@@ -282,7 +282,7 @@ jobs:
282282
name: rabbitmq / ${{ matrix.gem }} / ${{ matrix.os }}
283283
runs-on: ${{ matrix.os }}
284284
steps:
285-
- uses: actions/checkout@v4
285+
- uses: actions/checkout@v5
286286
- name: "Test Ruby 3.4"
287287
uses: ./.github/actions/test_gem
288288
with:

.github/workflows/ci-instrumentation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
name: ${{ matrix.gem }} / ${{ matrix.os }}
6363
runs-on: ${{ matrix.os }}
6464
steps:
65-
- uses: actions/checkout@v4
65+
- uses: actions/checkout@v5
6666
- name: "Test Ruby 3.4"
6767
uses: ./.github/actions/test_gem
6868
with:

.github/workflows/ci-markdown-link.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
pull-requests: write # required for posting PR review comments
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: actions/checkout@v4
17+
- uses: actions/checkout@v5
1818

1919
# equivalent cli: linkspector check
2020
- name: Run linkspector

.github/workflows/ci-markdownlint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
markdownlint-check:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v4
13+
- uses: actions/checkout@v5
1414

1515
# equivalent cli: markdownlint-cli2 "**/*.md" "#**/CHANGELOG.md" --config .markdownlint.json
1616
- name: "Markdown Lint Check"

.github/workflows/fossa.yml

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,34 @@ jobs:
1313
if: ${{ github.repository == 'open-telemetry/opentelemetry-ruby-contrib' }}
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
16+
- uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 # v4.2.2
17+
18+
- name: Install Ruby 3.4
19+
uses: ruby/[email protected]
20+
with:
21+
ruby-version: 3.4
22+
- name: Generate Gemfile.lock
23+
run: |
24+
echo "Finding all Gemfiles in the project..."
25+
echo "======================================="
26+
ORIGINAL_DIR=$(pwd)
27+
28+
find . -type f -name "Gemfile" -not -path "*/example/*" -not -path "*/releases/*" | sort | while read gemfile; do
29+
gemfile_dir=$(dirname "$gemfile")
30+
31+
# Change to the Gemfile's directory
32+
echo "Changing to directory: $gemfile_dir"
33+
34+
cd "$gemfile_dir" || continue
35+
36+
echo "Current directory: $(pwd)"
37+
echo "Creating lock file for: $gemfile"
38+
39+
# Generate the gemlock files
40+
bundle lock || echo "Warning: Failed to generate lock file for $gemfile, continuing..."
41+
42+
cd "$ORIGINAL_DIR" || exit 1
43+
done
1744
1845
- uses: fossas/fossa-action@3ebcea1862c6ffbd5cf1b4d0bd6b3fe7bd6f2cac # v1.7.0
1946
with:

.github/workflows/installation-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ jobs:
2525
name: ${{ matrix.ruby-version }}
2626
runs-on: ubuntu-latest
2727
steps:
28-
- uses: actions/checkout@v4
28+
- uses: actions/checkout@v5
2929
# ATTENTION: Dependabot does not know how to update shared actions file.
3030
# If you see it update setup-ruby here also update it as part of actions/test_gem/action.yml
31-
- uses: ruby/setup-ruby@v1.254.0
31+
- uses: ruby/setup-ruby@v1.255.0
3232
with:
3333
ruby-version: ${{ matrix.ruby-version }}
3434
- name: "Install Latest Gem Versions on ${{ matrix.ruby-version }}"

0 commit comments

Comments
 (0)