fix: Resolve environment variable substitution for mixed quotes#7433
Merged
jack-berg merged 1 commit intoopen-telemetry:mainfrom Jun 27, 2025
Merged
Conversation
8891732 to
2cbd9a7
Compare
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #7433 +/- ##
============================================
+ Coverage 89.75% 89.79% +0.04%
Complexity 6980 6980
============================================
Files 797 797
Lines 21165 21160 -5
Branches 2057 2054 -3
============================================
+ Hits 18996 19000 +4
+ Misses 1505 1498 -7
+ Partials 664 662 -2 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
cc0f6d5 to
6abb41d
Compare
6abb41d to
e787cc3
Compare
Fixes open-telemetry#7429 - Environment variable substitution no longer breaks parsing of YAML values containing both single and double quotes. Values that are not intended for substitution are now parsed correctly as literal strings.
e787cc3 to
bbf0de1
Compare
jack-berg
approved these changes
Jun 27, 2025
| Arguments.of("key1: ${EMPTY_STR}\n", mapOf(entry("key1", null))), | ||
| Arguments.of("key1: ${STR_3}\n", mapOf(entry("key1", null))), | ||
| Arguments.of("key1: ${STR_1} ${STR_3}\n", mapOf(entry("key1", "value1"))), | ||
| Arguments.of("key1: ${STR_1} ${STR_3}\n", mapOf(entry("key1", "value1 "))), |
6 tasks
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Fixes #7429 - Environment variable substitution no longer breaks parsing of YAML values containing both single and double quotes. Values that are not intended for substitution are now parsed correctly as literal strings.
The big difference to the initial environment variable substitution approach is, that it's performing the substitution during the compose stage, rathen then the object construction stage. This give better control of the scalar type and quoting handling.