Skip to content

[8.19](backport #7129) build(deps): bump github.com/elastic/elastic-agent-system-metrics from 0.14.3 to 0.14.4#7132

Open
mergify[bot] wants to merge 4 commits into
8.19from
mergify/bp/8.19/pr-7129
Open

[8.19](backport #7129) build(deps): bump github.com/elastic/elastic-agent-system-metrics from 0.14.3 to 0.14.4#7132
mergify[bot] wants to merge 4 commits into
8.19from
mergify/bp/8.19/pr-7129

Conversation

@mergify

@mergify mergify Bot commented May 29, 2026

Copy link
Copy Markdown
Contributor

Bumps github.com/elastic/elastic-agent-system-metrics from 0.14.3 to 0.14.4.

Release notes

Sourced from github.com/elastic/elastic-agent-system-metrics's releases.

v0.14.4

What's Changed

Full Changelog: elastic/elastic-agent-system-metrics@v0.14.3...v0.14.4

Commits
  • 31d43a6 [cgv2] Convert cpu.stat microseconds to nanoseconds at parse site (#294)
  • 2845450 Migrate from deprecated docker/docker to moby/moby modules (#291)
  • 441a69b Bump Golang version to 1.25.9 (#292)
  • See full diff in compare view

Dependabot compatibility score

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

This is an automatic backport of pull request #7129 done by [Mergify](https://mergify.com).

…m 0.14.3 to 0.14.4 (#7129)

* build(deps): bump github.com/elastic/elastic-agent-system-metrics

Bumps [github.com/elastic/elastic-agent-system-metrics](https://github.com/elastic/elastic-agent-system-metrics) from 0.14.3 to 0.14.4.
- [Release notes](https://github.com/elastic/elastic-agent-system-metrics/releases)
- [Commits](elastic/elastic-agent-system-metrics@v0.14.3...v0.14.4)

---
updated-dependencies:
- dependency-name: github.com/elastic/elastic-agent-system-metrics
  dependency-version: 0.14.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Post dependabot file modifications

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
(cherry picked from commit 565ea0f)

# Conflicts:
#	go.sum
@mergify mergify Bot requested a review from a team as a code owner May 29, 2026 09:08
@mergify mergify Bot requested a review from ycombinator May 29, 2026 09:08
@mergify mergify Bot added backport conflicts There is a conflict in the backported pull request labels May 29, 2026
@mergify mergify Bot requested a review from michel-laterman May 29, 2026 09:08
@mergify

mergify Bot commented May 29, 2026

Copy link
Copy Markdown
Contributor Author

Cherry-pick of 565ea0f has failed:

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

You are currently cherry-picking commit 565ea0f.
  (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:
	modified:   NOTICE-fips.txt
	modified:   NOTICE.txt
	modified:   go.mod

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	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-actions

This comment has been minimized.

@ebeahan

ebeahan commented May 29, 2026

Copy link
Copy Markdown
Member

@copilot fix the merge conflicts in this PR.

Copilot AI commented May 29, 2026

Copy link
Copy Markdown
Contributor

@copilot fix the merge conflicts in this PR.

Resolved the go.sum merge conflict in commit fix: resolve go.sum merge conflict for backport to 8.19. The conflict was caused by a cherry-pick collision on go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp — the 8.19 branch had v0.53.0 while the backported commit introduced v0.60.0 (required by elastic-agent-system-metrics v0.14.4). Ran go mod tidy and go mod verify to confirm the go.sum is correct.

Copilot AI requested a review from ebeahan May 29, 2026 13:42
@ebeahan

ebeahan commented May 29, 2026

Copy link
Copy Markdown
Member

/test

ebeahan
ebeahan previously approved these changes May 29, 2026
@mergify

mergify Bot commented Jun 12, 2026

Copy link
Copy Markdown
Contributor Author

This pull request is now in conflicts. Could you fix it @mergify[bot]? 🙏
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-7129 upstream/mergify/bp/8.19/pr-7129
git merge upstream/8.19
git push upstream mergify/bp/8.19/pr-7129

@github-actions

Copy link
Copy Markdown
Contributor

TL;DR

Run check-ci failed because the PR’s module files are not tidy: mage check:ci runs go mod tidy -v, and that removes stale golang.org/x/mod and golang.org/x/tools indirect entries from go.mod/go.sum. This is dependency metadata drift, not a test flake.

Remediation

  • Run go mod tidy on the PR branch and commit the resulting go.mod and go.sum changes.
  • Re-run Buildkite Run check-ci (or locally run mage check:ci) to confirm no generated/tidy diff remains.
Investigation details

Root Cause

The failing commit 6589307997c344bee24a1ac4c508c3f7e0f9fcaa still includes these stale indirect module entries in go.mod:

	golang.org/x/mod v0.36.0 // indirect
	golang.org/x/tools v0.45.0 // indirect

mage check:ci invokes .buildkite/scripts/check_ci.sh, which runs mage check:ci. The relevant guard is Check.NoChanges in magefile.go:596-615: it runs go mod tidy -v, prints git diff, then fails if git update-index --refresh / git diff-index --exit-code HEAD -- sees changes. In the Buildkite log, go mod tidy produced a diff removing those stale entries and their checksums, so the no-changes guard failed.

Evidence

diff --git a/go.mod b/go.mod
@@ -93,10 +93,8 @@ require (
 	go.uber.org/multierr v1.11.0 // indirect
 	go.yaml.in/yaml/v2 v2.4.2 // indirect
 	golang.org/x/crypto v0.53.0 // indirect
-	golang.org/x/mod v0.36.0 // indirect
 	golang.org/x/sys v0.46.0 // indirect
 	golang.org/x/text v0.38.0 // indirect
-	golang.org/x/tools v0.45.0 // indirect
go.mod: needs update
go.sum: needs update
Error: git update-index failure: running "git update-index --refresh" failed with exit code 1

The same diff removes the matching golang.org/x/mod v0.36.0 and golang.org/x/tools v0.45.0 checksum lines from go.sum.

Verification

  • Checked the failing Buildkite log and PR head module files.
  • Checked for a matching open flaky-test issue; none found.
  • Did not run the full check locally because this detective workflow is read-only and the CI log already shows the deterministic tidy diff.

What is this? | From workflow: PR Buildkite Detective

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

@mergify

mergify Bot commented Jun 24, 2026

Copy link
Copy Markdown
Contributor Author

This pull request is now in conflicts. Could you fix it @mergify[bot]? 🙏
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-7129 upstream/mergify/bp/8.19/pr-7129
git merge upstream/8.19
git push upstream mergify/bp/8.19/pr-7129

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

automation backport conflicts There is a conflict in the backported pull request dependency Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants