Skip to content

Commit

Permalink
Reduce log spam generated by conflicting session_id and event_index (#…
Browse files Browse the repository at this point in the history
…48548) (#48624)

Alters the log messages from #40854
such that they only occur if the fallback mechanism fails.

Updates #46801
  • Loading branch information
rosstimothy authored Nov 7, 2024
1 parent 1e41989 commit 054d6dc
Showing 1 changed file with 11 additions and 5 deletions.
16 changes: 11 additions & 5 deletions lib/events/dynamoevents/dynamoevents.go
Original file line number Diff line number Diff line change
Expand Up @@ -466,11 +466,17 @@ func (l *Log) putAuditEvent(ctx context.Context, sessionID string, in apievents.
// item event index/session id. Since we can't change the session
// id, update the event index with a new value and retry the put
// item.
l.
WithError(err).
WithFields(log.Fields{"event_type": in.GetType(), "session_id": sessionID, "event_index": in.GetIndex()}).
Error("Conflict on event session_id and event_index")
return trace.Wrap(l.handleConditionError(ctx, err, sessionID, in))
if err2 := l.handleConditionError(ctx, err, sessionID, in); err2 != nil {
// Only log about the original conflict if updating
// the session information fails.
l.
WithError(err).
WithFields(log.Fields{"event_type": in.GetType(), "session_id": sessionID, "event_index": in.GetIndex()}).
Error("Conflict on event session_id and event_index")
return trace.Wrap(err2)
}

return nil
}

return err
Expand Down

0 comments on commit 054d6dc

Please sign in to comment.