From 68ade177c45c14a2b9d07fd1a1f971c4e01eaee7 Mon Sep 17 00:00:00 2001
From: Fabio Di Fabio <fabio.difabio@consensys.net>
Date: Tue, 2 Apr 2024 15:29:10 +0200
Subject: [PATCH] Log at debug the first error when adding a tx for the sender
 fails (#6846)

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
---
 .../layered/LayeredPendingTransactions.java   | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/layered/LayeredPendingTransactions.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/layered/LayeredPendingTransactions.java
index 5b2eadf87f0..878c1b0793b 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/layered/LayeredPendingTransactions.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/layered/LayeredPendingTransactions.java
@@ -111,23 +111,25 @@ private TransactionAddedResult reconcileAndRetryAdd(
       final Throwable throwable) {
     // in case something unexpected happened, log this sender txs, force a reconcile and retry
     // another time
-    // ToDo: demote to debug when Layered TxPool is out of preview
-    LOG.warn(
-        "Unexpected error {} when adding transaction {}, current sender status {}",
-        throwable,
-        pendingTransaction.toTraceLog(),
-        prioritizedTransactions.logSender(pendingTransaction.getSender()));
-    LOG.warn("Stack trace", throwable);
+    LOG.atDebug()
+        .setMessage(
+            "Unexpected error when adding transaction {}, current sender status {}, force a reconcile and retry")
+        .setCause(throwable)
+        .addArgument(pendingTransaction::toTraceLog)
+        .addArgument(() -> prioritizedTransactions.logSender(pendingTransaction.getSender()))
+        .log();
     reconcileSender(pendingTransaction.getSender(), stateSenderNonce);
     try {
       return prioritizedTransactions.add(pendingTransaction, nonceDistance);
     } catch (final Throwable throwable2) {
-      LOG.warn(
-          "Unexpected error {} when adding transaction {}, current sender status {}",
-          throwable,
-          pendingTransaction.toTraceLog(),
-          prioritizedTransactions.logSender(pendingTransaction.getSender()));
-      LOG.warn("Stack trace", throwable);
+      // the error should have been solved by the reconcile, logging at higher level now
+      LOG.atWarn()
+          .setCause(throwable2)
+          .setMessage(
+              "Unexpected error when adding transaction {} after reconciliation, current sender status {}")
+          .addArgument(pendingTransaction.toTraceLog())
+          .addArgument(prioritizedTransactions.logSender(pendingTransaction.getSender()))
+          .log();
       return INTERNAL_ERROR;
     }
   }