[forward port to master] tracing: allow the Resource to be set externally
#4496
Conversation
This file contains 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
|
@laurazard @milas @tonistiigi PTAL |
tonistiigi
approved these changes
Dec 18, 2023
|
@thaJeztah looks like this needs another change around buildkit/util/tracing/detect/detect.go Line 159 in bbb6aac |
|
oh! indeed; yeah, master diverged somewhat, but I missed that that part was added. Let me fix |
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 <milas.bowman@docker.com> (cherry picked from commit 7b3fe03) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah
force-pushed
the
forward_port_otel_resource
branch
from
57b2ec7
to
a3a38ac
Compare
crazy-max
approved these changes
Dec 19, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Resourceto be set externally #4472This is a workaround for the brittleness when constructing OTel
Resourceobjects. Internally, the OTel libraries do their own detection which can be merged with one created in code. However, thesemconvspec versions must match. (NOT module version! thesemconvpackage 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
Resourceto be set (like theRecorder), 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.(cherry picked from commit 7b3fe03)