Skip to content
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

Scrubbing annotations from logs #1324

Merged
merged 2 commits into from
Mar 14, 2022
Merged

Scrubbing annotations from logs #1324

merged 2 commits into from
Mar 14, 2022

Conversation

helsaawy
Copy link
Contributor

Updated scrubbing to include logging from guest Linux GCS
Added scrubbing for annotations.

Signed-off-by: Hamza El-Saawy hamzaelsaawy@microsoft.com

Updated scrubbing for guest side, and added scrubbing for annotations

Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
@helsaawy helsaawy requested a review from a team as a code owner March 11, 2022 22:33
@@ -301,8 +301,19 @@ func (b *Bridge) ListenAndServe(bridgeIn io.ReadCloser, bridgeOut io.WriteCloser
trace.StringAttribute("activityID", base.ActivityID),
trace.StringAttribute("cid", base.ContainerID))

log.G(ctx).WithField("message", string(message)).Debug("request read message")

etry := log.G(ctx)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this supposed to be entry?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, i forgot an n

return nil
}
if ss, ok := m["ContainerConfig"]; ok {
// ContainerConfig is a json encoded struct passed as a regular sting field
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

string*

Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
@helsaawy helsaawy merged commit 326001d into microsoft:master Mar 14, 2022
princepereira pushed a commit to princepereira/hcsshim that referenced this pull request Aug 29, 2024
Updated scrubbing for guest side, and added scrubbing for annotations
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants