Updated dockerstatsreceiver to respect DOCKER_HOST env variable. #37589
+100
−0
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
Comment on lines
58
to
73
| func resolveDockerEndpoint(cfg *docker.Config) { | ||
| // If endpoint is explicitly set in config, respect it | ||
| if cfg.Endpoint != "" { | ||
| return | ||
| } | ||
|
|
||
| // Check DOCKER_HOST environment variable | ||
| if dockerHost := os.Getenv(dockerHostEnv); dockerHost != "" { | ||
| cfg.Endpoint = dockerHost | ||
| return | ||
| } | ||
|
|
||
| // Fall back to default endpoint | ||
| cfg.Endpoint = defaultEndpoint | ||
| } | ||
|
|
There was a problem hiding this comment.
Instead of mutating the config object, can you add this as a method to *Config that returns the expected value?
It should make it easier to test that way.
|
Hi @MovieStoreGuy, I would appreciate your review. This is my first time writing a test, so I’d love your feedback on whether I made any mistakes or if there’s anything I can improve. |
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.
Description
The
dockerstatsreceiverpreviously defaulted to usingunix:///var/run/docker.sockfor the Docker endpoint. While the configuration allows overriding this, it did not automatically respect theDOCKER_HOSTenvironment variable. This update ensures that the receiver resolves the endpoint in the following order:DOCKER_HOSTenvironment variable, if set.unix:///var/run/docker.sock.Link to tracking issue
Fixes #35779