From ac1ed2db0631b739914e9ed3bcf07f8ad467f8df Mon Sep 17 00:00:00 2001 From: maryliag Date: Fri, 10 Jul 2026 16:46:51 -0400 Subject: [PATCH 1/2] chore: update survey --- .github/workflows/survey-on-merged-pr.yml | 53 ++++------------------- 1 file changed, 8 insertions(+), 45 deletions(-) diff --git a/.github/workflows/survey-on-merged-pr.yml b/.github/workflows/survey-on-merged-pr.yml index bfaba32206d..d50054c97d0 100644 --- a/.github/workflows/survey-on-merged-pr.yml +++ b/.github/workflows/survey-on-merged-pr.yml @@ -1,53 +1,16 @@ name: Survey on Merged PR by Non-Member on: - # pull_request_target is used instead of pull_request so that the workflow has write access - # (to post comments) even when triggered by fork PRs. - # - # SECURITY: this workflow must never checkout or execute any code from the PR branch. - # Doing so would allow malicious PRs to exfiltrate secrets. All we use from the PR - # is github.event.pull_request.number (an integer) and author metadata, which are safe. - pull_request_target: + pull_request_target: # zizmor: ignore[dangerous-triggers] — this workflow only calls the reusable shared workflow; no PR code is checked out or executed. types: [closed] + branches: [main] permissions: {} -env: - PR_NUM: ${{ github.event.pull_request.number }} - SURVEY_URL: https://docs.google.com/forms/d/e/1FAIpQLSf2FfCsW-DimeWzdQgfl0KDzT2UEAqu69_f7F2BVPSxVae1cQ/viewform?entry.1540511742=${{ github.repository }} - jobs: - comment-on-pr: - name: Add survey to PR if author is not a member - runs-on: ubuntu-latest - if: github.event.pull_request.merged == true && github.repository == 'open-telemetry/opentelemetry-java' - steps: - - uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0 - id: otelbot-token - with: - app-id: ${{ vars.OTELBOT_APP_ID }} - private-key: ${{ secrets.OTELBOT_PRIVATE_KEY }} - - - name: Add survey comment if author is not a member or bot - run: | - USERNAME="${{ github.event.pull_request.user.login }}" - USER_TYPE="${{ github.event.pull_request.user.type }}" - ORG="${{ github.repository_owner }}" - - # Skip if user is a bot - if [[ "$USER_TYPE" == "Bot" ]]; then - echo "Skipping survey for bot user: $USERNAME" - exit 0 - fi - - # Skip if user is an org member - if gh api "orgs/$ORG/members/$USERNAME" --silent; then - echo "Skipping survey for org member: $USERNAME" - exit 0 - fi - - # Add survey comment for external contributor - echo "Adding survey comment for external contributor: $USERNAME" - gh pr comment ${PR_NUM} --repo ${{ github.repository }} --body "Thank you for your contribution @${USERNAME}! 🎉 We would like to hear from you about your experience contributing to OpenTelemetry by taking a few minutes to fill out this [survey](${SURVEY_URL})." - env: - GH_TOKEN: ${{ steps.otelbot-token.outputs.token }} + survey: + uses: open-telemetry/shared-workflows/.github/workflows/survey-on-merged-pr.yml@9cdb8625f2e5a1d160834bb7f7738d157f22a19c # v0.2.1 + with: + client_id: ${{ vars.OTELBOT_CLIENT_ID }} + secrets: + private_key: ${{ secrets.OTELBOT_PRIVATE_KEY }} \ No newline at end of file From 2774700aadb01b6cd097fbf736e199c3a45d3016 Mon Sep 17 00:00:00 2001 From: maryliag Date: Fri, 10 Jul 2026 16:58:45 -0400 Subject: [PATCH 2/2] fix lint --- .github/workflows/survey-on-merged-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/survey-on-merged-pr.yml b/.github/workflows/survey-on-merged-pr.yml index d50054c97d0..22933b478ee 100644 --- a/.github/workflows/survey-on-merged-pr.yml +++ b/.github/workflows/survey-on-merged-pr.yml @@ -13,4 +13,4 @@ jobs: with: client_id: ${{ vars.OTELBOT_CLIENT_ID }} secrets: - private_key: ${{ secrets.OTELBOT_PRIVATE_KEY }} \ No newline at end of file + private_key: ${{ secrets.OTELBOT_PRIVATE_KEY }}