Skip to content

Commit 2a3e63f

Browse files
opentelemetrybototelbot[bot]trask
authored
Migrate from opentelemetrybot to otelbot (open-telemetry#13386)
See open-telemetry/community#2863 for details. This PR was generated by Copilot and reviewed by @trask prior to submission. --------- Co-authored-by: otelbot <[email protected]> Co-authored-by: Trask Stalnaker <[email protected]>
1 parent 888e9b6 commit 2a3e63f

File tree

7 files changed

+17
-12
lines changed

7 files changed

+17
-12
lines changed

.github/workflows/check-merge-freeze.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
# This condition is to avoid blocking the PR causing the freeze in the first place.
2525
if: |
2626
(!startsWith(github.event.pull_request.title || github.event.merge_group.head_commit.message, '[chore] Prepare release')) ||
27-
(!(github.event.pull_request.user.login == 'opentelemetrybot' || github.event.merge_group.head_commit.author.name == 'OpenTelemetry Bot'))
27+
(!(github.event.pull_request.user.login == 'otelbot[bot]' || github.event.merge_group.head_commit.author.login == 'otelbot[bot]'))
2828
runs-on: ubuntu-latest
2929
steps:
3030
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

.github/workflows/prepare-release.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,13 +131,18 @@ jobs:
131131
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
132132
with:
133133
go-version: 1.23.10
134+
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
135+
id: otelbot-token
136+
with:
137+
app-id: ${{ vars.OTELBOT_APP_ID }}
138+
private-key: ${{ secrets.OTELBOT_PRIVATE_KEY }}
134139
# Prepare Core for release.
135140
# - Update CHANGELOG.md file, this is done via chloggen
136141
# - Run make prepare-release PREVIOUS_VERSION=1.0.0 RELEASE_CANDIDATE=1.1.0 MODSET=stable
137142
# - Run make prepare-release PREVIOUS_VERSION=0.52.0 RELEASE_CANDIDATE=0.53.0 MODSET=beta
138143
- name: Prepare release for core
139144
env:
140-
GITHUB_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}
145+
GITHUB_TOKEN: ${{ steps.otelbot-token.outputs.token }}
141146
REPO: open-telemetry/opentelemetry-collector
142147
CANDIDATE_BETA: ${{ inputs.candidate-beta }}
143148
CANDIDATE_STABLE: ${{ inputs.candidate-stable }}

.github/workflows/release-branch.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ jobs:
2626

2727
- name: Setup Git config
2828
run: |
29-
git config --global user.name "opentelemetrybot"
30-
git config --global user.email "107717825+opentelemetrybot@users.noreply.github.com"
29+
git config --global user.name "otelbot"
30+
git config --global user.email "197425009+otelbot@users.noreply.github.com"
3131
3232
- name: Run release-branch.sh
3333
run: |

.github/workflows/scripts/check-merge-freeze.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
# SPDX-License-Identifier: Apache-2.0
55

66
# Check for [chore] Prepare release PRs in core repo
7-
BLOCKERS=$( gh pr list -A opentelemetrybot -S "[chore] Prepare release" --json url -q '.[].url' -R "${REPO}" )
7+
BLOCKERS=$( gh pr list -A "otelbot[bot]" -S "[chore] Prepare release" --json url -q '.[].url' -R "${REPO}" )
88

99
# Check for [chore] Update core dependencies PRs in opentelemetry-collector-contrib
1010
CONTRIB_REPO="open-telemetry/opentelemetry-collector-contrib"
11-
CONTRIB_BLOCKERS=$( gh pr list -A opentelemetrybot -S "[chore] Update core dependencies" --json url -q '.[].url' -R "${CONTRIB_REPO}" )
11+
CONTRIB_BLOCKERS=$( gh pr list -A "otelbot[bot]" -S "[chore] Update core dependencies" --json url -q '.[].url' -R "${CONTRIB_REPO}" )
1212

1313
# Combine both blockers
1414
BLOCKERS="${BLOCKERS}${BLOCKERS:+ }${CONTRIB_BLOCKERS}"

.github/workflows/scripts/release-branch.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ UPSTREAM_REMOTE_NAME=${UPSTREAM_REMOTE_NAME:-"upstream"} # Your upstream remote
88
MAIN_BRANCH_NAME=${MAIN_BRANCH_NAME:-"main"}
99
LOCAL_MAIN_BRANCH_NAME=${LOCAL_MAIN_BRANCH_NAME:-"${MAIN_BRANCH_NAME}"}
1010
# These variables are only used if git user.name and git user.email are not configured
11-
GIT_CONFIG_USER_NAME=${GIT_CONFIG_USER_NAME:-"opentelemetrybot"}
12-
GIT_CONFIG_USER_EMAIL=${GIT_CONFIG_USER_EMAIL:-"107717825+opentelemetrybot@users.noreply.github.com"}
11+
GIT_CONFIG_USER_NAME=${GIT_CONFIG_USER_NAME:-"otelbot"}
12+
GIT_CONFIG_USER_EMAIL=${GIT_CONFIG_USER_EMAIL:-"197425009+otelbot@users.noreply.github.com"}
1313

1414
# --- Extract release information from tag ---
1515
if [[ -z "$GITHUB_REF" ]]; then

.github/workflows/scripts/release-prepare-release.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ fi
2222

2323
make chlog-update VERSION="${RELEASE_VERSION}"
2424
COMMANDS="- make chlog-update VERSION=${RELEASE_VERSION}"
25-
git config user.name opentelemetrybot
26-
git config user.email 107717825+opentelemetrybot@users.noreply.github.com
25+
git config user.name otelbot
26+
git config user.email 197425009+otelbot@users.noreply.github.com
2727
BRANCH="prepare-release-prs/${CANDIDATE_BETA}"
2828
git checkout -b "${BRANCH}"
2929
git add --all

.github/workflows/tidy-dependencies.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ jobs:
3939
- name: go mod tidy
4040
run: |
4141
make gotidy
42-
git config user.name opentelemetrybot
43-
git config user.email 107717825+opentelemetrybot@users.noreply.github.com
42+
git config user.name otelbot
43+
git config user.email 197425009+otelbot@users.noreply.github.com
4444
echo "git diff --exit-code || (git add . && git commit -m \"go mod tidy\" && git push)"
4545
git diff --exit-code || (git add . && git commit -m "go mod tidy" && git push)
4646
- uses: actions-ecosystem/action-remove-labels@2ce5d41b4b6aa8503e285553f75ed56e0a40bae0 # v1.3.0

0 commit comments

Comments
 (0)