From 0bc1f20ac57a58e7568fe19bad78c1e1d6fb5447 Mon Sep 17 00:00:00 2001 From: Kirill Date: Mon, 28 Aug 2023 11:47:06 +0200 Subject: [PATCH] fix: fix message id to be more unique and update logs traceid attribute name (#347) * fix: make msg.id to be unique and now include source-destination-nonce * fix: change trace_id logs attr to dd.trace_id for DataDog parsing --- chains/evm/calls/events/listener.go | 2 +- chains/evm/listener/event-handler.go | 2 +- chains/evm/listener/listener.go | 2 +- relayer/message/message.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/chains/evm/calls/events/listener.go b/chains/evm/calls/events/listener.go index 9f9324fd..d1f5751e 100644 --- a/chains/evm/calls/events/listener.go +++ b/chains/evm/calls/events/listener.go @@ -37,7 +37,7 @@ func (l *Listener) FetchDeposits(ctx context.Context, contractAddress common.Add ctxWithSpan, span := otel.Tracer("relayer-core").Start(ctx, "relayer.core.Listener.FetchDeposits") defer span.End() span.SetAttributes(attribute.String("startBlock", startBlock.String()), attribute.String("endBlock", endBlock.String())) - logger := log.With().Str("trace_id", span.SpanContext().TraceID().String()).Logger() + logger := log.With().Str("dd.trace_id", span.SpanContext().TraceID().String()).Logger() logs, err := l.client.FetchEventLogs(ctxWithSpan, contractAddress, string(DepositSig), startBlock, endBlock) if err != nil { diff --git a/chains/evm/listener/event-handler.go b/chains/evm/listener/event-handler.go index 3bbb412f..00f16911 100644 --- a/chains/evm/listener/event-handler.go +++ b/chains/evm/listener/event-handler.go @@ -46,7 +46,7 @@ func (eh *DepositEventHandler) HandleEvent(ctx context.Context, startBlock *big. ctxWithSpan, span := otel.Tracer("relayer-core").Start(ctx, "relayer.core.DepositEventHandler.HandleEvent") defer span.End() span.SetAttributes(attribute.String("startBlock", startBlock.String()), attribute.String("endBlock", endBlock.String())) - logger := log.With().Str("trace_id", span.SpanContext().TraceID().String()).Logger() + logger := log.With().Str("dd.trace_id", span.SpanContext().TraceID().String()).Logger() deposits, err := eh.eventListener.FetchDeposits(ctxWithSpan, eh.bridgeAddress, startBlock, endBlock) if err != nil { span.SetStatus(codes.Error, err.Error()) diff --git a/chains/evm/listener/listener.go b/chains/evm/listener/listener.go index de7bfc5e..805fb99c 100644 --- a/chains/evm/listener/listener.go +++ b/chains/evm/listener/listener.go @@ -78,7 +78,7 @@ func (l *EVMListener) ListenToEvents(ctx context.Context, startBlock *big.Int, m return default: ctxWithSpan, span := otel.Tracer("relayer-core").Start(ctx, "relayer.core.EVMListener.ListenToEvents") - logger := l.log.With().Str("trace_id", span.SpanContext().TraceID().String()).Logger() + logger := l.log.With().Str("dd.trace_id", span.SpanContext().TraceID().String()).Logger() head, err := l.client.LatestBlock() if err != nil { logger.Error().Err(err).Msg("Unable to get latest block") diff --git a/relayer/message/message.go b/relayer/message/message.go index 96bbf3d1..f1baf01d 100644 --- a/relayer/message/message.go +++ b/relayer/message/message.go @@ -94,5 +94,5 @@ func NewMessage( } func (m Message) ID() string { - return strconv.FormatInt(int64(m.Source), 10) + "-" + strconv.FormatInt(int64(m.DepositNonce), 10) + return strconv.FormatInt(int64(m.Source), 10) + "-" + strconv.FormatInt(int64(m.Destination), 10) + "-" + strconv.FormatInt(int64(m.DepositNonce), 10) }