Skip to content

[8.18](backport #47089) [9.1] Sync mock-es library with main#47114

Merged
mauri870 merged 2 commits into8.18from
mergify/bp/8.18/pr-47089
Oct 15, 2025
Merged

[8.18](backport #47089) [9.1] Sync mock-es library with main#47114
mauri870 merged 2 commits into8.18from
mergify/bp/8.18/pr-47089

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Oct 15, 2025

Proposed commit message

Backporting tests that rely on a recent version of mock-es to other branches is currently impossible due to a breaking change in mock-es api.NewHandler. This change backports the related mock-es changes.

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Related issues

-


This is an automatic backport of pull request #47089 done by Mergify.

* [9.1] Sync mock-es library with main

* update WaitForLogs msg

* update tests

(cherry picked from commit 240cb89)

# Conflicts:
#	NOTICE.txt
#	go.mod
#	go.sum
#	libbeat/tests/integration/elasticsearch_test.go
#	libbeat/tests/integration/framework.go
@mergify mergify Bot added the backport label Oct 15, 2025
@mergify mergify Bot requested a review from a team as a code owner October 15, 2025 11:34
@mergify mergify Bot added the conflicts There is a conflict in the backported pull request label Oct 15, 2025
@mergify mergify Bot requested a review from a team as a code owner October 15, 2025 11:34
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Oct 15, 2025

Cherry-pick of 240cb89 has failed:

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

You are currently cherry-picking commit 240cb8905.
  (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:   NOTICE.txt
	both modified:   go.mod
	both modified:   go.sum
	both modified:   libbeat/tests/integration/elasticsearch_test.go
	both modified:   libbeat/tests/integration/framework.go

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

@mergify mergify Bot requested review from belimawr and leehinman and removed request for a team October 15, 2025 11:34
@botelastic botelastic Bot added the needs_team Indicates that the issue/PR needs a Team:* label label Oct 15, 2025
@github-actions github-actions Bot added the Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team label Oct 15, 2025
@botelastic botelastic Bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Oct 15, 2025
@elasticmachine
Copy link
Copy Markdown
Contributor

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

@mauri870 mauri870 merged commit 7f563f2 into 8.18 Oct 15, 2025
169 of 172 checks passed
@mauri870 mauri870 deleted the mergify/bp/8.18/pr-47089 branch October 15, 2025 15:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants