[chore] Upgrade core dependencies #5136
Merged
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
jvoravong
force-pushed
the
update-upstream-dep
branch
from
d60fe68
to
b897996
Compare
dmitryax
force-pushed
the
update-upstream-dep
branch
4 times, most recently
from
079eba7
to
ef48fc3
Compare
Update to 0.105.0 version + cherry pick a confmap expansion fix
dmitryax
force-pushed
the
update-upstream-dep
branch
from
476b24f
to
2bd91b6
Compare
dmitryax
force-pushed
the
update-upstream-dep
branch
from
2bd91b6
to
84c8ec3
Compare
dmitryax
force-pushed
the
update-upstream-dep
branch
from
84c8ec3
to
d06cb7b
Compare
dmitryax
commented
Jul 28, 2024
| @@ -30,13 +30,13 @@ resourceMetrics: | |||
| stringValue: prefix-$$$$an-envvar-value | |||
| - key: octuple-dollar | |||
| value: | |||
| stringValue: $$$an-envvar-value-suffix | |||
| stringValue: $$$${env:AN_ENVVAR}-suffix | |||
There was a problem hiding this comment.
Apparently, we have been expanding/resolving such strings twice after #2893. And this test validates wrong behavior. The issue isn't fixed by this PR. However, open-telemetry/opentelemetry-collector#10560 blocks the second expansion if we have an even number of $ after the first expansion.
I'm updating the tests because it's a step in the right direction. In the meantime, I'm looking into the bigger problem.
atoulme
approved these changes
Jul 28, 2024
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.
Update to 0.105.0 version + cherry pick open-telemetry/opentelemetry-collector#10716
Also, disabling both confmap upstream feature gates for now. Enabling
confmap.unifyEnvVarExpansiondoesn't have any effect other than introducing a bug. The warning messages that are expected to show with the FG are ignored in our repoWe have duplicated functionality in our distro which needs to be deprecated first. Then we can remove it and align with upstream.