[release/1.7] Fix support for OTLP config#10360
Merged
dmcgowan merged 1 commit intocontainerd:release/1.7from Jun 20, 2024
Merged
[release/1.7] Fix support for OTLP config#10360dmcgowan merged 1 commit intocontainerd:release/1.7from
dmcgowan merged 1 commit intocontainerd:release/1.7from
Conversation
Member
Author
|
cc @vvoland |
dmcgowan
approved these changes
Jun 19, 2024
dmcgowan
changed the title
cpuguy83
commented
Jun 19, 2024
This was broken due to 9360e37 (backport from main). The backport should not have broken the toml config so this more or less restores that. This treats the env vars as preferred. It is not perfect since, as an example, `Endpoint` could be set on the config and the env to set the protocol could be set and these could conflict, however I think this is an unlikely scenario and people should use one or the other, not both. This change converts the config into the relevant environment variables before initializing tracers. Signed-off-by: Brian Goff <[email protected]>
cpuguy83
force-pushed
the
1.7_fix_otlp_config
branch
from
178397b to
1ce1c8f
Compare
Member
|
@cpuguy83 may need a similar patch for 1.6 as well, or at least I see there was a backport to 1.6 as well; |
vvoland
approved these changes
Jun 20, 2024
dmcgowan
approved these changes
Jun 20, 2024
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
5 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.
This was broken due to 9360e37 (backport from main).
The backport should not have broken the toml config so this more or less restores that.
This treats the env vars as preferred.
It is not perfect since, as an example,
Endpointcould be set on the config and the env to set the protocol could be set and these could conflict, however I think this is an unlikely scenario and people should use one or the other, not both.This change converts the config into the relevant environment variables before initializing tracers.
Fixes #10358