Misc small changes #607
Merged
Misc small changes #607
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
Contributor
tylerbenson
commented
Nov 29, 2018
•
tylerbenson
commented
- Add null check for envelope in consumer delegate. Likely not a problem, but added just to be safe.
- Suggested by @ctoestreich.
- Fix possible NPE in adapter and guard against errors in the instrumentation.
- Added a different kind of 404 test to spring boot that passes routing, but returns 404.
This one succeeds in applying routing, but returns a 404 response.
tylerbenson
referenced
this pull request
Nov 29, 2018
Previously the delegate would swallow the exception and not rethrow. I also added a test to attempt to verify, but the exception doesn’t seem to be observable in the test. (See #602)
realark
approved these changes
Nov 29, 2018
ctoestreich
reviewed
Nov 29, 2018
| @@ -12,7 +12,9 @@ | |||
|
|
|||
| public TextMapExtractAdapter(final Map<String, Object> headers) { | |||
| for (final Map.Entry<String, Object> entry : headers.entrySet()) { | |||
| map.put(entry.getKey(), entry.getValue().toString()); | |||
| if (entry != null && entry.getValue() != null) { | |||
There was a problem hiding this comment.
why not just
for (final Map.Entry<String, Object> entry : headers.entrySet()) {
map.put(entry.getKey(), entry.getValue());
}There was a problem hiding this comment.
// TextMap works with <String,String>, but the type we're given is <String,Object>
toString() was the easiest way to achieve that.
There was a problem hiding this comment.
Perhaps this isn't a TextMap then. Is there an analogous <String, Object> type you have already created?
There was a problem hiding this comment.
TextMap is an Opentracing thing we've kind of inherited. Extending to Object would require more effort than I think is worth for this case.
|
@tylerbenson I suppose my other comments are irrelevant if these headers aren't repropgated and only used for trace. |
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.