Review Logging Change

Review logging changes for sensitive data, log volume and useful context.

• review
• code