Rely on upstream confmap implementation to expand env variables #5206
Conversation
This file contains 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
dmitryax
force-pushed
the
unblock-107
branch
3 times, most recently
from
a5ebf3d
to
7e3de9a
Compare
dmitryax
commented
Aug 9, 2024
| assert.Equal(t, expectedParser.ToStringMap(), res.ToStringMap()) | ||
| assert.NoError(t, callClose(closeFunc)) | ||
| } | ||
|
|
There was a problem hiding this comment.
The test has been removed since the expansion was disabled in favor of the upstream implementation. e2e functionality is covered in the integration tests
samiura
approved these changes
Aug 9, 2024
dmitryax
force-pushed
the
unblock-107
branch
6 times, most recently
from
d67af1b
to
b98d271
Compare
dmitryax
force-pushed
the
unblock-107
branch
2 times, most recently
from
e5e0ded
to
3119ba4
Compare
dmitryax
changed the title
dmitryax
force-pushed
the
unblock-107
branch
2 times, most recently
from
e355dd8
to
a11e3a9
Compare
Rely on the envprovider instead. This change resolves two blocked feature gates and prepares for 0.107.0 release
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
After recent changes in the collector core, we can rely on the upstream to expand environmental variables along with $$ escaping. Unfortunately, we cannot do that for the
config_sourcessection as it's custom for our distro. So we need to split the behavior for a while to unblock the 0.107.0 release.This change also fixes the
$$expansion bug. See the corrected test data forTestExpandedDollarSignsViaEnvConfigSource, which previously validate invalid behavior.Later, we can refactor it further and migrate the config sources to the config providers to be handled upstream, significantly reducing the amount of code we maintain.