Avoid using setenv in the embedded collector execution #10711
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
|
This pull request does not have a backport label. Could you fix it @swiatekm? 🙏
|
Contributor
swiatekm
added
backport-8.19
Contributor
|
Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane) |
cmacknz
approved these changes
Oct 22, 2025
Member
cmacknz
left a comment
cmacknz
left a comment
There was a problem hiding this comment.
This LGTM considering we will remove this (probably once we get beats receivers enabled by default).
pkoutsovasilis
approved these changes
Oct 23, 2025
mergify bot
pushed a commit
that referenced
this pull request
Oct 23, 2025
(cherry picked from commit 5546bd7) # Conflicts: # internal/pkg/otel/manager/execution_embedded.go
mergify bot
pushed a commit
that referenced
this pull request
Oct 23, 2025
(cherry picked from commit 5546bd7)
This was referenced Oct 23, 2025
swiatekm
added a commit
that referenced
this pull request
Oct 23, 2025
hayotbisonai
pushed a commit
to hayotbisonai/elastic-agent
that referenced
this pull request
Nov 23, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
When running the otel collector in-process, it passes env variables via a config provider wrapper instead of using
setenv. The solution is a bit hacky, but this mode isn't the default and is likely to be removed shortly.Why is it important?
The latter is not thread-safe and leads to race conditions. In particular, we have some peculiar flaky test failures on MacOS in unit tests that do this.
Checklist
[ ] 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/fragmentsusing the changelog tool[ ] I have added an integration test or an E2E testHow to test this PR locally
Running existing unit tests is enough.
Related issues