Skip to content

[9.5](backport #7439) build(deps): bump github.com/elastic/elastic-agent-libs from 0.46.1 to 0.46.2 in /testing#7440

Open
mergify[bot] wants to merge 3 commits into
9.5from
mergify/bp/9.5/pr-7439
Open

[9.5](backport #7439) build(deps): bump github.com/elastic/elastic-agent-libs from 0.46.1 to 0.46.2 in /testing#7440
mergify[bot] wants to merge 3 commits into
9.5from
mergify/bp/9.5/pr-7439

Conversation

@mergify

@mergify mergify Bot commented Jul 22, 2026

Copy link
Copy Markdown
Contributor

Bumps github.com/elastic/elastic-agent-libs from 0.46.1 to 0.46.2.

Release notes

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

v0.46.2

What's Changed

New Contributors

Full Changelog: elastic/elastic-agent-libs@v0.46.1...v0.46.2

Commits
  • 65b8742 Add LoggingWithTypedOutputsNonGlobal for non-global logger construction (#435)
  • 96c295a feat(testing/fipsscan): add FIPS dependency scanner helper package (#436)
  • 1653a0c Fix golang ci lint (#437)
  • 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 #7439 done by [Mergify](https://mergify.com).

…7439)

Bumps [github.com/elastic/elastic-agent-libs](https://github.com/elastic/elastic-agent-libs) from 0.46.1 to 0.46.2.
- [Release notes](https://github.com/elastic/elastic-agent-libs/releases)
- [Commits](elastic/elastic-agent-libs@v0.46.1...v0.46.2)

---
updated-dependencies:
- dependency-name: github.com/elastic/elastic-agent-libs
  dependency-version: 0.46.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

# Conflicts:
#	testing/go.mod
#	testing/go.sum
@mergify
mergify Bot requested a review from a team as a code owner July 22, 2026 12:04
@mergify mergify Bot added backport conflicts There is a conflict in the backported pull request labels Jul 22, 2026
@mergify
mergify Bot requested a review from ycombinator July 22, 2026 12:04
@mergify mergify Bot added the backport label Jul 22, 2026
@mergify
mergify Bot requested a review from swiatekm July 22, 2026 12:04
@mergify mergify Bot added the conflicts There is a conflict in the backported pull request label Jul 22, 2026
@mergify

mergify Bot commented Jul 22, 2026

Copy link
Copy Markdown
Contributor Author

Cherry-pick of 8778fee has failed:

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

You are currently cherry-picking commit 8778fee.
  (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)

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

no changes added to commit (use "git add" and/or "git commit -a")

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

The Run check-ci failure is caused by unresolved Git merge-conflict markers committed in testing/go.mod and testing/go.sum, not by a dependency or test failure. Resolve the backport conflict and push a commit containing valid module files.

Remediation

  • Resolve the cherry-pick conflict in testing/go.mod by removing <<<<<<< HEAD, =======, and >>>>>>> ...; retain the intended github.com/elastic/elastic-agent-libs v0.46.2 dependency for this bump.
  • Resolve testing/go.sum similarly, leaving the valid checksums for the selected version and no conflict-marker lines.
  • Re-run .buildkite/scripts/check_ci.sh (or the corresponding CI check) after updating the PR.
Investigation details

Root Cause

The PR diff for testing/go.mod contains conflict markers at lines 13-17, with both v0.45.0 and v0.46.2 entries. The testing/go.sum diff contains the same unresolved markers around lines 48-54. The existing PR comment also records that Mergify stopped during the cherry-pick because both files were unmerged.

Evidence

  • Build: https://buildkite.com/elastic/fleet-server/builds/15652
  • Job/step: Run check-ci
  • Key log excerpt: go.mod:13: malformed module path "<<<<<<<": invalid char '<'; subsequent errors report go.mod:15 and go.mod:17 because the conflict-marker sections are parsed as module requirements.
  • PR diff: testing/go.mod and testing/go.sum contain the unresolved conflict sections.

Verification

  • No tests were run because the Go command cannot parse testing/go.mod until the conflict is resolved.

Follow-up

  • No matching flaky-test issue applies; this is a deterministic checkout/module-file failure.

What is this? | From workflow: PR Buildkite Detective

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

@swiatekm

Copy link
Copy Markdown
Member

@copilot fix conflicts

@swiatekm
swiatekm enabled auto-merge (squash) July 22, 2026 17:09
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.

1 participant