detect: refactor the default resource detector for detect #4512
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
jsternberg
force-pushed
the
detect-resource
branch
from
fd90524
to
61dd4bd
Compare
This refactors the resource detector to ensure the detected resource is initialized before use. It also removes the duplicate logic for setting the service name through the environment variable. Signed-off-by: Jonathan A. Sternberg <jonathan.sternberg@docker.com>
jsternberg
force-pushed
the
detect-resource
branch
from
61dd4bd
to
e358792
Compare
thaJeztah
reviewed
Jan 2, 2024
| @@ -29,8 +30,6 @@ type detector struct { | |||
| var ServiceName string | |||
| var Recorder *TraceRecorder | |||
|
|
|||
| var Resource *resource.Resource | |||
There was a problem hiding this comment.
Looks like this is reverting #4496, which will likely break moby, or is there another approach that moby should be taking after this patch?
There was a problem hiding this comment.
The OverrideResource method should be used instead to manually set the resource during initialization.
My hope is that a future refactor will remove the need for this function. I'm working on a separate refactor that removes some of the global state so the tracers and metrics exporters can be initialized with a user-provided resource, but that's not ready yet.
There was a problem hiding this comment.
Ah! Gotcha. Missed that one (blame phones and tiny screens) 😅
tonistiigi
approved these changes
Jan 2, 2024
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.
This refactors the resource detector to ensure the detected resource is
initialized before use. It also removes the duplicate logic for setting
the service name through the environment variable.