[http_check] add support for no_proxy environment variable #2448
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
| self.proxies['https'] = "https://{uri}".format(uri=uri) | ||
| else: | ||
| self.proxies['http'] = environ.get('http', None) | ||
| self.proxies['https'] = environ.get('https', None) |
There was a problem hiding this comment.
Why http and https as the environment variables? Those seem very prone to unintended overlap.
(The requests library uses HTTP_PROXY and HTTPS_PROXY.)
There was a problem hiding this comment.
Good catch! That was my bad, indeed the env variables on *nix systems have _PROXY appended. Fixing!
…o requests. [http] allow overriding of no_proxy if set in init_config, otherwise grab from env. [http_check] 'proxies' looks like it should have http, https, and no keys. [http] requests not enforcing no_proxy - attempting to disable. [http] respect environment variables if defined [http] adding per instance no_proxy feature flag.
|
I think the apache failure is unrelated, if you're more concerned about it, rerun it. So, it looks good to me. 👍 |
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.
Why this PR?
If a
no_proxyenvironment variable is set we should honor it when making requests. This PR addresses the issue by adding the environment variable to theproxiesdict used byrequeststo make the request.Questions
no_proxyin the yaml configuration file?httpandhttpssystem-wide environment variables as well if they're not set in the configuration file?Answers
no_proxyflag.datadog.confproxy is enabled, but environment variables are found for https or http proxies, these will be enforced.Notes
Unfortunately this is now a little more convoluted then I would've liked. Passing the
self.proxiesdict withhttpand/orhttpsand ano_proxykey (ornokeyrequestsalso takes) will not work, only after popping the relevant entries off the dictionary did I see the expected behavior. This has forced us to enforce the proxy settings explicitly per iteration.