Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: moby/buildkit
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 833949d
Choose a base ref
...
head repository: moby/buildkit
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3b6880d
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Dec 8, 2023

  1. tracing: allow the Resource to be set externally 

    This is a workaround for the brittleness when constructing OTel
`Resource` objects. Internally, the OTel libraries do their own
detection which can be merged with one created in code. However,
the `semconv` spec versions must match. (NOT module version! the
`semconv` package has multiple subpackages for each spec version,
e.g. `semconv/v1.17`, `semconv/v1.21`, etc.)

This creates a problem when BuildKit is used as a library - the
importing app might be using a different, otherwise compatible
version of the OTel libraries, so when it creates a resource, it
will be merged with one of a different version.

By allowing the `Resource` to be set (like the `Recorder`), the
calling code can construct a resource using known consistent
library versions that work, and then allow BuildKit to take over
the rest of the initialization process for OTel.

Signed-off-by: Milas Bowman <[email protected]>
    @milas
    milas committed Dec 8, 2023
    Configuration menu
    Copy the full SHA
    7b3fe03 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #4472 from milas/v0.12-otel-resource 

    tracing: allow the `Resource` to be set externally
    @tonistiigi
    tonistiigi authored Dec 8, 2023
    Configuration menu
    Copy the full SHA
    3b6880d View commit details
    Browse the repository at this point in the history
Loading