Fill HTTP_CLIENT_IP in ServerInstrumenter #3756
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
anuraaga
requested review from
iNikem,
jkwatson,
laurit,
mateuszrzeszutek,
pavolloffay,
trask and
tylerbenson
as code owners
anuraaga
commented
Aug 3, 2021
|
|
||
| @Nullable | ||
| // Visible for testing | ||
| String getForwardedClientIp(REQUEST request) { |
There was a problem hiding this comment.
Just copied from HttpServerTracer
trask
approved these changes
Aug 3, 2021
| AttributesBuilder attributes, REQUEST request, @Nullable RESPONSE response) { | ||
| String clientIp = getForwardedClientIp(request); | ||
| if (clientIp == null && netAttributesExtractor != null) { | ||
| clientIp = netAttributesExtractor.peerIp(request, response); |
There was a problem hiding this comment.
it's not clear to me that http.client_ip should be populated in this case since easy for exporter/backend to fallback to net.peer.ip
There was a problem hiding this comment.
We do it right now, though I agree it's not clear. Figured we'd stick to what we have for now though.
There was a problem hiding this comment.
makes sense, I'll open a spec issue to seek clarification and we can revisit later
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.
Looks like this doesn't need to be exposed on the normal HttpAttributesExtractor