Skip to content

remove fields #123

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
2 commits merged into from
Aug 15, 2019
Merged

remove fields #123

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d4170d6
remove fields
Aug 15, 2019
65aaf60
remove fields
Aug 15, 2019
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
2 changes: 1 addition & 1 deletion gbus/serialization/avro.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ func (as *Avro) Encode(obj gbus.Message) (msg []byte, err error) {
tobj, ok := obj.(AvroMessageGenerated)
if !ok {
err := fmt.Errorf("could not convert obj to AvroMessageGenerated")
logrus.WithError(err).WithField("obj", obj).Error("could not convert object")
logrus.WithError(err).Error("could not convert object")
return nil, err
}

Expand Down
2 changes: 1 addition & 1 deletion gbus/serialization/proto.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ func (as *Proto) Decode(buffer []byte, schemaName string) (msg gbus.Message, err
msg, ok = tmsg.(gbus.Message)
if !ok {
err = fmt.Errorf("could not cast obj to gbus.Message")
as.logger.WithError(err).WithField("msg", tmsg).Errorf("could not cast %v to gbus.Message", tmsg)
as.logger.WithError(err).Errorf("could not cast %v to gbus.Message", tmsg)
return nil, err
}

Expand Down
34 changes: 17 additions & 17 deletions gbus/worker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ func (worker *worker) extractBusMessage(delivery amqp.Delivery) (*BusMessage, er
var decErr error
bm.Payload, decErr = worker.serializer.Decode(delivery.Body, bm.PayloadFQN)
if decErr != nil {
worker.log().WithError(decErr).WithField("message", delivery).Error("failed to decode message. rejected as poison")
worker.log().WithError(decErr).WithField("fqn", bm.PayloadFQN).Error("failed to decode message. rejected as poison")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we use message_name as the field name to log when logging this in other places so let's align on that

Suggested change
worker.log().WithError(decErr).WithField("fqn", bm.PayloadFQN).Error("failed to decode message. rejected as poison")
worker.log().WithError(decErr).WithField("meessage_name", bm.PayloadFQN).Error("failed to decode message. rejected as poison")

return nil, decErr
}
return bm, nil
Expand Down Expand Up @@ -337,13 +337,13 @@ func (worker *worker) invokeHandlers(sctx context.Context, handlers []MessageHan
// each retry should run a new and separate transaction which should end with a commit or rollback

action := func(attempt uint) (actionErr error) {

tx, txCreateErr := worker.txProvider.New()
if txCreateErr != nil {
worker.log().WithError(txCreateErr).Error("failed creating new tx")
worker.span.LogFields(slog.Error(txCreateErr))
return txCreateErr
}
if txCreateErr != nil {
worker.log().WithError(txCreateErr).Error("failed creating new tx")
worker.span.LogFields(slog.Error(txCreateErr))
return txCreateErr
}

worker.span, sctx = opentracing.StartSpanFromContext(sctx, "invokeHandlers")
worker.span.LogFields(slog.Uint64("attempt", uint64(attempt+1)))
Expand All @@ -353,9 +353,9 @@ func (worker *worker) invokeHandlers(sctx context.Context, handlers []MessageHan
worker.log().WithField("stack", pncMsg).Error("recovered from panic while invoking handler")
actionErr = errors.New(pncMsg)
rbkErr := tx.Rollback()
if rbkErr != nil {
worker.log().WithError(rbkErr).Error("failed rolling back transaction when recovering from handler panic")
}
if rbkErr != nil {
worker.log().WithError(rbkErr).Error("failed rolling back transaction when recovering from handler panic")
}
worker.span.LogFields(slog.Error(actionErr))
}
worker.span.Finish()
Expand Down Expand Up @@ -392,17 +392,17 @@ func (worker *worker) invokeHandlers(sctx context.Context, handlers []MessageHan
if handlerErr != nil {
hspan.LogFields(slog.Error(handlerErr))
rbkErr := tx.Rollback()
if rbkErr != nil {
worker.log().WithError(rbkErr).Error("failed rolling back transaction when recovering from handler error")
}
if rbkErr != nil {
worker.log().WithError(rbkErr).Error("failed rolling back transaction when recovering from handler error")
}
hspan.Finish()
return handlerErr
}
cmtErr := tx.Commit()
if cmtErr != nil {
worker.log().WithError(cmtErr).Error("failed committing transaction after invoking handlers")
return cmtErr
}
if cmtErr != nil {
worker.log().WithError(cmtErr).Error("failed committing transaction after invoking handlers")
return cmtErr
}
return nil
}

Expand Down