fix(query-frontend): restore trace ID in slow query logs#8762
Open
pvlltvk wants to merge 2 commits intothanos-io:mainfrom
Open
fix(query-frontend): restore trace ID in slow query logs#8762pvlltvk wants to merge 2 commits intothanos-io:mainfrom
pvlltvk wants to merge 2 commits intothanos-io:mainfrom
Conversation
PR thanos-io#8618 moved slow query logging into a defer and switched from using w.Header() (ResponseWriter headers) to resp.Header (round-trip response headers). The X-Thanos-Trace-Id header is set on w.Header() by the tracing middleware before the handler runs, so it was never present in resp.Header, causing trace IDs to be missing from slow query logs. Pass w.Header() to reportQueryStatsAndSlowQueries instead of the response object so the trace ID is available on both success and error paths. Fixes: thanos-io#8760 Signed-off-by: Pavel Litvyak <pvlltvk@gmail.com>
Signed-off-by: Pavel Litvyak <pvlltvk@gmail.com>
|
lgtm |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Changes
PR #8618 moved slow query logging into a defer and switched from using
w.Header()(ResponseWriter headers) toresp.Header(round-trip response headers). The X-Thanos-Trace-Id header is set onw.Header()by the tracing middleware before the handler runs, so it was never present in resp.Header, causing trace IDs to be missing from slow query logs.Pass
w.Header()toreportQueryStatsAndSlowQueriesinstead of the response object so the trace ID is available on both success and error paths.Fixes: #8760
Verification
Added an additional checks for trace ID to
TestHandler_SlowQueryLog