Skip to content

Fix misleading fields in log statements #866

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

Open
ZayanKhan-12 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix misleading fields in log statements #866

Show file tree
Hide file tree
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
3 changes: 1 addition & 2 deletions core/internal/consumer/kafka_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,9 +502,8 @@ func (module *KafkaClient) decodeKeyAndOffset(offsetOrder int64, keyBuffer *byte
func (module *KafkaClient) decodeAndSendOffset(offsetOrder int64, offsetKey offsetKey, valueBuffer *bytes.Buffer, logger *zap.Logger, decoder func(*bytes.Buffer) (offsetValue, string)) {
offsetValue, errorAt := decoder(valueBuffer)
if errorAt != "" {
// Don't log offsetValue fields - the decoder returned early, so they are zero or only partially filled in
logger.Warn("failed to decode",
zap.Int64("offset", offsetValue.Offset),
zap.Int64("timestamp", offsetValue.Timestamp),
zap.String("reason", errorAt),
)
return
Expand Down
4 changes: 2 additions & 2 deletions core/internal/notifier/coordinator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,14 +310,14 @@ func (nc *Coordinator) manageEvalLoop() {
nc.doEvaluations = true
nc.running.Add(1)
go nc.sendEvaluatorRequests()
nc.Log.Info("starting evaluations", zap.Error(err))
nc.Log.Info("starting evaluations")

// Wait for ZK session expiration, and stop doing evaluations if it happens
nc.App.ZookeeperExpired.L.Lock()
nc.App.ZookeeperExpired.Wait()
nc.App.ZookeeperExpired.L.Unlock()
nc.doEvaluations = false
nc.Log.Info("stopping evaluations", zap.Error(err))
nc.Log.Info("stopping evaluations")

// Wait for the ZK connection to come back before trying again
for !nc.App.ZookeeperConnected {
Expand Down