update dest tx hash before status/improve obversability

core/metrics/spanutils.go

@@ -1,6 +1,9 @@
 package metrics
 
-import "go.opentelemetry.io/otel/trace"
+import (
+	"go.opentelemetry.io/otel/attribute"
+	"go.opentelemetry.io/otel/trace"
+)
 
 // EndSpanWithErr ends a span and records an error if one is present.
 func EndSpanWithErr(span trace.Span, err error) {
@@ -9,6 +12,7 @@
 	}
 
 	if err != nil {
+		span.SetAttributes(attribute.String("span_error", err.Error()))
 		span.RecordError(err)
 	}
 

services/rfq/guard/service/handlers.go

@@ -42,7 +42,16 @@
 	}
 
 	var bridgeTx fastbridge.IFastBridgeBridgeTransaction
 	call := func(ctx context.Context) error {
+		ctx, newSpan := g.metrics.Tracer().Start(parentCtx, "fetchBridgeTx", trace.WithAttributes(
+			attribute.String("transaction_id", hexutil.Encode(req.TransactionId[:])),
+			attribute.String("bridge_address", req.Raw.Address.String()),
+		))
+
+		defer func() {
+			metrics.EndSpanWithErr(newSpan, err)
+		}()
+
 		bridgeTx, err = fastBridge.GetBridgeTransaction(&bind.CallOpts{Context: ctx}, req.Request)
 		if err != nil {
 			return fmt.Errorf("could not get bridge transaction: %w", err)

services/rfq/relayer/service/handlers.go

@@ -20,7 +20,7 @@
 	"go.opentelemetry.io/otel/trace"
 )
 
-var maxRPCRetryTime = 15 * time.Second
+var maxRPCRetryTime = 30 * time.Second
 
 // handleBridgeRequestedLog handles the BridgeRequestedLog event.
 // Step 1: Seen
@@ -71,7 +71,16 @@
 	}
 
 	var bridgeTx fastbridge.IFastBridgeBridgeTransaction
-	call := func(ctx context.Context) error {
+	call := func(parentCtx context.Context) error {
+		ctx, newSpan := r.metrics.Tracer().Start(parentCtx, "fetchBridgeTx", trace.WithAttributes(
+			attribute.String("transaction_id", hexutil.Encode(req.TransactionId[:])),
+			attribute.String("bridge_address", req.Raw.Address.String()),
+		))
+
+		defer func() {
+			metrics.EndSpanWithErr(newSpan, err)
+		}()
+
 		bridgeTx, err = fastBridge.GetBridgeTransaction(&bind.CallOpts{Context: ctx}, req.Request)
 		if err != nil {
 			return fmt.Errorf("could not get bridge transaction: %w", err)
@@ -332,14 +341,15 @@
 	}
 
 	// TODO: this can still get re-orged
-	err = r.db.UpdateQuoteRequestStatus(ctx, req.TransactionId, reldb.RelayCompleted, nil)
-	if err != nil {
-		return fmt.Errorf("could not update request status: %w", err)
-	}
 	err = r.db.UpdateDestTxHash(ctx, req.TransactionId, req.Raw.TxHash)
 	if err != nil {
 		return fmt.Errorf("could not update dest tx hash: %w", err)
 	}
+
+	err = r.db.UpdateQuoteRequestStatus(ctx, req.TransactionId, reldb.RelayCompleted, nil)
+	if err != nil {
+		return fmt.Errorf("could not update request status: %w", err)
+	}
 	return nil
 }
 
@@ -421,6 +431,14 @@
 
 	var canClaim bool
 	claimCall := func(ctx context.Context) error {
+		ctx, newSpan := q.metrics.Tracer().Start(ctx, "checkClaimCheck", trace.WithAttributes(
+			attribute.String("transaction_id", hexutil.Encode(request.TransactionID[:])),
+		))
+
+		defer func() {
+			metrics.EndSpanWithErr(newSpan, err)
+		}()
+
 		canClaim, err = q.Origin.Bridge.CanClaim(&bind.CallOpts{Context: ctx}, request.TransactionID, q.RelayerAddress)
 		if err != nil {
 			return fmt.Errorf("could not check if can claim: %w", err)