Skip to content

Commit deaeaab

Browse files
emdnetoemdneto
authored
Merge branch 'main' into issue4683
2 parents 5b7690b + 23aad5e commit deaeaab

File tree

34 files changed

+732
-536
lines changed

34 files changed

+732
-536
lines changed

‎.github/scripts/use-cla-approved-github-bot.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/bin/bash -e
22

3-
git config user.name opentelemetrybot
4-
git config user.email 107717825+opentelemetrybot@users.noreply.github.com
3+
git config user.name otelbot
4+
git config user.email 197425009+otelbot@users.noreply.github.com

‎.github/workflows/backport.yml‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,14 @@ on:
66
description: "The pull request # to backport"
77
required: true
88

9+
permissions:
10+
contents: read
11+
912
jobs:
1013
backport:
1114
runs-on: ubuntu-latest
15+
permissions:
16+
contents: write # required for pushing changes
1217
steps:
1318
- run: |
1419
if [[ ! $GITHUB_REF_NAME =~ ^release/v[0-9]+\.[0-9]+\.x-0\.[0-9]+bx$ ]]; then
@@ -24,16 +29,22 @@ jobs:
2429
- name: Use CLA approved github bot
2530
run: .github/scripts/use-cla-approved-github-bot.sh
2631

32+
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
33+
id: otelbot-token
34+
with:
35+
app-id: ${{ vars.OTELBOT_APP_ID }}
36+
private-key: ${{ secrets.OTELBOT_PRIVATE_KEY }}
37+
2738
- name: Create pull request
2839
env:
2940
NUMBER: ${{ github.event.inputs.number }}
3041
# not using secrets.GITHUB_TOKEN since pull requests from that token do not run workflows
31-
GITHUB_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}
42+
GITHUB_TOKEN: ${{ steps.otelbot-token.outputs.token }}
3243
run: |
3344
commit=$(gh pr view $NUMBER --json mergeCommit --jq .mergeCommit.oid)
3445
title=$(gh pr view $NUMBER --json title --jq .title)
3546
36-
branch="opentelemetrybot/backport-${NUMBER}-to-${GITHUB_REF_NAME//\//-}"
47+
branch="otelbot/backport-${NUMBER}-to-${GITHUB_REF_NAME//\//-}"
3748
3849
git cherry-pick $commit
3950
git push origin HEAD:$branch

‎.github/workflows/benchmarks.yml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,13 @@ on:
44
push:
55
branches: [ main ]
66

7+
permissions:
8+
contents: read
9+
710
jobs:
811
sdk-benchmarks:
12+
permissions:
13+
contents: write # required for pushing to gh-pages
914
runs-on: equinix-bare-metal
1015
steps:
1116
- name: Checkout Core Repo @ SHA - ${{ github.sha }}
@@ -16,7 +21,7 @@ jobs:
1621
python-version: "3.13"
1722
architecture: 'x64'
1823
- name: Install tox
19-
run: pip install tox
24+
run: pip install tox-uv
2025
- name: Run tox
2126
run: tox -e benchmark-opentelemetry-sdk -- -k opentelemetry-sdk/benchmarks --benchmark-json=opentelemetry-sdk/output.json
2227
- name: Report on SDK benchmark results

‎.github/workflows/changelog.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,15 @@ on:
1010
branches:
1111
- main
1212

13+
permissions:
14+
contents: read
15+
1316
jobs:
1417
changelog:
1518
runs-on: ubuntu-latest
1619
if: |
1720
!contains(github.event.pull_request.labels.*.name, 'Skip Changelog')
18-
&& github.actor != 'opentelemetrybot'
21+
&& github.actor != 'otelbot[bot]'
1922
2023
steps:
2124
- uses: actions/checkout@v4

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ on:
44
branches: [ main ]
55
pull_request:
66

7+
permissions:
8+
contents: read
9+
710
jobs:
811
changedfiles:
912
name: changed files
@@ -24,7 +27,7 @@ jobs:
2427
runs-on: ubuntu-latest
2528
needs: changedfiles
2629
if: |
27-
github.event.pull_request.user.login != 'opentelemetrybot' && github.event_name == 'pull_request'
30+
github.event.pull_request.user.login != 'otelbot[bot]' && github.event_name == 'pull_request'
2831
&& ${{needs.changedfiles.outputs.md}}
2932
steps:
3033
- name: Checkout Repo

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,13 @@ on:
1414
# * * * * *
1515
- cron: '30 1 * * *'
1616

17+
permissions:
18+
contents: read
19+
1720
jobs:
1821
CodeQL-Build:
22+
permissions:
23+
security-events: write # for github/codeql-action/analyze to upload SARIF results
1924
runs-on: ubuntu-latest
2025

2126
steps:

‎.github/workflows/contrib.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ on:
66
- 'release/*'
77
pull_request:
88

9+
permissions:
10+
contents: read
11+
912
concurrency:
1013
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
1114
cancel-in-progress: true

‎.github/workflows/generate_workflows.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
)
1515
_tox_lint_env_regex = re_compile(r"lint-(?P<name>[-\w]+)")
1616
_tox_contrib_env_regex = re_compile(
17-
r"py38-test-(?P<name>[-\w]+\w)-?(?P<contrib_requirements>\d+)?"
17+
r"py39-test-(?P<name>[-\w]+\w)-?(?P<contrib_requirements>\d+)?"
1818
)
1919

2020

‎.github/workflows/lint_0.yml‎

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ on:
99
- 'release/*'
1010
pull_request:
1111

12+
permissions:
13+
contents: read
14+
1215
concurrency:
1316
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
1417
cancel-in-progress: true
@@ -42,7 +45,7 @@ jobs:
4245
python-version: "3.13"
4346

4447
- name: Install tox
45-
run: pip install tox
48+
run: pip install tox-uv
4649

4750
- name: Run tests
4851
run: tox -e lint-opentelemetry-api
@@ -61,7 +64,7 @@ jobs:
6164
python-version: "3.13"
6265

6366
- name: Install tox
64-
run: pip install tox
67+
run: pip install tox-uv
6568

6669
- name: Run tests
6770
run: tox -e lint-opentelemetry-proto-gen-latest
@@ -80,7 +83,7 @@ jobs:
8083
python-version: "3.13"
8184

8285
- name: Install tox
83-
run: pip install tox
86+
run: pip install tox-uv
8487

8588
- name: Run tests
8689
run: tox -e lint-opentelemetry-sdk
@@ -99,7 +102,7 @@ jobs:
99102
python-version: "3.13"
100103

101104
- name: Install tox
102-
run: pip install tox
105+
run: pip install tox-uv
103106

104107
- name: Run tests
105108
run: tox -e lint-opentelemetry-semantic-conventions
@@ -118,7 +121,7 @@ jobs:
118121
python-version: "3.13"
119122

120123
- name: Install tox
121-
run: pip install tox
124+
run: pip install tox-uv
122125

123126
- name: Run tests
124127
run: tox -e lint-opentelemetry-getting-started
@@ -137,7 +140,7 @@ jobs:
137140
python-version: "3.13"
138141

139142
- name: Install tox
140-
run: pip install tox
143+
run: pip install tox-uv
141144

142145
- name: Run tests
143146
run: tox -e lint-opentelemetry-opentracing-shim
@@ -156,7 +159,7 @@ jobs:
156159
python-version: "3.13"
157160

158161
- name: Install tox
159-
run: pip install tox
162+
run: pip install tox-uv
160163

161164
- name: Run tests
162165
run: tox -e lint-opentelemetry-opencensus-shim
@@ -175,7 +178,7 @@ jobs:
175178
python-version: "3.13"
176179

177180
- name: Install tox
178-
run: pip install tox
181+
run: pip install tox-uv
179182

180183
- name: Run tests
181184
run: tox -e lint-opentelemetry-exporter-opencensus
@@ -194,7 +197,7 @@ jobs:
194197
python-version: "3.13"
195198

196199
- name: Install tox
197-
run: pip install tox
200+
run: pip install tox-uv
198201

199202
- name: Run tests
200203
run: tox -e lint-opentelemetry-exporter-otlp-proto-common
@@ -213,7 +216,7 @@ jobs:
213216
python-version: "3.13"
214217

215218
- name: Install tox
216-
run: pip install tox
219+
run: pip install tox-uv
217220

218221
- name: Run tests
219222
run: tox -e lint-opentelemetry-exporter-otlp-combined
@@ -232,7 +235,7 @@ jobs:
232235
python-version: "3.13"
233236

234237
- name: Install tox
235-
run: pip install tox
238+
run: pip install tox-uv
236239

237240
- name: Run tests
238241
run: tox -e lint-opentelemetry-exporter-otlp-proto-grpc-latest
@@ -251,7 +254,7 @@ jobs:
251254
python-version: "3.13"
252255

253256
- name: Install tox
254-
run: pip install tox
257+
run: pip install tox-uv
255258

256259
- name: Run tests
257260
run: tox -e lint-opentelemetry-exporter-otlp-proto-http
@@ -270,7 +273,7 @@ jobs:
270273
python-version: "3.13"
271274

272275
- name: Install tox
273-
run: pip install tox
276+
run: pip install tox-uv
274277

275278
- name: Run tests
276279
run: tox -e lint-opentelemetry-exporter-prometheus
@@ -289,7 +292,7 @@ jobs:
289292
python-version: "3.13"
290293

291294
- name: Install tox
292-
run: pip install tox
295+
run: pip install tox-uv
293296

294297
- name: Run tests
295298
run: tox -e lint-opentelemetry-exporter-zipkin-combined
@@ -308,7 +311,7 @@ jobs:
308311
python-version: "3.13"
309312

310313
- name: Install tox
311-
run: pip install tox
314+
run: pip install tox-uv
312315

313316
- name: Run tests
314317
run: tox -e lint-opentelemetry-exporter-zipkin-proto-http
@@ -327,7 +330,7 @@ jobs:
327330
python-version: "3.13"
328331

329332
- name: Install tox
330-
run: pip install tox
333+
run: pip install tox-uv
331334

332335
- name: Run tests
333336
run: tox -e lint-opentelemetry-exporter-zipkin-json
@@ -346,7 +349,7 @@ jobs:
346349
python-version: "3.13"
347350

348351
- name: Install tox
349-
run: pip install tox
352+
run: pip install tox-uv
350353

351354
- name: Run tests
352355
run: tox -e lint-opentelemetry-propagator-b3
@@ -365,7 +368,7 @@ jobs:
365368
python-version: "3.13"
366369

367370
- name: Install tox
368-
run: pip install tox
371+
run: pip install tox-uv
369372

370373
- name: Run tests
371374
run: tox -e lint-opentelemetry-propagator-jaeger
@@ -384,7 +387,7 @@ jobs:
384387
python-version: "3.13"
385388

386389
- name: Install tox
387-
run: pip install tox
390+
run: pip install tox-uv
388391

389392
- name: Run tests
390393
run: tox -e lint-opentelemetry-test-utils

0 commit comments

Comments
 (0)