Cherry-pick of 22bedbc has failed:

On branch mergify/bp/8.19/pr-48816
Your branch is up to date with 'origin/8.19'.

You are currently cherry-picking commit 22bedbc8b.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   changelog/fragments/1770852460-bump-elastic-agent-system-metrics-to-v0.14.0.yaml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   NOTICE.txt
	both modified:   go.mod
	both modified:   go.sum

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

🤖 GitHub comments

Just comment with:

• run docs-build : Re-trigger the docs validation. (use unformatted text in the comment!)

Pinging @elastic/elastic-agent-data-plane (Team:Elastic-Agent-Data-Plane)

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/8.19/pr-48816 upstream/mergify/bp/8.19/pr-48816
git merge upstream/8.19
git push upstream mergify/bp/8.19/pr-48816

This pull request has not been merged yet. Could you please review and merge it @ycombinator? 🙏

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/8.19/pr-48816 upstream/mergify/bp/8.19/pr-48816
git merge upstream/8.19
git push upstream mergify/bp/8.19/pr-48816

This pull request has not been merged yet. Could you please review and merge it @ycombinator? 🙏

The failure is caused by unresolved merge-conflict markers in go.sum, which makes the file unparsable.

Evidence:

• Job check failed in step Run check-default with malformed go.sum: /home/runner/work/beats/beats/go.sum:363: wrong number of fields 2 (run 22318276882, job 64569278640).
• PR file diff for go.sum shows conflict markers at roughly go.sum:363:
  • <<<<<<< HEAD
  • =======
  • >>>>>>> 5cc85801f3 (Update elastic-agent-system-metrics to v0.14.0 (#48816))

Recommended minimal fix:

1. Resolve the conflict block in go.sum (remove conflict markers and keep valid checksum lines).
2. Keep the intended dependency bump entries for github.com/elastic/elastic-agent-system-metrics v0.14.0.
3. Run go mod tidy (or at least go list ./...) and re-run CI.

Tests run by me: none locally; analysis based on GitHub Actions logs + PR file diff only.

What is this? | From workflow: PR CI Detective

Give us feedback! React with 🚀 if perfect, 👍 if helpful, 👎 if not.

CI failed in workflow run 22318276878 (pre-commit job) because check-merge-conflict detected unresolved conflict markers in go.sum.

Evidence from the failing step (pre-commit run --from-ref ... --to-ref ...):

• go.sum:363: Merge conflict string '<<<<<<<' found
• go.sum:368: Merge conflict string '=======' found
• go.sum:373: Merge conflict string '>>>>>>>' found

Recommended fix:

1. Resolve the merge conflict in go.sum (remove conflict markers and keep the correct dependency entries).
2. Regenerate/normalize module files (typically go mod tidy at repo root if needed).
3. Re-run the same check locally before pushing: pre-commit run --show-diff-on-failure --color=always --from-ref 83a3c5864fb7a5652a897ee400c6a8c8d58f59ee --to-ref 048d930553339ec6d5aacdca32e1271f4189b2cc.

Tests run by me: log analysis only (no local test execution).

What is this? | From workflow: PR CI Detective

Give us feedback! React with 🚀 if perfect, 👍 if helpful, 👎 if not.

CI failure is caused by check-default detecting uncommitted generated-file changes during check-no-changes.

• Failing job: check (workflow run 22318475866)
• Failing step: Run check-default
• Key log evidence:
  • make[1]: *** [Makefile:124: check-no-changes] Error 1
  • make: *** [Makefile:112: check-default] Error 2
  • NOTICE.txt: needs update
  • go.mod: needs update
  • go.sum: needs update

Root cause: the backport commit updated the dependency, but generated artifacts are still out of sync in CI (especially go.mod/go.sum tidy output and NOTICE.txt).

Recommended fix (minimal):

1. On the PR branch, run go mod tidy and make notice (or your normal dependency-update workflow that regenerates NOTICE).
2. Commit the resulting changes to go.mod, go.sum, and NOTICE.txt.
3. Re-run CI.

Tests run by me: log analysis only (no local test execution in this workflow).

What is this? | From workflow: PR CI Detective

Give us feedback! React with 🚀 if perfect, 👍 if helpful, 👎 if not.

CI failure is due to a golangci-lint timeout on macOS, not a lint violation.

• Failed run: 22318747978
• Failed job: lint (macos-latest) (64570931584)
• Failing step: golangci-lint
• Log evidence: 0 issues. followed by level=error msg="Timeout exceeded: try increasing it by passing --timeout option" and golangci-lint exit with code 4

Root cause:

• The workflow currently runs lint with args: --timeout=30m --whole-files in .github/workflows/golangci-lint.yml:48.
• On macOS (arm64), this run took ~43m, exceeded the 30m limit, and failed despite no lint findings.

Recommended fix/remediation:

1. Immediate: re-run this failed job/workflow (looks like a time-budget/runner-performance failure).
2. If this repeats: increase lint timeout in .github/workflows/golangci-lint.yml (for example to 45m or 60m, ideally macOS-specific if you want to limit impact).
3. Optional optimization: review whether --whole-files is still required for this workflow, since it significantly increases run time.

Tests run:

• No local tests were executed in this read-only triage.
• Analysis was performed from GitHub Actions job metadata and failed job logs.

What is this? | From workflow: PR CI Detective

Give us feedback! React with 🚀 if perfect, 👍 if helpful, 👎 if not.

Blocked by #49055

Now blocked by #48482

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/8.19/pr-48816 upstream/mergify/bp/8.19/pr-48816
git merge upstream/8.19
git push upstream mergify/bp/8.19/pr-48816