From d4b0923c81232c7c6113606959b61293963f67ed Mon Sep 17 00:00:00 2001 From: maryliag Date: Thu, 4 Sep 2025 14:36:50 -0400 Subject: [PATCH 1/9] chore: add workflow for surveys of non-members --- .github/workflows/survey-on-merged-pr.yml | 44 +++++++++++++++++++ ...kotlin-compiler-2556199918085858994.salive | 0 2 files changed, 44 insertions(+) create mode 100644 .github/workflows/survey-on-merged-pr.yml create mode 100644 gradle-plugins/.kotlin/sessions/kotlin-compiler-2556199918085858994.salive diff --git a/.github/workflows/survey-on-merged-pr.yml b/.github/workflows/survey-on-merged-pr.yml new file mode 100644 index 000000000000..b6f6e5dda5fc --- /dev/null +++ b/.github/workflows/survey-on-merged-pr.yml @@ -0,0 +1,44 @@ +name: Survey on Merged PR by Non-Member + +on: + pull_request_target: + types: [closed] + +permissions: + contents: read + +env: + PR_NUM: ${{ github.event.pull_request.number }} + SURVEY_URL: https://docs.google.com/forms/d/e/1FAIpQLSf2FfCsW-DimeWzdQgfl0KDzT2UEAqu69_f7F2BVPSxVae1cQ/viewform?entry.1540511742=open-telemetry/opentelemetry-java-instrumentation + +jobs: + comment-on-pr: + name: Add survey to PR if author is not a member + runs-on: ubuntu-latest + permissions: + contents: write + pull-requests: write + if: github.event.pull_request.merged == true + steps: + - uses: actions/checkout@v5 + - name: Check if user is a member of the org + id: check-membership + run: | + USERNAME=$(jq -r '.pull_request.user.login' "$GITHUB_EVENT_PATH") + ORG="${{ github.repository_owner }}" + STATUS=$(gh api "orgs/$ORG/members/$USERNAME" --silent && echo "true" || echo "false") + if [[ "$STATUS" == "true" ]]; then + echo "MEMBER_FOUND=true" >> $GITHUB_ENV + else + echo "MEMBER_FOUND=false" >> $GITHUB_ENV + fi + env: + GH_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }} + + - name: Add comment to PR if author is not a member + if: env.MEMBER_FOUND == 'false' + run: | + USERNAME=$(jq -r '.pull_request.user.login' "$GITHUB_EVENT_PATH") + gh pr comment ${PR_NUM} --repo open-telemetry/opentelemetry-java-instrumentation --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: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }} \ No newline at end of file diff --git a/gradle-plugins/.kotlin/sessions/kotlin-compiler-2556199918085858994.salive b/gradle-plugins/.kotlin/sessions/kotlin-compiler-2556199918085858994.salive new file mode 100644 index 000000000000..e69de29bb2d1 From 0c404995ae1098b05db48d35605ed33ea8292c92 Mon Sep 17 00:00:00 2001 From: otelbot <197425009+otelbot@users.noreply.github.com> Date: Thu, 4 Sep 2025 18:42:33 +0000 Subject: [PATCH 2/9] ./gradlew spotlessApply --- .../.kotlin/sessions/kotlin-compiler-2556199918085858994.salive | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 gradle-plugins/.kotlin/sessions/kotlin-compiler-2556199918085858994.salive diff --git a/gradle-plugins/.kotlin/sessions/kotlin-compiler-2556199918085858994.salive b/gradle-plugins/.kotlin/sessions/kotlin-compiler-2556199918085858994.salive deleted file mode 100644 index e69de29bb2d1..000000000000 From b8fba9fc2e66d494fca29fab2c5375be2b26a14b Mon Sep 17 00:00:00 2001 From: Marylia Gutierrez Date: Thu, 4 Sep 2025 15:06:49 -0400 Subject: [PATCH 3/9] Update .github/workflows/survey-on-merged-pr.yml Co-authored-by: Jay DeLuca --- .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 b6f6e5dda5fc..64da0ddef030 100644 --- a/.github/workflows/survey-on-merged-pr.yml +++ b/.github/workflows/survey-on-merged-pr.yml @@ -33,7 +33,7 @@ jobs: echo "MEMBER_FOUND=false" >> $GITHUB_ENV fi env: - GH_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }} + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Add comment to PR if author is not a member if: env.MEMBER_FOUND == 'false' From 49892a1be1e665c9b4c2ac0efc0322e4b3ffcb53 Mon Sep 17 00:00:00 2001 From: Marylia Gutierrez Date: Thu, 4 Sep 2025 15:33:54 -0400 Subject: [PATCH 4/9] Update .github/workflows/survey-on-merged-pr.yml Co-authored-by: Jay DeLuca --- .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 64da0ddef030..7a59f4a32839 100644 --- a/.github/workflows/survey-on-merged-pr.yml +++ b/.github/workflows/survey-on-merged-pr.yml @@ -20,7 +20,7 @@ jobs: pull-requests: write if: github.event.pull_request.merged == true steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - name: Check if user is a member of the org id: check-membership run: | From ae874f5528ea38216e6d1eb79cc427d4127862f8 Mon Sep 17 00:00:00 2001 From: Marylia Gutierrez Date: Thu, 4 Sep 2025 19:25:41 -0400 Subject: [PATCH 5/9] Update .github/workflows/survey-on-merged-pr.yml --- .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 7a59f4a32839..855688f92b3a 100644 --- a/.github/workflows/survey-on-merged-pr.yml +++ b/.github/workflows/survey-on-merged-pr.yml @@ -41,4 +41,4 @@ jobs: USERNAME=$(jq -r '.pull_request.user.login' "$GITHUB_EVENT_PATH") gh pr comment ${PR_NUM} --repo open-telemetry/opentelemetry-java-instrumentation --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: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }} \ No newline at end of file + GH_TOKEN: ${{ secrets. GITHUB_TOKEN }} \ No newline at end of file From 15df63996168159cb9a2ad4e875a2e9f977624dd Mon Sep 17 00:00:00 2001 From: Marylia Gutierrez Date: Thu, 4 Sep 2025 19:25:57 -0400 Subject: [PATCH 6/9] Update .github/workflows/survey-on-merged-pr.yml --- .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 855688f92b3a..3b48dc901644 100644 --- a/.github/workflows/survey-on-merged-pr.yml +++ b/.github/workflows/survey-on-merged-pr.yml @@ -41,4 +41,4 @@ jobs: USERNAME=$(jq -r '.pull_request.user.login' "$GITHUB_EVENT_PATH") gh pr comment ${PR_NUM} --repo open-telemetry/opentelemetry-java-instrumentation --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: ${{ secrets. GITHUB_TOKEN }} \ No newline at end of file + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file From a1149e436c183e339063d6ad77bdd29f1eeba585 Mon Sep 17 00:00:00 2001 From: maryliag Date: Thu, 4 Sep 2025 19:49:32 -0400 Subject: [PATCH 7/9] update token --- .github/workflows/survey-on-merged-pr.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/survey-on-merged-pr.yml b/.github/workflows/survey-on-merged-pr.yml index 3b48dc901644..382469af9e3f 100644 --- a/.github/workflows/survey-on-merged-pr.yml +++ b/.github/workflows/survey-on-merged-pr.yml @@ -33,7 +33,7 @@ jobs: echo "MEMBER_FOUND=false" >> $GITHUB_ENV fi env: - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GH_TOKEN: ${{ steps.otelbot-token.outputs.token }} - name: Add comment to PR if author is not a member if: env.MEMBER_FOUND == 'false' @@ -41,4 +41,4 @@ jobs: USERNAME=$(jq -r '.pull_request.user.login' "$GITHUB_EVENT_PATH") gh pr comment ${PR_NUM} --repo open-telemetry/opentelemetry-java-instrumentation --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: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + GH_TOKEN: ${{ steps.otelbot-token.outputs.token }} \ No newline at end of file From 2517872d5b2df2baa079eb38cd44fe56e27ed08e Mon Sep 17 00:00:00 2001 From: maryliag Date: Thu, 4 Sep 2025 19:57:20 -0400 Subject: [PATCH 8/9] add step --- .github/workflows/survey-on-merged-pr.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/survey-on-merged-pr.yml b/.github/workflows/survey-on-merged-pr.yml index 382469af9e3f..c67331432aed 100644 --- a/.github/workflows/survey-on-merged-pr.yml +++ b/.github/workflows/survey-on-merged-pr.yml @@ -21,6 +21,11 @@ jobs: if: github.event.pull_request.merged == true steps: - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + - uses: actions/create-github-app-token@v1 + id: app-token + with: + app-id: ${{ vars.OTELBOT_APP_ID }} + private-key: ${{ secrets.OTELBOT_RIVATE_KEY }} - name: Check if user is a member of the org id: check-membership run: | From 3cdd6e7b5553bdc2b0000759f67358983f8a7a07 Mon Sep 17 00:00:00 2001 From: maryliag Date: Thu, 4 Sep 2025 20:15:10 -0400 Subject: [PATCH 9/9] fix id --- .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 c67331432aed..a7295670a140 100644 --- a/.github/workflows/survey-on-merged-pr.yml +++ b/.github/workflows/survey-on-merged-pr.yml @@ -22,7 +22,7 @@ jobs: steps: - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - uses: actions/create-github-app-token@v1 - id: app-token + id: otelbot-token with: app-id: ${{ vars.OTELBOT_APP_ID }} private-key: ${{ secrets.OTELBOT_RIVATE_KEY }}