Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release/1.7] Fix otel version incompatibility #9483

Merged
merged 2 commits into from Dec 7, 2023

Conversation

dmcgowan
Copy link
Member

@dmcgowan dmcgowan commented Dec 6, 2023

Backport of #9480
Carry of #9427

milas and others added 2 commits December 6, 2023 11:46
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 <milas.bowman@docker.com>
(cherry picked from commit ad3b806)
Signed-off-by: Derek McGowan <derek@mcg.dev>
Signed-off-by: Derek McGowan <derek@mcg.dev>
(cherry picked from commit 8203bb9)
Signed-off-by: Derek McGowan <derek@mcg.dev>
@estesp estesp merged commit d94f8ff into containerd:release/1.7 Dec 7, 2023
49 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants