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 2 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 2 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

Copy link
Copy Markdown
Contributor

TL;DR

All 3 failing Buildkite jobs are caused by the same issue: go.sum in this backport PR contains unresolved merge-conflict markers, which makes Go parsing fail immediately (wrong number of fields 2). Resolve the go.sum conflict and regenerate/normalize dependencies for the 8.19 branch state.

Remediation

  • Resolve go.sum conflict markers from the backport cherry-pick (keep a single valid dependency set for 8.19; do not leave <<<<<<<, =======, >>>>>>>).
  • Run dependency normalization for the branch (e.g., go mod tidy or the repo’s standard dependency refresh flow), then re-run CI.
  • Confirm check_ci.sh, check_detect_fips_crypto.sh, and release_test.sh all pass after the go.sum fix.
Investigation details

Root Cause

The PR patch includes unresolved conflict markers in go.sum in the OpenTelemetry block (seen in PR file diff for go.sum), which breaks Go module checksum parsing.

Relevant evidence from PR file diff:

  • go.sum contains conflict markers around these entries:
    • go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp (v0.53.0 vs v0.60.0)
    • go.opentelemetry.io/otel (v1.43.0 vs v1.44.0)
    • go.opentelemetry.io/otel/metric (v1.43.0 vs v1.44.0)

Evidence

  • Build: https://buildkite.com/elastic/fleet-server/builds/14945
  • Failed jobs:
    • Run check-ci.buildkite/scripts/check_ci.sh
    • Detect FIPS crypto imports.buildkite/scripts/check_detect_fips_crypto.sh
    • Package x86_64.buildkite/scripts/release_test.sh
  • Key log excerpt (all 3 jobs):
    • malformed go.sum:
    • .../go.sum:211: wrong number of fields 2

Verification

  • Runtime/code execution: not run (detective workflow is read-only); analysis based on Buildkite logs + PR diff.
  • Flaky-test cross-check: no matching open flaky-test issue found for this failure signature.

Follow-up

This appears deterministic (not infra/transient): once go.sum conflict is resolved, the three failures should collapse together.


What is this? | From workflow: PR Buildkite Detective

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

@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

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