feat: add msg.String() to all msg related events

sygmaprotocol · Aug 10, 2023 · b7a1281 · b7a1281
1 parent 625faa3
commit b7a1281
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/chains/evm/executor/executor.go b/chains/evm/executor/executor.go
@@ -83,8 +83,8 @@ func (e *Executor) Execute(ctx context.Context, msgs []*message.Message) error {
 
 	proposals := make([]*chains.Proposal, 0)
 	for _, m := range msgs {
-		logger.Info().Str("msg.id", m.ID()).Msgf("Message to execute %s", m.String())
-		span.AddEvent("Message to execute received", traceapi.WithAttributes(attribute.String("msg.id", m.ID()), attribute.String("msg.type", string(m.Type))))
+		logger.Debug().Str("msg.id", m.ID()).Msgf("Message to execute %s", m.String())
+		span.AddEvent("Message to execute received", traceapi.WithAttributes(attribute.String("msg.id", m.ID()), attribute.String("msg.full", m.String())))
 		prop, err := e.mh.HandleMessage(m)
 		if err != nil {
 			return fmt.Errorf("failed to handle message %s with error: %w", m.String(), err)
@@ -97,11 +97,11 @@ func (e *Executor) Execute(ctx context.Context, msgs []*message.Message) error {
 		}
 		if isExecuted {
 			logger.Info().Str("msg.id", m.ID()).Msgf("Message already executed %s", m.String())
-			span.AddEvent("Message already executed", traceapi.WithAttributes(attribute.String("msg.id", m.ID()), attribute.String("msg.type", string(m.Type))))
+			span.AddEvent("Message already executed", traceapi.WithAttributes(attribute.String("msg.id", m.ID()), attribute.String("msg.full", m.String())))
 			continue
 		}
 		logger.Info().Str("msg.id", m.ID()).Msgf("Executing message %s", m.String())
-		span.AddEvent("Executing message", traceapi.WithAttributes(attribute.String("msg.id", m.ID()), attribute.String("msg.type", string(m.Type))))
+		span.AddEvent("Executing message", traceapi.WithAttributes(attribute.String("msg.id", m.ID()), attribute.String("msg.full", m.String())))
 		proposals = append(proposals, evmProposal)
 	}
 	if len(proposals) == 0 {
@@ -174,15 +174,15 @@ func (e *Executor) watchExecution(ctx context.Context, cancelExecution context.C
 					return err
 				}
 
-				logger.Info().Str("SessionID", sessionID).Msgf("Sent proposals execution with hash: %s", hash)
+				logger.Debug().Str("SessionID", sessionID).Msgf("Sent proposals execution with hash: %s", hash)
 			}
 		case <-ticker.C:
 			{
 				if !e.areProposalsExecuted(proposals, sessionID) {
 					continue
 				}
 
-				logger.Info().Str("SessionID", sessionID).Msgf("Successfully executed proposals")
+				logger.Debug().Str("SessionID", sessionID).Msgf("Successfully executed proposals")
 				span.AddEvent("Proposals executed", traceapi.WithAttributes(attribute.String("tss.session.id", sessionID)))
 				return nil
 			}

diff --git a/chains/evm/listener/event-handler.go b/chains/evm/listener/event-handler.go
@@ -98,7 +98,7 @@ func (eh *DepositEventHandler) HandleEvent(
 			}
 			logger.Info().Str("msg.id", m.ID()).Msgf("Resolved deposit message %s in block range: %s-%s", m.String(), startBlock.String(), endBlock.String())
 			// Events should eventually replace most of the logs
-			span.AddEvent("Resolved deposit message", traceapi.WithAttributes(attribute.String("msg.id", m.ID()), attribute.String("msg.type", string(m.Type))))
+			span.AddEvent("Resolved deposit message", traceapi.WithAttributes(attribute.String("msg.id", m.ID()), attribute.String("msg.full", m.String())))
 			if m.Type == PermissionlessGenericTransfer {
 				msgChan <- []*message.Message{m}
 				return

diff --git a/chains/substrate/executor/executor.go b/chains/substrate/executor/executor.go
@@ -92,8 +92,8 @@ func (e *Executor) Execute(ctx context.Context, msgs []*message.Message) error {
 
 	proposals := make([]*chains.Proposal, 0)
 	for _, m := range msgs {
-		logger.Info().Str("msg.id", m.ID()).Msgf("Message to execute %s", m.String())
-		span.AddEvent("Message to execute received", traceapi.WithAttributes(attribute.String("msg.id", m.ID()), attribute.String("msg.type", string(m.Type))))
+		logger.Debug().Str("msg.id", m.ID()).Msgf("Message to execute %s", m.String())
+		span.AddEvent("Message to execute received", traceapi.WithAttributes(attribute.String("msg.id", m.ID()), attribute.String("msg.full", m.String())))
 		prop, err := e.mh.HandleMessage(m)
 		if err != nil {
 			return fmt.Errorf("failed to handle message %s with error: %w", m.String(), err)
@@ -105,8 +105,8 @@ func (e *Executor) Execute(ctx context.Context, msgs []*message.Message) error {
 			return err
 		}
 		if isExecuted {
-			logger.Info().Str("msg.id", m.ID()).Msgf("Message already executed %s", m.String())
-			span.AddEvent("Message already executed", traceapi.WithAttributes(attribute.String("msg.id", m.ID()), attribute.String("msg.type", string(m.Type))))
+			logger.Debug().Str("msg.id", m.ID()).Msgf("Message already executed %s", m.String())
+			span.AddEvent("Message already executed", traceapi.WithAttributes(attribute.String("msg.id", m.ID()), attribute.String("msg.full", m.String())))
 			continue
 		}
 

diff --git a/chains/substrate/listener/event-handlers.go b/chains/substrate/listener/event-handlers.go
@@ -98,8 +98,8 @@ func (eh *FungibleTransferEventHandler) HandleEvents(ctx context.Context, evts [
 					return
 				}
 
-				logger.Info().Str("msg.id", m.ID()).Msgf("Resolved deposit message %s", m.String())
-				span.AddEvent("Resolved message", traceapi.WithAttributes(attribute.String("msg.id", m.ID()), attribute.String("msg.type", string(m.Type))))
+				logger.Debug().Str("msg.id", m.ID()).Msgf("Resolved deposit message %s", m.String())
+				span.AddEvent("Resolved message", traceapi.WithAttributes(attribute.String("msg.id", m.ID()), attribute.String("msg.full", m.String())))
 				domainDeposits[m.Destination] = append(domainDeposits[m.Destination], m)
 			}(*evt)
 		}