Skip to content

Fix jmxfetch workflow #9306

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Aug 5, 2025
Merged

Fix jmxfetch workflow #9306

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
51a8e1b
Add write permissions and remove branch creation
sarahchen6 Aug 4, 2025
18e47a8
Re-add step to create branch
sarahchen6 Aug 4, 2025
c863aac
Change commit and push logic
sarahchen6 Aug 4, 2025
938b2b7
Add PR permissions
sarahchen6 Aug 4, 2025
6d3d042
Use dd-octo-sts tokens
sarahchen6 Aug 4, 2025
aa98b0e
Remove ghcommit entirely
sarahchen6 Aug 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 21 additions & 7 deletions .github/workflows/update-jmxfetch-submodule.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,22 @@ on:
jobs:
build:
runs-on: ubuntu-latest
permissions:
contents: write # Required to create and push branch
id-token: write # Required for OIDC token federation
steps:
- uses: DataDog/dd-octo-sts-action@acaa02eee7e3bb0839e4272dacb37b8f3b58ba80 # v1.0.3
id: octo-sts
with:
scope: DataDog/dd-trace-java
policy: self.update-jmxfetch-submodule.create-pr

- name: Checkout repository
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # 4.2.2

- name: Update Submodule
run: |
git submodule update --remote -- dd-java-agent/agent-jmxfetch/integrations-core
- name: Download ghcommit CLI
run: |
curl https://github.com/planetscale/ghcommit/releases/download/v0.1.48/ghcommit_linux_amd64 -o /usr/local/bin/ghcommit -L
chmod +x /usr/local/bin/ghcommit
- name: Pick a branch name
id: define-branch
run: echo "branch=ci/update-jmxfetch-submodule-$(date +'%Y%m%d')" >> $GITHUB_OUTPUT
Expand All @@ -28,12 +33,21 @@ jobs:
git push -u origin ${{ steps.define-branch.outputs.branch }} --force
- name: Commit and push changes
env:
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
GITHUB_TOKEN: ${{ steps.octo-sts.outputs.token }}
run: |
ghcommit --repository ${{ github.repository }} --branch ${{ steps.define-branch.outputs.branch }} --add dd-java-agent/agent-jmxfetch/integrations-core --message "Update agent-jmxfetch submodule"
git config user.name "github-actions[bot]"
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
if [[ -z "$(git status -s)" ]]; then
echo "No changes to commit, exiting."
exit 0;
fi
git checkout -b ${{ steps.define-branch.outputs.branch }}
git add dd-java-agent/agent-jmxfetch/integrations-core
git commit -m "Update agent-jmxfetch submodule"
git push origin ${{ steps.define-branch.outputs.branch }}
- name: Create pull request
env:
GH_TOKEN: ${{ github.token }}
GH_TOKEN: ${{ steps.octo-sts.outputs.token }}
run: |
gh pr create --title "Update agent-jmxfetch submodule" \
--base master \
Expand Down