Skip to content

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

Merged
swiatekm merged 2 commits into
9.4from
mergify/bp/9.4/pr-7129
May 29, 2026
Merged

[9.4](backport #7129) build(deps): bump github.com/elastic/elastic-agent-system-metrics from 0.14.3 to 0.14.4#7130
swiatekm merged 2 commits into
9.4from
mergify/bp/9.4/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.mod
@mergify mergify Bot requested a review from a team as a code owner 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 review from lorienhu and swiatekm 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/9.4/pr-7129
Your branch is up to date with 'origin/9.4'.

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.sum

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

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

@swiatekm

Copy link
Copy Markdown
Member

@copilot fix conflicts in this pr

Copilot AI commented May 29, 2026

Copy link
Copy Markdown
Contributor

@copilot fix conflicts in this pr

Resolved in b89d182.

@github-actions

Copy link
Copy Markdown
Contributor

TL;DR

Buildkite is failing because go.mod in this PR contains unresolved merge-conflict markers, so every Go-based CI step exits while parsing go.mod. Resolve the conflict in go.mod (keep the bumped dependency versions) and rerun CI.

Remediation

  • Resolve the conflict block in go.mod and remove <<<<<<<, =======, >>>>>>> around the require entries (the PR intends github.com/elastic/elastic-agent-system-metrics v0.14.4 and github.com/elastic/go-elasticsearch/v8 v8.19.6).
  • Regenerate module metadata (go mod tidy if needed) and rerun mage check:all plus the packaging jobs.
Investigation details

Root Cause

go.mod in this PR includes unresolved conflict markers in the require block (visible in PR file diff near go.mod L9-L18). Go tooling fails immediately when parsing that file.

Evidence

go: errors parsing go.mod:
go.mod:12: malformed module path "<<<<<<<": invalid char '<'
go.mod:15: usage: require module/path v1.2.3
go.mod:18: usage: require module/path v1.2.3

Verification

  • Not run locally in this workflow (read-only detective run); conclusion is based on direct CI log parse errors plus the PR go.mod diff showing conflict markers.

Follow-up

Once conflict markers are removed, these 6 failures should clear together because they all fail at the same go.mod parse step.


What is this? | From workflow: PR Buildkite Detective

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

@swiatekm swiatekm enabled auto-merge (squash) May 29, 2026 09:22
@ebeahan

ebeahan commented May 29, 2026

Copy link
Copy Markdown
Member

/test

@swiatekm swiatekm merged commit 24af958 into 9.4 May 29, 2026
11 checks passed
@swiatekm swiatekm deleted the mergify/bp/9.4/pr-7129 branch May 29, 2026 14:49
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.

3 participants