Explicit forward proxy support for HTTP with Basic Auth #1201
+756
−30
Conversation
This file contains hidden or 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
github-actions
bot
added
chore
dhurley
reviewed
Aug 8, 2025
| @@ -0,0 +1,35 @@ | |||
| # Agent Proxy Support | |||
There was a problem hiding this comment.
We should add this to the official NGINX docs https://github.com/nginx/documentation
| @@ -337,6 +338,18 @@ type ( | |||
| ExcludeFiles []string `yaml:"exclude_files" mapstructure:"exclude_files"` | |||
| MonitoringFrequency time.Duration `yaml:"monitoring_frequency" mapstructure:"monitoring_frequency"` | |||
| } | |||
|
|
|||
| // nolint: govet | |||
There was a problem hiding this comment.
Yes, I tried everything to make it work, but it was consistently failing with fieldalignment error.
| return http.ReadResponse(bufio.NewReader(conn), nil) | ||
| } | ||
|
|
||
| func wrapProxyError(ctx context.Context, msg string, err error, proxyURL string) error { |
There was a problem hiding this comment.
If you are returning an error from a function then there is no need to log it as it should be logged by the caller
aphralG
reviewed
Aug 11, 2025
| @@ -409,6 +418,14 @@ func (oc *Collector) restartCollector(ctx context.Context) { | |||
| } | |||
| } | |||
|
|
|||
| func (oc *Collector) setProxyIfNeeded(ctx context.Context) { | |||
There was a problem hiding this comment.
Could this be renamed to just setProxy ?
Suggested change
| func (oc *Collector) setProxyIfNeeded(ctx context.Context) { | |
| func (oc *Collector) setProxy(ctx context.Context) { |
| proxyURL := proxy.URL | ||
| parsedProxyURL, err := url.Parse(proxyURL) | ||
| if err != nil { | ||
| slog.ErrorContext(ctx, "Malformed proxy URL; skipping Proxy setup", "url", proxyURL, "error", err) |
There was a problem hiding this comment.
Could this error be updated to match the format of our other errors ? something like
Suggested change
| slog.ErrorContext(ctx, "Malformed proxy URL; skipping Proxy setup", "url", proxyURL, "error", err) | |
| slog.ErrorContext(ctx, "Malformed proxy URL, unable to configure proxy for collector ", "url", proxyURL, "error", err) |
| if authLower == "basic" { | ||
| setProxyWithBasicAuth(ctx, proxy, parsedProxyURL) | ||
| } else { | ||
| slog.ErrorContext(ctx, "Unknown auth type for proxy; Aborting Proxy Setup", "auth", auth, "url", proxyURL) |
There was a problem hiding this comment.
Could this error be updated to match the format of our other errors ? something like
Suggested change
| slog.ErrorContext(ctx, "Unknown auth type for proxy; Aborting Proxy Setup", "auth", auth, "url", proxyURL) | |
| slog.ErrorContext(ctx, "Unknown auth type for proxy, unable to configure proxy for collector", "auth", auth, "url", proxyURL) |
| func setProxyEnvs(ctx context.Context, proxyEnvURL, msg string) { | ||
| slog.DebugContext(ctx, msg, "url", proxyEnvURL) | ||
| if setenvErr := os.Setenv("HTTP_PROXY", proxyEnvURL); setenvErr != nil { | ||
| slog.ErrorContext(ctx, "Failed to set Proxy", "error", setenvErr) |
There was a problem hiding this comment.
Could this error be a bit more descriptive
Suggested change
| slog.ErrorContext(ctx, "Failed to set Proxy", "error", setenvErr) | |
| slog.ErrorContext(ctx, "Failed to set proxy envs", "error", setenvErr) |
| slog.ErrorContext(ctx, "Failed to set Proxy", "error", setenvErr) | ||
| } | ||
| if setenvErr := os.Setenv("HTTPS_PROXY", proxyEnvURL); setenvErr != nil { | ||
| slog.ErrorContext(ctx, "Failed to set Proxy", "error", setenvErr) |
| return http.ReadResponse(bufio.NewReader(conn), nil) | ||
| } | ||
|
|
||
| func wrapProxyError(ctx context.Context, msg string, err error, proxyURL string) error { |
There was a problem hiding this comment.
Why do we need to wrap the proxy error ?
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.
Proposed changes
Describe the use case and detail of the change. If this PR addresses an issue on GitHub, make sure to include a link to that issue using one of the supported keywords here in this description (not in the title of the PR).
Checklist
Before creating a PR, run through this checklist and mark each as complete.
CONTRIBUTINGdocumentmake install-toolsand have attached any dependency changes to this pull requestREADME.md)