Skip to content

Don't send forwarder metrics incase of exceptions #756

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Mar 27, 2024
Merged

Don't send forwarder metrics incase of exceptions #756

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 19 additions & 20 deletions aws/logs_monitoring/forwarder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,16 +70,17 @@ def _forward_logs(logs):
)

with DatadogClient(cli) as client:
for batch in batcher.batch(logs_to_forward):
try:
try:
for batch in batcher.batch(logs_to_forward):
client.send(batch)
except Exception:
logger.exception("Exception while forwarding log batch")
finally:
if logger.isEnabledFor(logging.DEBUG):
logger.debug(f"Forwarded log batch: {json.dumps(batch)}")

send_event_metric("logs_forwarded", len(logs_to_forward))
except Exception:
logger.exception(
f"Exception while forwarding log batch {json.dumps(batch)}"
)
else:
send_event_metric("logs_forwarded", len(logs_to_forward))


def _forward_metrics(metrics):
Expand All @@ -89,29 +90,27 @@ def _forward_metrics(metrics):
"""
if logger.isEnabledFor(logging.DEBUG):
logger.debug(f"Forwarding {len(metrics)} metrics")

for metric in metrics:
try:
try:
for metric in metrics:
send_log_metric(metric)
except Exception:
logger.exception("Exception while forwarding metrics")
finally:
if logger.isEnabledFor(logging.DEBUG):
logger.debug(f"Forwarded metric: {json.dumps(metric)}")

send_event_metric("metrics_forwarded", len(metrics))
except Exception:
logger.exception(f"Exception while forwarding metric {json.dumps(metric)}")
else:
send_event_metric("metrics_forwarded", len(metrics))


def _forward_traces(trace_payloads):
if logger.isEnabledFor(logging.DEBUG):
logger.debug(f"Forwarding {len(trace_payloads)} traces")

try:
trace_connection.send_traces(trace_payloads)
except Exception:
logger.exception("Exception while forwarding traces")
finally:
logger.exception(
f"Exception while forwarding traces {json.dumps(trace_payloads)}"
)
else:
if logger.isEnabledFor(logging.DEBUG):
logger.debug(f"Forwarded traces: {json.dumps(trace_payloads)}")

send_event_metric("traces_forwarded", len(trace_payloads))
send_event_metric("traces_forwarded", len(trace_payloads))