Skip to content

Commit 428d6be

Browse files
emdnetoemdneto
authored
Merge branch 'main' into add-missing-permissions
2 parents 84bf42d + ff9dc82 commit 428d6be

File tree

31 files changed

+670
-536
lines changed

31 files changed

+670
-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: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,22 @@ jobs:
2626
- name: Use CLA approved github bot
2727
run: .github/scripts/use-cla-approved-github-bot.sh
2828

29+
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
30+
id: otelbot-token
31+
with:
32+
app-id: ${{ vars.OTELBOT_APP_ID }}
33+
private-key: ${{ secrets.OTELBOT_PRIVATE_KEY }}
34+
2935
- name: Create pull request
3036
env:
3137
NUMBER: ${{ github.event.inputs.number }}
3238
# not using secrets.GITHUB_TOKEN since pull requests from that token do not run workflows
33-
GITHUB_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}
39+
GITHUB_TOKEN: ${{ steps.otelbot-token.outputs.token }}
3440
run: |
3541
commit=$(gh pr view $NUMBER --json mergeCommit --jq .mergeCommit.oid)
3642
title=$(gh pr view $NUMBER --json title --jq .title)
3743
38-
branch="opentelemetrybot/backport-${NUMBER}-to-${GITHUB_REF_NAME//\//-}"
44+
branch="otelbot/backport-${NUMBER}-to-${GITHUB_REF_NAME//\//-}"
3945
4046
git cherry-pick $commit
4147
git push origin HEAD:$branch

‎.github/workflows/benchmarks.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
python-version: "3.13"
1717
architecture: 'x64'
1818
- name: Install tox
19-
run: pip install tox
19+
run: pip install tox-uv
2020
- name: Run tox
2121
run: tox -e benchmark-opentelemetry-sdk -- -k opentelemetry-sdk/benchmarks --benchmark-json=opentelemetry-sdk/output.json
2222
- name: Report on SDK benchmark results

‎.github/workflows/changelog.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
if: |
1717
!contains(github.event.pull_request.labels.*.name, 'Skip Changelog')
18-
&& github.actor != 'opentelemetrybot'
18+
&& github.actor != 'otelbot[bot]'
1919
2020
steps:
2121
- uses: actions/checkout@v4

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
runs-on: ubuntu-latest
2525
needs: changedfiles
2626
if: |
27-
github.event.pull_request.user.login != 'opentelemetrybot' && github.event_name == 'pull_request'
27+
github.event.pull_request.user.login != 'otelbot[bot]' && github.event_name == 'pull_request'
2828
&& ${{needs.changedfiles.outputs.md}}
2929
steps:
3030
- name: Checkout Repo

‎.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: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
python-version: "3.13"
4343

4444
- name: Install tox
45-
run: pip install tox
45+
run: pip install tox-uv
4646

4747
- name: Run tests
4848
run: tox -e lint-opentelemetry-api
@@ -61,7 +61,7 @@ jobs:
6161
python-version: "3.13"
6262

6363
- name: Install tox
64-
run: pip install tox
64+
run: pip install tox-uv
6565

6666
- name: Run tests
6767
run: tox -e lint-opentelemetry-proto-gen-latest
@@ -80,7 +80,7 @@ jobs:
8080
python-version: "3.13"
8181

8282
- name: Install tox
83-
run: pip install tox
83+
run: pip install tox-uv
8484

8585
- name: Run tests
8686
run: tox -e lint-opentelemetry-sdk
@@ -99,7 +99,7 @@ jobs:
9999
python-version: "3.13"
100100

101101
- name: Install tox
102-
run: pip install tox
102+
run: pip install tox-uv
103103

104104
- name: Run tests
105105
run: tox -e lint-opentelemetry-semantic-conventions
@@ -118,7 +118,7 @@ jobs:
118118
python-version: "3.13"
119119

120120
- name: Install tox
121-
run: pip install tox
121+
run: pip install tox-uv
122122

123123
- name: Run tests
124124
run: tox -e lint-opentelemetry-getting-started
@@ -137,7 +137,7 @@ jobs:
137137
python-version: "3.13"
138138

139139
- name: Install tox
140-
run: pip install tox
140+
run: pip install tox-uv
141141

142142
- name: Run tests
143143
run: tox -e lint-opentelemetry-opentracing-shim
@@ -156,7 +156,7 @@ jobs:
156156
python-version: "3.13"
157157

158158
- name: Install tox
159-
run: pip install tox
159+
run: pip install tox-uv
160160

161161
- name: Run tests
162162
run: tox -e lint-opentelemetry-opencensus-shim
@@ -175,7 +175,7 @@ jobs:
175175
python-version: "3.13"
176176

177177
- name: Install tox
178-
run: pip install tox
178+
run: pip install tox-uv
179179

180180
- name: Run tests
181181
run: tox -e lint-opentelemetry-exporter-opencensus
@@ -194,7 +194,7 @@ jobs:
194194
python-version: "3.13"
195195

196196
- name: Install tox
197-
run: pip install tox
197+
run: pip install tox-uv
198198

199199
- name: Run tests
200200
run: tox -e lint-opentelemetry-exporter-otlp-proto-common
@@ -213,7 +213,7 @@ jobs:
213213
python-version: "3.13"
214214

215215
- name: Install tox
216-
run: pip install tox
216+
run: pip install tox-uv
217217

218218
- name: Run tests
219219
run: tox -e lint-opentelemetry-exporter-otlp-combined
@@ -232,7 +232,7 @@ jobs:
232232
python-version: "3.13"
233233

234234
- name: Install tox
235-
run: pip install tox
235+
run: pip install tox-uv
236236

237237
- name: Run tests
238238
run: tox -e lint-opentelemetry-exporter-otlp-proto-grpc-latest
@@ -251,7 +251,7 @@ jobs:
251251
python-version: "3.13"
252252

253253
- name: Install tox
254-
run: pip install tox
254+
run: pip install tox-uv
255255

256256
- name: Run tests
257257
run: tox -e lint-opentelemetry-exporter-otlp-proto-http
@@ -270,7 +270,7 @@ jobs:
270270
python-version: "3.13"
271271

272272
- name: Install tox
273-
run: pip install tox
273+
run: pip install tox-uv
274274

275275
- name: Run tests
276276
run: tox -e lint-opentelemetry-exporter-prometheus
@@ -289,7 +289,7 @@ jobs:
289289
python-version: "3.13"
290290

291291
- name: Install tox
292-
run: pip install tox
292+
run: pip install tox-uv
293293

294294
- name: Run tests
295295
run: tox -e lint-opentelemetry-exporter-zipkin-combined
@@ -308,7 +308,7 @@ jobs:
308308
python-version: "3.13"
309309

310310
- name: Install tox
311-
run: pip install tox
311+
run: pip install tox-uv
312312

313313
- name: Run tests
314314
run: tox -e lint-opentelemetry-exporter-zipkin-proto-http
@@ -327,7 +327,7 @@ jobs:
327327
python-version: "3.13"
328328

329329
- name: Install tox
330-
run: pip install tox
330+
run: pip install tox-uv
331331

332332
- name: Run tests
333333
run: tox -e lint-opentelemetry-exporter-zipkin-json
@@ -346,7 +346,7 @@ jobs:
346346
python-version: "3.13"
347347

348348
- name: Install tox
349-
run: pip install tox
349+
run: pip install tox-uv
350350

351351
- name: Run tests
352352
run: tox -e lint-opentelemetry-propagator-b3
@@ -365,7 +365,7 @@ jobs:
365365
python-version: "3.13"
366366

367367
- name: Install tox
368-
run: pip install tox
368+
run: pip install tox-uv
369369

370370
- name: Run tests
371371
run: tox -e lint-opentelemetry-propagator-jaeger
@@ -384,7 +384,7 @@ jobs:
384384
python-version: "3.13"
385385

386386
- name: Install tox
387-
run: pip install tox
387+
run: pip install tox-uv
388388

389389
- name: Run tests
390390
run: tox -e lint-opentelemetry-test-utils

‎.github/workflows/misc_0.yml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
python-version: "3.11"
4343

4444
- name: Install tox
45-
run: pip install tox
45+
run: pip install tox-uv
4646

4747
- name: Run tests
4848
run: tox -e spellcheck
@@ -61,7 +61,7 @@ jobs:
6161
python-version: "3.11"
6262

6363
- name: Install tox
64-
run: pip install tox
64+
run: pip install tox-uv
6565

6666
- name: Run tests
6767
run: tox -e tracecontext
@@ -80,7 +80,7 @@ jobs:
8080
python-version: "3.11"
8181

8282
- name: Install tox
83-
run: pip install tox
83+
run: pip install tox-uv
8484

8585
- name: Run tests
8686
run: tox -e typecheck
@@ -90,7 +90,7 @@ jobs:
9090
runs-on: ubuntu-latest
9191
timeout-minutes: 30
9292
if: |
93-
github.event.pull_request.user.login != 'opentelemetrybot' && github.event_name == 'pull_request'
93+
github.event.pull_request.user.login != 'otelbot[bot]' && github.event_name == 'pull_request'
9494
steps:
9595
- name: Checkout repo @ SHA - ${{ github.sha }}
9696
uses: actions/checkout@v4
@@ -101,7 +101,7 @@ jobs:
101101
python-version: "3.11"
102102

103103
- name: Install tox
104-
run: pip install tox
104+
run: pip install tox-uv
105105

106106
- name: Run tests
107107
run: tox -e docs
@@ -120,7 +120,7 @@ jobs:
120120
python-version: "3.11"
121121

122122
- name: Install tox
123-
run: pip install tox
123+
run: pip install tox-uv
124124

125125
- name: Run tests
126126
run: tox -e docker-tests-otlpexporter
@@ -139,7 +139,7 @@ jobs:
139139
python-version: "3.11"
140140

141141
- name: Install tox
142-
run: pip install tox
142+
run: pip install tox-uv
143143

144144
- name: Run tests
145145
run: tox -e docker-tests-opencensus
@@ -150,7 +150,7 @@ jobs:
150150
timeout-minutes: 30
151151
if: |
152152
!contains(github.event.pull_request.labels.*.name, 'Approve Public API check')
153-
&& github.actor != 'opentelemetrybot' && github.event_name == 'pull_request'
153+
&& github.actor != 'otelbot[bot]' && github.event_name == 'pull_request'
154154
steps:
155155
- name: Checkout repo @ SHA - ${{ github.sha }}
156156
uses: actions/checkout@v4
@@ -172,7 +172,7 @@ jobs:
172172
python-version: "3.11"
173173

174174
- name: Install tox
175-
run: pip install tox
175+
run: pip install tox-uv
176176

177177
- name: Run tests
178178
run: tox -e public-symbols-check
@@ -191,7 +191,7 @@ jobs:
191191
python-version: "3.11"
192192

193193
- name: Install tox
194-
run: pip install tox
194+
run: pip install tox-uv
195195

196196
- name: Run tests
197197
run: tox -e shellcheck
@@ -202,7 +202,7 @@ jobs:
202202
timeout-minutes: 30
203203
if: |
204204
!contains(github.event.pull_request.labels.*.name, 'Skip generate-workflows')
205-
&& github.event.pull_request.user.login != 'opentelemetrybot' && github.event_name == 'pull_request'
205+
&& github.event.pull_request.user.login != 'otelbot[bot]' && github.event_name == 'pull_request'
206206
steps:
207207
- name: Checkout repo @ SHA - ${{ github.sha }}
208208
uses: actions/checkout@v4
@@ -213,7 +213,7 @@ jobs:
213213
python-version: "3.11"
214214

215215
- name: Install tox
216-
run: pip install tox
216+
run: pip install tox-uv
217217

218218
- name: Run tests
219219
run: tox -e generate-workflows
@@ -235,7 +235,7 @@ jobs:
235235
python-version: "3.11"
236236

237237
- name: Install tox
238-
run: pip install tox
238+
run: pip install tox-uv
239239

240240
- name: Run tests
241241
run: tox -e precommit

‎.github/workflows/prepare-patch-release.yml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,20 @@ jobs:
6666
- name: Use CLA approved github bot
6767
run: .github/scripts/use-cla-approved-github-bot.sh
6868

69+
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
70+
id: otelbot-token
71+
with:
72+
app-id: ${{ vars.OTELBOT_APP_ID }}
73+
private-key: ${{ secrets.OTELBOT_PRIVATE_KEY }}
74+
6975
- name: Create pull request
7076
id: create_pr
7177
env:
7278
# not using secrets.GITHUB_TOKEN since pull requests from that token do not run workflows
73-
GITHUB_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}
79+
GITHUB_TOKEN: ${{ steps.otelbot-token.outputs.token }}
7480
run: |
7581
message="Prepare release ${STABLE_VERSION}/${UNSTABLE_VERSION}"
76-
branch="opentelemetrybot/prepare-release-${STABLE_VERSION}-${UNSTABLE_VERSION}"
82+
branch="otelbot/prepare-release-${STABLE_VERSION}-${UNSTABLE_VERSION}"
7783
7884
git commit -a -m "$message"
7985
git push origin HEAD:$branch

0 commit comments

Comments
 (0)