Skip to content

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 28, 2025

What does this PR do?

Ensures the extension list in the otel config we generate for components always has only one instance of each extension. Currently, we get the same beatsauth extension multiple times, which only works due to a quirk of otel's config processing.

Why is it important?

The config we currently generate for the otel collector is invalid, and is only accepted and works correctly due to implementation details.

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

Related issues


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

@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Sep 28, 2025
@mergify mergify bot requested a review from a team as a code owner September 28, 2025 17:18
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Sep 28, 2025
@mergify mergify bot requested review from blakerouse and removed request for a team September 28, 2025 17:19
@mergify mergify bot added the backport label Sep 28, 2025
@mergify mergify bot requested a review from straistaru September 28, 2025 17:19
Copy link
Contributor Author

mergify bot commented Sep 28, 2025

Cherry-pick of 5aacbcb has failed:

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

You are currently cherry-picking commit 5aacbcbaa.
  (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:   internal/pkg/otel/translate/otelconfig.go
	both modified:   internal/pkg/otel/translate/otelconfig_test.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

@github-actions github-actions bot added bug Something isn't working Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team skip-changelog labels Sep 28, 2025
@elasticmachine
Copy link
Collaborator

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

Copy link
Contributor Author

mergify bot commented Sep 29, 2025

This pull request has not been merged yet. Could you please review and merge it @swiatekm? 🙏

@swiatekm swiatekm force-pushed the mergify/bp/8.19/pr-10172 branch from 1b7a5e8 to 8e99109 Compare September 29, 2025 18:13
@swiatekm swiatekm enabled auto-merge (squash) September 29, 2025 18:13
Copy link

@elasticmachine
Copy link
Collaborator

elasticmachine commented Sep 29, 2025

💛 Build succeeded, but was flaky

Failed CI Steps

History

cc @swiatekm

@swiatekm swiatekm merged commit 47bdaf1 into 8.19 Sep 30, 2025
19 checks passed
@swiatekm swiatekm deleted the mergify/bp/8.19/pr-10172 branch September 30, 2025 13:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport bug Something isn't working 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.

2 participants