Skip to content

Commit 7ec9182

Browse files
authored
Merge branch 'main' into update-suppress-config
2 parents f8f0694 + 36ea12c commit 7ec9182

File tree

315 files changed

+13642
-2029
lines changed

Some content is hidden

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

315 files changed

+13642
-2029
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,3 +75,5 @@ end
7575

7676
OpenTelemetry.tracer_provider.shutdown
7777
```
78+
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.238.0
87+
uses: ruby/setup-ruby@v1.256.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.238.0
98+
uses: ruby/setup-ruby@v1.256.0
9999
with:
100100
ruby-version: "${{ inputs.ruby }}"
101101
bundler: "latest"

.github/workflows/check-spelling.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,16 @@ name: Spelling
33
on:
44
pull_request:
55

6+
permissions:
7+
contents: read
8+
69
jobs:
710
spelling-check:
811
name: SPELLING check
912
runs-on: ubuntu-latest
1013
steps:
11-
- uses: actions/checkout@v4
12-
- uses: streetsidesoftware/cspell-action@v6
14+
- uses: actions/checkout@v5
15+
- uses: streetsidesoftware/cspell-action@v7
1316
with:
1417
# Files should be consistent with check:spelling files
1518
files: |

.github/workflows/ci-contrib.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ on:
1111
schedule:
1212
- cron: "0 0 * * *"
1313

14+
permissions:
15+
contents: read
16+
1417
concurrency:
1518
group: ${{ github.workflow }}-${{ github.event.pull_request.number }} # Ensure that only one instance of this workflow is running per Pull Request
1619
cancel-in-progress: true # Cancel any previous runs of this workflow
@@ -29,7 +32,7 @@ jobs:
2932
name: "helpers-${{ matrix.gem }} / ${{ matrix.os }}"
3033
runs-on: ${{ matrix.os }}
3134
steps:
32-
- uses: actions/checkout@v4
35+
- uses: actions/checkout@v5
3336
- name: "Test Ruby 3.4"
3437
uses: ./.github/actions/test_gem
3538
with:
@@ -75,7 +78,7 @@ jobs:
7578
name: "propagator-${{ matrix.gem }} / ${{ matrix.os }}"
7679
runs-on: ${{ matrix.os }}
7780
steps:
78-
- uses: actions/checkout@v4
81+
- uses: actions/checkout@v5
7982
- name: "Test Ruby 3.4"
8083
uses: ./.github/actions/test_gem
8184
with:
@@ -120,7 +123,7 @@ jobs:
120123
name: "opentelemetry-${{ matrix.gem }} / ${{ matrix.os }}"
121124
runs-on: ${{ matrix.os }}
122125
steps:
123-
- uses: actions/checkout@v4
126+
- uses: actions/checkout@v5
124127
- name: "Test Ruby 3.4"
125128
uses: ./.github/actions/test_gem
126129
with:
@@ -163,7 +166,7 @@ jobs:
163166
name: "processors-${{ matrix.gem }} / ${{ matrix.os }}"
164167
runs-on: ${{ matrix.os }}
165168
steps:
166-
- uses: actions/checkout@v4
169+
- uses: actions/checkout@v5
167170
- name: "Test Ruby 3.4"
168171
uses: ./.github/actions/test_gem
169172
with:
@@ -206,7 +209,7 @@ jobs:
206209
name: "samplers-${{ matrix.gem }} / ${{ matrix.os }}"
207210
runs-on: ${{ matrix.os }}
208211
steps:
209-
- uses: actions/checkout@v4
212+
- uses: actions/checkout@v5
210213
- name: "Test Ruby 3.4"
211214
uses: ./.github/actions/test_gem
212215
with:

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

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ on:
1111
schedule:
1212
- cron: "0 0 * * *"
1313

14+
permissions:
15+
contents: read
16+
1417
concurrency:
1518
group: ${{ github.workflow }}-${{ github.event.pull_request.number }} # Ensure that only one instance of this workflow is running per Pull Request
1619
cancel-in-progress: true # Cancel any previous runs of this workflow
@@ -28,7 +31,7 @@ jobs:
2831
name: other / ${{ matrix.gem }} / ${{ matrix.os }}
2932
runs-on: ${{ matrix.os }}
3033
steps:
31-
- uses: actions/checkout@v4
34+
- uses: actions/checkout@v5
3235
- name: "Test Ruby 3.4"
3336
uses: ./.github/actions/test_gem
3437
with:
@@ -80,7 +83,7 @@ jobs:
8083
name: mysql / ${{ matrix.gem }} / ${{ matrix.os }}
8184
runs-on: ${{ matrix.os }}
8285
steps:
83-
- uses: actions/checkout@v4
86+
- uses: actions/checkout@v5
8487
- name: "Test Ruby 3.4"
8588
uses: ./.github/actions/test_gem
8689
with:
@@ -123,7 +126,7 @@ jobs:
123126
name: kafka / ${{ matrix.gem }} / ${{ matrix.os }}
124127
runs-on: ${{ matrix.os }}
125128
steps:
126-
- uses: actions/checkout@v4
129+
- uses: actions/checkout@v5
127130
- name: "Test Ruby 3.4"
128131
uses: ./.github/actions/test_gem
129132
with:
@@ -157,7 +160,7 @@ jobs:
157160
ZOOKEEPER_CLIENT_PORT: 2181
158161
ZOOKEEPER_TICK_TIME: 2000
159162
kafka:
160-
image: confluentinc/cp-kafka:latest
163+
image: confluentinc/cp-kafka:7.9.1
161164
ports:
162165
- 9092:9092
163166
- 29092:29092
@@ -182,7 +185,7 @@ jobs:
182185
name: redis / ${{ matrix.gem }} / ${{ matrix.os }}
183186
runs-on: ${{ matrix.os }}
184187
steps:
185-
- uses: actions/checkout@v4
188+
- uses: actions/checkout@v5
186189
- name: "Test Ruby 3.4"
187190
uses: ./.github/actions/test_gem
188191
with:
@@ -232,7 +235,7 @@ jobs:
232235
name: postgresql / ${{ matrix.gem }} / ${{ matrix.os }}
233236
runs-on: ${{ matrix.os }}
234237
steps:
235-
- uses: actions/checkout@v4
238+
- uses: actions/checkout@v5
236239
- name: "Test Ruby 3.4"
237240
uses: ./.github/actions/test_gem
238241
with:
@@ -279,7 +282,7 @@ jobs:
279282
name: rabbitmq / ${{ matrix.gem }} / ${{ matrix.os }}
280283
runs-on: ${{ matrix.os }}
281284
steps:
282-
- uses: actions/checkout@v4
285+
- uses: actions/checkout@v5
283286
- name: "Test Ruby 3.4"
284287
uses: ./.github/actions/test_gem
285288
with:

.github/workflows/ci-instrumentation.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ on:
1111
schedule:
1212
- cron: "0 0 * * *"
1313

14+
permissions:
15+
contents: read
16+
1417
concurrency:
1518
group: ${{ github.workflow }}-${{ github.event.pull_request.number }} # Ensure that only one instance of this workflow is running per Pull Request
1619
cancel-in-progress: true # Cancel any previous runs of this workflow
@@ -59,7 +62,7 @@ jobs:
5962
name: ${{ matrix.gem }} / ${{ matrix.os }}
6063
runs-on: ${{ matrix.os }}
6164
steps:
62-
- uses: actions/checkout@v4
65+
- uses: actions/checkout@v5
6366
- name: "Test Ruby 3.4"
6467
uses: ./.github/actions/test_gem
6568
with:

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,16 @@ on:
55
paths:
66
- '**/*.md'
77

8+
permissions:
9+
contents: read
10+
811
jobs:
912
markdown-link-check:
13+
permissions:
14+
pull-requests: write # required for posting PR review comments
1015
runs-on: ubuntu-latest
1116
steps:
12-
- uses: actions/checkout@v4
17+
- uses: actions/checkout@v5
1318

1419
# equivalent cli: linkspector check
1520
- name: Run linkspector

.github/workflows/ci-markdownlint.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,21 @@ name: Markdown Lint Check
33
on:
44
pull_request:
55

6+
permissions:
7+
contents: read
8+
69
jobs:
710
markdownlint-check:
811
runs-on: ubuntu-latest
912
steps:
10-
- uses: actions/checkout@v4
13+
- uses: actions/checkout@v5
1114

1215
# equivalent cli: markdownlint-cli2 "**/*.md" "#**/CHANGELOG.md" --config .markdownlint.json
1316
- name: "Markdown Lint Check"
14-
uses: DavidAnson/markdownlint-cli2-action@v19
17+
uses: DavidAnson/markdownlint-cli2-action@v20
18+
continue-on-error: true
1519
with:
1620
fix: false
1721
globs: |
1822
**/*.md
1923
!**/CHANGELOG.md
20-
continue-on-error: true

.github/workflows/conventional-commits.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ on:
1111

1212
permissions:
1313
contents: read
14-
pull-requests: read
1514

1615
concurrency:
1716
group: ${{ github.workflow }}-${{ github.event.pull_request.number }} # Ensure that only one instance of this workflow is running per Pull Request
@@ -22,7 +21,7 @@ jobs:
2221
name: Conventional Commits Validation
2322
runs-on: ubuntu-latest
2423
steps:
25-
- uses: dev-build-deploy/[email protected].0
24+
- uses: dev-build-deploy/[email protected].3
2625
env:
2726
FORCE_COLOR: 3
2827
with:

.github/workflows/fossa.yml

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,36 @@ 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
1717

18-
- uses: fossas/fossa-action@c0a7d013f84c8ee5e910593186598625513cc1e4 # v1.6.0
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
44+
45+
- uses: fossas/fossa-action@3ebcea1862c6ffbd5cf1b4d0bd6b3fe7bd6f2cac # v1.7.0
1946
with:
2047
api-key: ${{secrets.FOSSA_API_KEY}}
2148
team: OpenTelemetry

0 commit comments

Comments
 (0)