logging: fix the HTTP logger #4041
Merged
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
Fix the HTTP logger so that it would take a look at the `url.URL` as well if `r.Host` is empty. Without this, the logging functionality doesn't quite work as Cortex uses `url.URL`: https://github.com/cortexproject/cortex/blob/faf92e8f3dbedfa769fbd6a3ff6e0fbd127694f5/pkg/frontend/downstream_roundtripper.go#L16-L23 Add a test to ensure that this works as expected in both ways. Signed-off-by: Giedrius Statkevičius <giedriuswork@gmail.com> Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com>
Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com>
| @@ -39,7 +39,11 @@ func (m *HTTPServerMiddleware) HTTPMiddleware(name string, next http.Handler) ht | |||
| return func(w http.ResponseWriter, r *http.Request) { | |||
| wrapped := httputil.WrapResponseWriterWithStatus(w) | |||
| start := time.Now() | |||
| _, port, err := net.SplitHostPort(r.Host) | |||
| hostPort := r.Host | |||
There was a problem hiding this comment.
What should we do, if both r.Host and r.URL.Host is set, which one should we display?
There was a problem hiding this comment.
If r.Host is there, it will get priority. We are only using r.URL.Host if r.Host is an empty string.
There was a problem hiding this comment.
I think we can print anyone of them, as long one of them is non-empty.
There was a problem hiding this comment.
From the docs:
// For client requests, the URL's Host specifies the server to
// connect to, while the Request's Host field optionally
// specifies the Host header value to send in the HTTP
// request.
So, we should give priority to r.Host over r.URL.Host because r.Host might be more specific i.e. it's the Host header 😛
There was a problem hiding this comment.
Looks like the current implementation is comprehensive 😄 !
onprem
previously approved these changes
Apr 9, 2021
Signed-off-by: Giedrius Statkevičius <giedriuswork@gmail.com> Co-authored-by: Yash Sharma <yashrsharma44@gmail.com>
yashrsharma44
approved these changes
Apr 9, 2021
bwplotka
approved these changes
Apr 10, 2021
| @@ -30,6 +30,7 @@ We use _breaking :warning:_ to mark changes that are not backward compatible (re | |||
| - [#3960](https://github.com/thanos-io/thanos/pull/3960) fix deduplication of equal alerts with different labels | |||
| - [#3937](https://github.com/thanos-io/thanos/pull/3937) Store: Fix race condition in chunk pool. | |||
| - [#4017](https://github.com/thanos-io/thanos/pull/4017) Query Frontend: fix downsampling iterator returning duplicate samples. | |||
| - [#4017](https://github.com/thanos-io/thanos/pull/4041) Logging: fix the HTTP logger | |||
There was a problem hiding this comment.
Let's mention what is the fix exactly 🤗
| @@ -39,7 +39,11 @@ func (m *HTTPServerMiddleware) HTTPMiddleware(name string, next http.Handler) ht | |||
| return func(w http.ResponseWriter, r *http.Request) { | |||
| wrapped := httputil.WrapResponseWriterWithStatus(w) | |||
| start := time.Now() | |||
| _, port, err := net.SplitHostPort(r.Host) | |||
| hostPort := r.Host | |||
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.
Fix the HTTP logger so that it would take a look at the
url.URLaswell if
r.Hostis empty. Without this, the logging functionality doesn't quite workas Cortex uses
url.URL:https://github.com/cortexproject/cortex/blob/faf92e8f3dbedfa769fbd6a3ff6e0fbd127694f5/pkg/frontend/downstream_roundtripper.go#L16-L23
Add a test to ensure that this works as expected in both ways.
Without this, the user only sees in the logs:
Signed-off-by: Giedrius Statkevičius giedrius.statkevicius@vinted.com