[confmap] Fix expansion of escaped environment variables #10716
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
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #10716 +/- ##
==========================================
- Coverage 92.24% 92.22% -0.03%
==========================================
Files 403 403
Lines 18720 18717 -3
==========================================
- Hits 17268 17261 -7
- Misses 1097 1099 +2
- Partials 355 357 +2 ☔ View full report in Codecov by Sentry. |
atoulme
approved these changes
Jul 24, 2024
mx-psi
added
the
release:blocker
jvoravong
approved these changes
Jul 24, 2024
dmitryax
changed the title
dmitryax
force-pushed
the
fix-double-expansion
branch
from
33e745e to
1de05e2
Compare
TylerHelmuth
approved these changes
Jul 24, 2024
dmitryax
force-pushed
the
fix-double-expansion
branch
4 times, most recently
from
06db8d7 to
bd85bb6
Compare
This change fixes the issue where environment variables escaped with $$ were expanded. The collector now converts `$${ENV_VAR}` to `${ENV_VAR}` and `$$ENV_VAR` to `$ENV_VAR` without further expansion.
dmitryax
force-pushed
the
fix-double-expansion
branch
from
bd85bb6 to
9ceeda2
Compare
jvoravong
added a commit
to jvoravong/splunk-otel-collector
that referenced
this pull request
Jul 25, 2024
jvoravong
added a commit
to signalfx/splunk-otel-collector
that referenced
this pull request
Jul 25, 2024
…x expansion of escaped environment variables
jvoravong
added a commit
to signalfx/splunk-otel-collector
that referenced
this pull request
Jul 25, 2024
…x expansion of escaped environment variables
dmitryax
added a commit
to signalfx/splunk-otel-collector
that referenced
this pull request
Jul 29, 2024
* [chore] Upgrade core dependencies Update to 0.105.0 version + cherry pick open-telemetry/opentelemetry-collector#10716 Also, disabling both confmap upstream feature gates for now. Enabling confmap.unifyEnvVarExpansion doesn't have any effect other than introducing a bug. The warning messages that are expected to show with the FG are ignored in our repo We have duplicated functionality in our distro which needs to be deprecated first. Then we can remove it and align with upstream.
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.
This change fixes the issue where environment variables escaped with $$ are expanded. The collector now converts
$${ENV_VAR}to${ENV_VAR}and$$ENV_VARto$ENV_VARwithout further expansion (or the expansion failure in case of$ENV_VAR).Fixes #10713