Skip to content

Commit 89144c2

Browse files
arielvalentinarielvalentin
authored
Merge branch 'main' into 1538-debug-log-container-detector
2 parents b107abd + 3ecb387 commit 89144c2

File tree

537 files changed

+17732
-2368
lines changed

Some content is hidden

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

537 files changed

+17732
-2368
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.239.0
87+
uses: ruby/setup-ruby@v1.258.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.239.0
98+
uses: ruby/setup-ruby@v1.258.0
9999
with:
100100
ruby-version: "${{ inputs.ruby }}"
101101
bundler: "latest"

‎.github/dependabot.yml‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,25 @@ updates:
55
directory: "/"
66
schedule:
77
interval: daily
8+
# Update all dependencies - processes from root to handle path dependencies correctly
89
- package-ecosystem: bundler
910
directory: "/"
1011
schedule:
1112
interval: weekly
13+
ignore:
14+
# Ignore internal instrumentation interdependencies managed via local paths in Gemfiles
15+
- dependency-name: "opentelemetry-instrumentation-*"
16+
- dependency-name: "opentelemetry-helpers-*"
17+
- dependency-name: "opentelemetry-processor-*"
18+
- dependency-name: "opentelemetry-propagator-*"
19+
- dependency-name: "opentelemetry-sampler-*"
20+
- dependency-name: "opentelemetry-resource-detector-*"
1221
groups:
13-
all-gems:
22+
production-dependencies:
23+
dependency-type: "production"
1424
patterns:
15-
- "**/Gemfile"
25+
- "*"
26+
development-dependencies:
27+
dependency-type: "development"
28+
patterns:
29+
- "*"

‎.github/workflows/check-spelling.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,15 @@ 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
14+
- uses: actions/checkout@v5
1215
- uses: streetsidesoftware/cspell-action@v7
1316
with:
1417
# Files should be consistent with check:spelling files

‎.github/workflows/ci-contrib.yml‎

Lines changed: 9 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
@@ -24,12 +27,13 @@ jobs:
2427
- sql
2528
- mysql
2629
- sql-obfuscation
30+
- sql-processor
2731
os:
2832
- ubuntu-latest
2933
name: "helpers-${{ matrix.gem }} / ${{ matrix.os }}"
3034
runs-on: ${{ matrix.os }}
3135
steps:
32-
- uses: actions/checkout@v4
36+
- uses: actions/checkout@v5
3337
- name: "Test Ruby 3.4"
3438
uses: ./.github/actions/test_gem
3539
with:
@@ -75,7 +79,7 @@ jobs:
7579
name: "propagator-${{ matrix.gem }} / ${{ matrix.os }}"
7680
runs-on: ${{ matrix.os }}
7781
steps:
78-
- uses: actions/checkout@v4
82+
- uses: actions/checkout@v5
7983
- name: "Test Ruby 3.4"
8084
uses: ./.github/actions/test_gem
8185
with:
@@ -120,7 +124,7 @@ jobs:
120124
name: "opentelemetry-${{ matrix.gem }} / ${{ matrix.os }}"
121125
runs-on: ${{ matrix.os }}
122126
steps:
123-
- uses: actions/checkout@v4
127+
- uses: actions/checkout@v5
124128
- name: "Test Ruby 3.4"
125129
uses: ./.github/actions/test_gem
126130
with:
@@ -163,7 +167,7 @@ jobs:
163167
name: "processors-${{ matrix.gem }} / ${{ matrix.os }}"
164168
runs-on: ${{ matrix.os }}
165169
steps:
166-
- uses: actions/checkout@v4
170+
- uses: actions/checkout@v5
167171
- name: "Test Ruby 3.4"
168172
uses: ./.github/actions/test_gem
169173
with:
@@ -206,7 +210,7 @@ jobs:
206210
name: "samplers-${{ matrix.gem }} / ${{ matrix.os }}"
207211
runs-on: ${{ matrix.os }}
208212
steps:
209-
- uses: actions/checkout@v4
213+
- uses: actions/checkout@v5
210214
- name: "Test Ruby 3.4"
211215
uses: ./.github/actions/test_gem
212216
with:

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

Lines changed: 11 additions & 8 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:
@@ -209,7 +212,7 @@ jobs:
209212
build: true
210213
services:
211214
redis:
212-
image: bitnami/redis:6.2
215+
image: bitnamilegacy/redis:6.2
213216
ports:
214217
- 6379:6379
215218
options: >-
@@ -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: 5 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
@@ -47,6 +50,7 @@ jobs:
4750
- httpx
4851
- koala
4952
- lmdb
53+
- logger
5054
- net_http
5155
- rack
5256
- rails
@@ -59,7 +63,7 @@ jobs:
5963
name: ${{ matrix.gem }} / ${{ matrix.os }}
6064
runs-on: ${{ matrix.os }}
6165
steps:
62-
- uses: actions/checkout@v4
66+
- uses: actions/checkout@v5
6367
- name: "Test Ruby 3.4"
6468
uses: ./.github/actions/test_gem
6569
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: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,18 @@ 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
1518
continue-on-error: true
1619
with:
1720
fix: false

‎.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:

0 commit comments

Comments
 (0)