Skip to content

Commit 96b6b36

Browse files
committed
[AWSX] fix(logs forwarder): Scrub logs once
1 parent 4d4a5f3 commit 96b6b36

2 files changed

Lines changed: 5 additions & 10 deletions

File tree

aws/logs_monitoring/forwarder.py

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -94,16 +94,9 @@ def _forward_logs(self, logs, key=None):
9494
evaluated_log = log
9595
to_forward = None
9696

97-
# apply scrubbing rules to inner log message
9897
if isinstance(log, dict):
9998
if log.get("message"):
100-
try:
101-
log["message"] = scrubber.scrub(log["message"])
102-
evaluated_log = log["message"]
103-
except Exception as e:
104-
logger.error(
105-
f"Exception while scrubbing log message {log['message']}: {e}"
106-
)
99+
evaluated_log = log["message"]
107100
else:
108101
to_forward = dump_event(log)
109102
evaluated_log = to_forward

aws/logs_monitoring/settings.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,10 +242,12 @@ def is_api_key_valid():
242242

243243
# Check if the API key is the correct number of characters
244244
if len(DD_API_KEY) != 32:
245-
raise Exception(f"""
245+
raise Exception(
246+
f"""
246247
Invalid Datadog API key format. Expected 32 characters, received {len(DD_API_KEY)}.
247248
Verify your API key at https://app.{DD_SITE}/organization-settings/api-keys
248-
""")
249+
"""
250+
)
249251

250252
# Validate the API key
251253
logger.debug("Validating the Datadog API key")

0 commit comments

Comments
 (0)