Fix otel version incompatibility#9480
Merged
samuelkarp merged 3 commits intocontainerd:mainfrom Dec 6, 2023
Merged
Conversation
All components need to use a consistent `semconv` version or OTel will emit errors about "cannot merge resource due to conflicting Schema URL". Switch to the appropriate semconv version, which requires dropping usage of `httpconv`. Instead, the upstream HTTP client hooks are used directly. (The lower-level functions are no longer exported by OTel.) Signed-off-by: Milas Bowman <[email protected]>
Signed-off-by: Derek McGowan <[email protected]>
Signed-off-by: Derek McGowan <[email protected]>
dmcgowan
added
the
cherry-pick/1.7.x
estesp
approved these changes
Dec 6, 2023
cpuguy83
approved these changes
Dec 6, 2023
samuelkarp
approved these changes
Dec 6, 2023
dmcgowan
added
cherry-picked/1.7.x
3 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
6 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 issue from #9427 in main. Original issues were found in moby/moby#46830.
The first two commits are intended for backport to 1.7, the last commit removes the deprecated function.