fix nil pointer error on trace by id path #1441
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
Signed-off-by: Joe Elliott <number101010@gmail.com>
joe-elliott
requested review from
annanay25,
mdisibio,
dgzlopes,
mapno,
yvrhdn and
zalegrala
as code owners
zalegrala
approved these changes
May 23, 2022
mdisibio
reviewed
May 24, 2022
| @@ -161,14 +161,16 @@ func newTraceByIDMiddleware(cfg Config, logger log.Logger) Middleware { | |||
| } | |||
| resp.Body = io.NopCloser(bytes.NewReader(traceBuffer)) | |||
| } | |||
|
|
|||
| if resp.Header != nil { | |||
There was a problem hiding this comment.
The containing if statement also checks for http status OK. Does the header need to be set for errors as well? I'm honestly unsure.
There was a problem hiding this comment.
I actually think this is better. Our errors tend to be just text so we probably shouldn't be setting the Content-Type header.
tanner-bruce
pushed a commit
to Shopify/tempo
that referenced
this pull request
Aug 9, 2022
* fix nil pointer error on trace by id path Signed-off-by: Joe Elliott <number101010@gmail.com> * changelog Signed-off-by: Joe Elliott <number101010@gmail.com>
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.
What this PR does:
respto inside of the block where resp != nilresp.Headerbeing nil.Which issue(s) this PR fixes:
Fixes #1440
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]