-
Notifications
You must be signed in to change notification settings - Fork 74
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix outbound IP logging #201
Merged
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
Pull Request Test Coverage Report for Build 5766806490
💛 - Coveralls |
Pull Request Test Coverage Report for Build 7918541800Details
💛 - Coveralls |
jjiang-stripe
force-pushed
the
jjiang/fix-logging-addrs
branch
from
February 14, 2024 22:38
6b9e46b
to
bc280e3
Compare
jjiang-stripe
commented
Feb 15, 2024
ic.logger.WithFields(logrus.Fields{ | ||
LogFieldBytesIn: ic.BytesIn, | ||
LogFieldBytesOut: ic.BytesOut, | ||
LogFieldEndTime: end.UTC(), | ||
LogFieldDuration: duration, | ||
LogFieldError: errorMessage, | ||
LogFieldLastActivity: time.Unix(0, atomic.LoadInt64(ic.LastActivity)).UTC(), | ||
LogFieldOutboundAddr: outboundAddr, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this is removed because it's already on the logger as LogFieldOutRemoteAddr
r? @cds2-stripe |
cds2-stripe
approved these changes
Feb 15, 2024
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.
I was staring at this chunk of code earlier trying to figure out how the outbound remote IP was logged, and realized there was actually a little coding error here.
fields
inpkg/smokescreen/smokescreen.go
was in a closure, so it wasn't writing the fields, and now that it is, we can remove a bit of duplicate code inpkg/smokescreen/conntrack/instrumented_conn.go
.I deployed this change to our QA environment internally and verified that we still see
outbound_remote_addr
on connection close, as well asoutbound_local_addr