Support underscores in request ids. #176
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
cdeszaq
requested changes
Feb 17, 2017
|
I agree with Rick's comment. |
aklish
approved these changes
Feb 28, 2017
archolewa
force-pushed
the
add-dashes-headers
branch
2 times, most recently
from
5d73f39
to
c0c45d6
Compare
cdeszaq
reviewed
Mar 1, 2017
| @Unroll | ||
| def "The BardLoggingFilter does not add a malformed requestId '#requestId' to MDC"() { | ||
| given: "A ContainerRequestContext with the specified malformed requestId" | ||
| MultivaluedHashMap<String, String> fakeHeaders = new MultivaluedHashMap<>() |
There was a problem hiding this comment.
This shadows the class-level fakeHeaders map. Do we need this declaration in this test?
There was a problem hiding this comment.
Could catch. It should be using the class level fakeHeaders
cdeszaq
reviewed
Mar 1, 2017
| filter.filter(requestContext) | ||
|
|
||
| then: | ||
| !MDC.get(RequestLog.ID_KEY) || !MDC.get(RequestLog.ID_KEY).startsWith(requestId) |
There was a problem hiding this comment.
You could simplify this by using the null-safe coalescence operator:
!MDC.get(RequestLog.ID_KEY)?.startsWith(requestId)If MDC.get(RequestLog.ID_KEY) comes back null, it returns false and doesn't call .startsWith(...), preventing the NPE.
|
Just the issue with shadowing. Once that's addressed, merge away. |
cdeszaq
approved these changes
Mar 1, 2017
--Some clients want to have underscores in their unique request ids. Since it's kind of arbitrary what characters we allow or don't allow in the request header, we've added it.
archolewa
force-pushed
the
add-dashes-headers
branch
from
c0c45d6
to
e29d5e3
Compare
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.
--Some clients want to have underscores in their unique request ids.
Since it's kind of arbitrary what characters we allow or don't allow in
the request header, we've added it.