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.

Sign up for GitHub

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

Jump to bottom

[release/1.7] Fix otel version incompatibility #9483

Merged
merged 2 commits into from Dec 7, 2023
Merged

[release/1.7] Fix otel version incompatibility #9483

merged 2 commits into from Dec 7, 2023

Commits on Dec 6, 2023

  1. fix(tracing): use latest version of semconv 

    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>
    @milas @dmcgowan
    milas authored and dmcgowan committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    807ddd6 View commit details
    Browse the repository at this point in the history

  2. Add HTTP client update function to tracing library 

    Signed-off-by: Derek McGowan <derek@mcg.dev>
(cherry picked from commit 8203bb9)
Signed-off-by: Derek McGowan <derek@mcg.dev>
    @dmcgowan
    dmcgowan committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    f8f659e View commit details
    Browse the repository at this point in the history