From 7ee3e58202b5e2fdec5a64a1c864ae135646980d Mon Sep 17 00:00:00 2001 From: Vladyslav Kopaihorodskyi Date: Thu, 16 Sep 2021 12:13:11 +0300 Subject: [PATCH] added traceId to logging messages if exists --- pubsub/message/execution/context.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pubsub/message/execution/context.go b/pubsub/message/execution/context.go index dade75a..f0f00ce 100644 --- a/pubsub/message/execution/context.go +++ b/pubsub/message/execution/context.go @@ -2,6 +2,7 @@ package execution import ( "context" + "fmt" "github.com/go-foreman/foreman/log" "github.com/go-foreman/foreman/pubsub/endpoint" @@ -59,7 +60,7 @@ func (m messageExecutionCtx) Return(options ...endpoint.DeliveryOption) error { m.message.Headers().RegisterReturn() if err := m.Send(outComingMsg, options...); err != nil { m.logger.Logf(log.ErrorLevel, "error when returning a message %s", outComingMsg.UID()) - return errors.Wrapf(err, "error when returning a message %s", outComingMsg.UID()) + return errors.Wrapf(err, "returning message %s", outComingMsg.UID()) } return nil @@ -70,6 +71,11 @@ func (m messageExecutionCtx) Message() *message.ReceivedMessage { } func (m messageExecutionCtx) LogMessage(lvl log.Level, msg string) { + if traceID, exists := m.Message().Headers()["traceId"]; exists { + m.logger.Log(lvl, fmt.Sprintf("TraceID: %s. %s", traceID, msg)) + return + } + m.logger.Log(lvl, msg) }