chore: replace tracer initialisation 2liner with 1 line built in fuin…

…ction
ChainSafe · Aug 1, 2023 · cb7454d · cb7454d
1 parent f10b743
commit cb7454d
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 10 deletions.
diff --git a/chains/evm/calls/events/listener.go b/chains/evm/calls/events/listener.go
@@ -35,8 +35,7 @@ func NewListener(client ChainClient) *Listener {
 }
 
 func (l *Listener) FetchDeposits(ctx context.Context, contractAddress common.Address, startBlock *big.Int, endBlock *big.Int) ([]*Deposit, error) {
-	tp := otel.GetTracerProvider()
-	ctxWithSpan, span := tp.Tracer("relayer-events").Start(ctx, "relayer.core.Listener.FetchDeposits")
+	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()))
 

diff --git a/chains/evm/listener/event-handler.go b/chains/evm/listener/event-handler.go
@@ -41,8 +41,7 @@ func NewDepositEventHandler(eventListener EventListener, depositHandler DepositH
 }
 
 func (eh *DepositEventHandler) HandleEvent(ctx context.Context, startBlock *big.Int, endBlock *big.Int, msgChan chan []*message.Message) error {
-	tp := otel.GetTracerProvider()
-	ctxWithSpan, span := tp.Tracer("relayer-listener").Start(ctx, "relayer.core.DepositEventHandler.HandleEvent")
+	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()

diff --git a/chains/evm/listener/listener.go b/chains/evm/listener/listener.go
@@ -77,8 +77,7 @@ func (l *EVMListener) ListenToEvents(ctx context.Context, startBlock *big.Int, m
 		case <-ctx.Done():
 			return
 		default:
-			tp := otel.GetTracerProvider()
-			ctxWithSpan, span := tp.Tracer("relayer-listener").Start(ctx, "relayer.core.EVMListener.ListenToEvents")
+			ctxWithSpan, span := otel.Tracer("relayer-core").Start(ctx, "relayer.core.EVMListener.ListenToEvents")
 			logger := l.log.With().Str("trace_id", span.SpanContext().TraceID().String()).Logger()
 			head, err := l.client.LatestBlock()
 			if err != nil {

diff --git a/relayer/message/message_processors.go b/relayer/message/message_processors.go
@@ -19,8 +19,7 @@ type MessageProcessor func(ctx context.Context, message *Message) error
 // using this  params processor converts amount for one chain to another for provided decimals with floor rounding
 func AdjustDecimalsForERC20AmountMessageProcessor(args ...interface{}) MessageProcessor {
 	return func(ctx context.Context, m *Message) error {
-		tp := otel.GetTracerProvider()
-		_, span := tp.Tracer("relayer-route").Start(ctx, "relayer.core.MessageProcessor.AdjustDecimalsForERC20AmountMessageProcessor")
+		_, span := otel.Tracer("relayer-core").Start(ctx, "relayer.core.MessageProcessor.AdjustDecimalsForERC20AmountMessageProcessor")
 		span.SetAttributes(attribute.String("msg_id", m.ID()), attribute.String("msg_type", string(m.Type)))
 		defer span.End()
 		if len(args) == 0 {

diff --git a/relayer/relayer.go b/relayer/relayer.go
@@ -64,8 +64,7 @@ func (r *Relayer) Start(ctx context.Context, sysErr chan error) {
 
 // Route function runs destination writer by mapping DestinationID from message to registered writer.
 func (r *Relayer) route(msgs []*message.Message) {
-	tp := otel.GetTracerProvider()
-	ctxWithSpan, span := tp.Tracer("relayer-route").Start(context.Background(), "relayer.core.Route")
+	ctxWithSpan, span := otel.Tracer("relayer-core").Start(context.Background(), "relayer.core.Route")
 	defer span.End()
 
 	destChain, ok := r.registry[msgs[0].Destination]