Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Nov 25, 2025

What does this PR do?

Use unique index for TestOtelLogsIngestion

Why is it important?

TestOtelLogsIngestion was flaky and could cause other tests to become flaky due to mapping conflicts, using a unique index fixes the problem.

Checklist

  • I have read and understood the pull request guidelines of this project.
  • 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/fragments using the changelog tool
  • I have added an integration test or an E2E test

## Disruptive User Impact

How to test this PR locally

Start a Elastic Stack and export the following env vars:

ELASTICSEARCH_HOST
ELASTICSEARCH_USERNAME
ELASTICSEARCH_PASSWORD
KIBANA_HOST
KIBANA_USERNAME
KIBANA_PASSWORD

Package and run the tests:

# Package Elastic Agent, adjust according to your OS
DEV=true SNAPSHOT=true EXTERNAL=true PACKAGES="tar.gz" PLATFORMS=linux/amd64 mage -v package

# Run the tests, adjust according to your OS
DEV=true SNAPSHOT=true EXTERNAL=true PACKAGES="tar.gz" PLATFORMS=linux/amd64 AGENT_VERSION="9.3.0-SNAPSHOT" mage -v integration:local TestOtelLogsIngestion

Related issues

Questions to ask yourself

  • How are we going to support this in production?
  • How are we going to measure its adoption?
  • How are we going to debug this?
  • What are the metrics I should take care of?
  • ...

This is an automatic backport of pull request #11254 done by [Mergify](https://mergify.com).

(cherry picked from commit 85241ff)

# Conflicts:
#	magefile.go
@mergify mergify bot added the backport label Nov 25, 2025
@mergify mergify bot requested a review from a team as a code owner November 25, 2025 15:09
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Nov 25, 2025
@mergify mergify bot requested review from blakerouse and swiatekm and removed request for a team November 25, 2025 15:09
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Nov 25, 2025
@mergify mergify bot added the backport label Nov 25, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Nov 25, 2025

Cherry-pick of 85241ff has failed:

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

You are currently cherry-picking commit 85241ff32.
  (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:   .gitignore
	modified:   testing/integration/ess/otel_test.go

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

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 github-actions bot added Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team skip-changelog labels Nov 25, 2025
@elasticmachine
Copy link
Contributor

Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane)

belimawr
belimawr previously approved these changes Nov 25, 2025
@belimawr
Copy link
Contributor

Auto-merge enabled

@belimawr belimawr enabled auto-merge (squash) November 25, 2025 15:54
@belimawr belimawr disabled auto-merge December 3, 2025 19:57
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 skip-changelog 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