Skip to content

Conversation

mauri870
Copy link
Member

@mauri870 mauri870 commented Oct 14, 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

@mauri870 mauri870 self-assigned this Oct 14, 2025
@mauri870 mauri870 added Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team backport-8.18 Automated backport to the 8.18 branch backport-9.0 Automated backport to the 9.0 branch backport-8.19 Automated backport to the 8.19 branch labels Oct 14, 2025
@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Oct 14, 2025
Copy link
Contributor

🤖 GitHub comments

Expand to view the GitHub comments

Just comment with:

  • run docs-build : Re-trigger the docs validation. (use unformatted text in the comment!)

@elasticmachine
Copy link
Collaborator

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

Copy link
Contributor

@belimawr belimawr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@mauri870 mauri870 merged commit 240cb89 into elastic:9.1 Oct 15, 2025
207 checks passed
mergify bot pushed a commit that referenced this pull request Oct 15, 2025
* [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 bot pushed a commit that referenced this pull request Oct 15, 2025
* [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 bot pushed a commit that referenced this pull request Oct 15, 2025
* [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
mauri870 added a commit that referenced this pull request Oct 15, 2025
* [9.1] Sync mock-es library with main (#47089)

* [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

* fix conflicts

---------

Co-authored-by: Mauri de Souza Meneguzzo <mauri870@gmail.com>
mauri870 added a commit that referenced this pull request Oct 15, 2025
* [9.1] Sync mock-es library with main (#47089)

* [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

* fix conflicts

---------

Co-authored-by: Mauri de Souza Meneguzzo <mauri870@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-8.18 Automated backport to the 8.18 branch backport-8.19 Automated backport to the 8.19 branch backport-9.0 Automated backport to the 9.0 branch backport-9.1 Automated backport to the 9.1 branch 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.

3 participants