Skip to content

Commit 292c70f

Browse files
hectorhdzghectorhdzg
committed
Merge remote-tracking branch 'upstream/main' into hectorhdzg/removelogdata
2 parents ba283ab + d327927 commit 292c70f

File tree

60 files changed

+505
-160
lines changed

Some content is hidden

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

60 files changed

+505
-160
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: 5 additions & 0 deletions
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 }}

‎.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/lint_0.yml‎

Lines changed: 3 additions & 0 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

‎.github/workflows/misc_0.yml‎

Lines changed: 6 additions & 3 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
@@ -90,7 +93,7 @@ jobs:
9093
runs-on: ubuntu-latest
9194
timeout-minutes: 30
9295
if: |
93-
github.event.pull_request.user.login != 'opentelemetrybot' && github.event_name == 'pull_request'
96+
github.event.pull_request.user.login != 'otelbot[bot]' && github.event_name == 'pull_request'
9497
steps:
9598
- name: Checkout repo @ SHA - ${{ github.sha }}
9699
uses: actions/checkout@v4
@@ -150,7 +153,7 @@ jobs:
150153
timeout-minutes: 30
151154
if: |
152155
!contains(github.event.pull_request.labels.*.name, 'Approve Public API check')
153-
&& github.actor != 'opentelemetrybot' && github.event_name == 'pull_request'
156+
&& github.actor != 'otelbot[bot]' && github.event_name == 'pull_request'
154157
steps:
155158
- name: Checkout repo @ SHA - ${{ github.sha }}
156159
uses: actions/checkout@v4
@@ -202,7 +205,7 @@ jobs:
202205
timeout-minutes: 30
203206
if: |
204207
!contains(github.event.pull_request.labels.*.name, 'Skip generate-workflows')
205-
&& github.event.pull_request.user.login != 'opentelemetrybot' && github.event_name == 'pull_request'
208+
&& github.event.pull_request.user.login != 'otelbot[bot]' && github.event_name == 'pull_request'
206209
steps:
207210
- name: Checkout repo @ SHA - ${{ github.sha }}
208211
uses: actions/checkout@v4

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

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,14 @@ name: Prepare patch release
22
on:
33
workflow_dispatch:
44

5+
permissions:
6+
contents: read
7+
58
jobs:
69
prepare-patch-release:
10+
permissions:
11+
contents: write # required for pushing changes
12+
pull-requests: write # required for adding labels to PRs
713
runs-on: ubuntu-latest
814
steps:
915
- uses: actions/checkout@v4
@@ -64,14 +70,20 @@ jobs:
6470
- name: Use CLA approved github bot
6571
run: .github/scripts/use-cla-approved-github-bot.sh
6672

73+
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
74+
id: otelbot-token
75+
with:
76+
app-id: ${{ vars.OTELBOT_APP_ID }}
77+
private-key: ${{ secrets.OTELBOT_PRIVATE_KEY }}
78+
6779
- name: Create pull request
6880
id: create_pr
6981
env:
7082
# not using secrets.GITHUB_TOKEN since pull requests from that token do not run workflows
71-
GITHUB_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}
83+
GITHUB_TOKEN: ${{ steps.otelbot-token.outputs.token }}
7284
run: |
7385
message="Prepare release ${STABLE_VERSION}/${UNSTABLE_VERSION}"
74-
branch="opentelemetrybot/prepare-release-${STABLE_VERSION}-${UNSTABLE_VERSION}"
86+
branch="otelbot/prepare-release-${STABLE_VERSION}-${UNSTABLE_VERSION}"
7587
7688
git commit -a -m "$message"
7789
git push origin HEAD:$branch

0 commit comments

Comments
 (0)