Don't log websocket messages if there are errors. #998
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
petderek
approved these changes
Sep 29, 2017
agent/acs/handler/acs_handler.go
Outdated
| @@ -214,7 +214,7 @@ func (acsSession *session) Start() error { | |||
| // Disconnected unexpectedly from ACS, compute backoff duration to | |||
| // reconnect | |||
| reconnectDelay := acsSession.computeReconnectDelay(isInactiveInstance) | |||
| seelog.Debugf("Reconnecting to ACS in: %v", reconnectDelay) | |||
| seelog.Infof("Reconnecting to ACS in: %v", reconnectDelay) | |||
There was a problem hiding this comment.
Will this include the units?
The messages that come over the websockets can potentially contain sensitive information that shouldn't be put in logs. Separately, if reading the message results in an error, the content of the message is irrelevant and unreliable.
jhaynes
force-pushed
the
ws_logging_fix
branch
from
ddd5869
to
64d10d8
Compare
|
👍 |
Merged
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.
The messages that come over the websockets can potentially contain sensitive
information that shouldn't be put in logs. Separately, if reading the message
results in an error, the content of the message is irrelevant and unreliable.
Summary
When there is a websocket connection error, we shouldn't log the message because we have no way of knowing what it contains.
Implementation details
Removed the
messageportion of the log line.Testing
make release)go build -out amazon-ecs-agent.exe ./agent)make test) passgo test -timeout=25s ./agent/...) passmake run-integ-tests) pass.\scripts\run-integ-tests.ps1) passmake run-functional-tests) pass.\scripts\run-functional-tests.ps1) passNew tests cover the changes: no
Description for the changelog
NA
Licensing
This contribution is under the terms of the Apache 2.0 License: yes