Merge remote-tracking branch 'upstream/main' into fossa

Author: trask

.clomonitor.yml

@@ -0,0 +1,3 @@
+exemptions:
+  - check: artifacthub_badge
+    reason: "Artifact Hub doesn't support Java packages"

.github/repository-settings.md

@@ -87,7 +87,7 @@ settings](https://github.com/open-telemetry/community/blob/main/docs/how-to-conf
   - Exclude:
     - `release/*`
     - `renovate/**/*`
-    - `opentelemetrybot/**/*`
+    - `otelbot/**/*`
     - `revert-*/**/*` (these are created when using the GitHub UI to revert a PR)
 - Restrict creations: CHECKED
 
@@ -126,6 +126,8 @@ settings](https://github.com/open-telemetry/community/blob/main/docs/how-to-conf
 ### Organization secrets
 
 - `FOSSA_API_KEY`
-- `OPENTELEMETRYBOT_GITHUB_TOKEN`
-- `OTELBOT_CLIENT_ID`
 - `OTELBOT_PRIVATE_KEY`
+
+### Organization variables
+
+- `OTELBOT_APP_ID`

.github/scripts/generate-release-contributors.sh

@@ -85,4 +85,5 @@ echo "$contributors1" "$contributors2" \
   | grep -v github-actions \
   | grep -v renovate \
   | grep -v opentelemetrybot \
+  | grep -v otelbot \
   | sed 's/^/@/'

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

@@ -0,0 +1,4 @@
+#!/bin/bash -e
+
+git config user.name otelbot
+git config user.email [email protected]

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

@@ -33,7 +33,7 @@ jobs:
                              | sed 's/^v//')
 
           matches=$(gh pr list \
-                        --author opentelemetrybot \
+                        --author otelbot \
                         --state open \
                         --search "in:title \"Update the OpenTelemetry SDK version to $latest_version\"")
           if [ ! -z "$matches" ]
@@ -62,9 +62,6 @@ jobs:
           VERSION: ${{ needs.check-versions.outputs.latest-version }}
         run: ./.github/scripts/update-sdk-version.sh $VERSION
 
-      - name: Use CLA approved github bot
-        run: .github/scripts/use-cla-approved-github-bot.sh
-
       - name: Free disk space
         run: .github/scripts/gha-free-disk-space.sh
 
@@ -84,16 +81,25 @@ jobs:
         if: failure()
         run: git checkout -- licenses
 
+      - name: Use CLA approved bot
+        run: .github/scripts/use-cla-approved-bot.sh
+
+      - uses: actions/create-github-app-token@67e27a7eb7db372a1c61a7f9bdab8699e9ee57f7 # v1.11.3
+        id: otelbot-token
+        with:
+          app-id: ${{ vars.OTELBOT_APP_ID }}
+          private-key: ${{ secrets.OTELBOT_PRIVATE_KEY }}
+
       - name: Create pull request against main
         if: success() || failure()
         env:
           VERSION: ${{ needs.check-versions.outputs.latest-version }}
           # not using secrets.GITHUB_TOKEN since pull requests from that token do not run workflows
-          GH_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}
+          GH_TOKEN: ${{ steps.otelbot-token.outputs.token }}
         run: |
           message="Update the OpenTelemetry SDK version to $VERSION"
           body="Update the OpenTelemetry SDK version to \`$VERSION\`."
-          branch="opentelemetrybot/update-opentelemetry-sdk-to-${VERSION}"
+          branch="otelbot/update-opentelemetry-sdk-to-${VERSION}"
 
           git checkout -b $branch
           git add -u

.github/workflows/auto-update-otel-sdk.yml

@@ -26,27 +26,25 @@ jobs:
           # history is needed to run git cherry-pick below
           fetch-depth: 0
 
+      - name: Use CLA approved bot
+        run: .github/scripts/use-cla-approved-bot.sh
+
       - uses: actions/create-github-app-token@67e27a7eb7db372a1c61a7f9bdab8699e9ee57f7 # v1.11.3
-        id: app-token
+        id: otelbot-token
         with:
           app-id: ${{ vars.OTELBOT_APP_ID }}
           private-key: ${{ secrets.OTELBOT_PRIVATE_KEY }}
 
-      - name: Use CLA approved author
-        run: |
-          git config user.name otelbot
-          git config user.email [email protected]
-
       - name: Create pull request
         env:
           NUMBER: ${{ github.event.inputs.number }}
           # not using secrets.GITHUB_TOKEN since pull requests from that token do not run workflows
-          GH_TOKEN: ${{ steps.app-token.outputs.token }}
+          GH_TOKEN: ${{ steps.otelbot-token.outputs.token }}
         run: |
           commit=$(gh pr view $NUMBER --json mergeCommit --jq .mergeCommit.oid)
           title=$(gh pr view $NUMBER --json title --jq .title)
 
-          branch="opentelemetrybot/backport-${NUMBER}-to-${GITHUB_REF_NAME//\//-}"
+          branch="otelbot/backport-${NUMBER}-to-${GITHUB_REF_NAME//\//-}"
 
           git checkout -b $branch
           git cherry-pick $commit

.github/workflows/backport.yml

@@ -48,7 +48,7 @@ jobs:
           cache-read-only: ${{ github.event_name == 'pull_request' }}
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
+        uses: github/codeql-action/init@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
         with:
           languages: java, actions
           # using "latest" helps to keep up with the latest Kotlin support
@@ -62,4 +62,4 @@ jobs:
         run: ./gradlew assemble -x javadoc --no-build-cache --no-daemon
 
       - name: Perform CodeQL analysis
-        uses: github/codeql-action/analyze@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
+        uses: github/codeql-action/analyze@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9

.github/workflows/codeql.yml

@@ -42,6 +42,6 @@ jobs:
       # Upload the results to GitHub's code scanning dashboard (optional).
       # Commenting out will disable upload of results to your repo's Code Scanning dashboard
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
+        uses: github/codeql-action/upload-sarif@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
         with:
           sarif_file: results.sarif

.github/workflows/ossf-scorecard.yml

@@ -49,10 +49,10 @@ jobs:
           cwd: "./gh-pages"
           branch: "gh-pages"
           message: "update test result data"
-          author_name: opentelemetrybot
-          author_email: 107717825+opentelemetrybot@users.noreply.github.com
-          committer_name: opentelemetrybot
-          committer_email: 107717825+opentelemetrybot@users.noreply.github.com
+          author_name: otelbot
+          author_email: 197425009+otelbot@users.noreply.github.com
+          committer_name: otelbot
+          committer_email: 197425009+otelbot@users.noreply.github.com
 
   workflow-notification:
     permissions: