Skip to content

Commit fd187bc

Browse files
macfarlafab-10
macfarla
and
fab-10
authored
moved some logs to trace level (hyperledger#6207)
* moved some logs to trace level * shortNodeId * Apply suggestions from code review Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> --------- Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> Co-authored-by: Fabio Di Fabio <fabio.difabio@consensys.net>
1 parent 3765aaf commit fd187bc

18 files changed

+66
-39
lines changed

‎ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/query/cache/TransactionLogBloomCacher.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,10 @@ void cacheLogsBloomForBlockHeader(
159159
return;
160160
}
161161
final long blockNumber = blockHeader.getNumber();
162-
LOG.debug("Caching logs bloom for block {}.", "0x" + Long.toHexString(blockNumber));
162+
LOG.atDebug()
163+
.setMessage("Caching logs bloom for block {}")
164+
.addArgument(() -> "0x" + Long.toHexString(blockNumber))
165+
.log();
163166
final File cacheFile = reusedCacheFile.orElse(calculateCacheFileName(blockNumber, cacheDir));
164167
if (cacheFile.exists()) {
165168
try {

‎ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthPeer.java‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -210,16 +210,20 @@ public void removeChainEstimatedHeightListener(final long listenerId) {
210210
}
211211

212212
public void recordRequestTimeout(final int requestCode) {
213-
LOG.debug("Timed out while waiting for response from peer {}", this.getShortNodeId());
213+
LOG.atDebug()
214+
.setMessage("Timed out while waiting for response from peer {}...")
215+
.addArgument(this::getShortNodeId)
216+
.log();
214217
LOG.trace("Timed out while waiting for response from peer {}", this);
215218
reputation.recordRequestTimeout(requestCode).ifPresent(this::disconnect);
216219
}
217220

218221
public void recordUselessResponse(final String requestType) {
219-
LOG.debug(
220-
"Received useless response for request type {} from peer {}",
221-
requestType,
222-
this.getShortNodeId());
222+
LOG.atTrace()
223+
.setMessage("Received useless response for request type {} from peer {}...")
224+
.addArgument(requestType)
225+
.addArgument(this::getShortNodeId)
226+
.log();
223227
reputation.recordUselessResponse(System.currentTimeMillis()).ifPresent(this::disconnect);
224228
}
225229

‎ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/AbstractGetHeadersFromPeerTask.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,11 +125,11 @@ protected Optional<List<BlockHeader>> processResponse(
125125
updatePeerChainState(peer, header);
126126
}
127127

128-
LOG.atDebug()
128+
LOG.atTrace()
129129
.setMessage("Received {} of {} headers requested from peer {}...")
130-
.addArgument(headersList.size())
130+
.addArgument(headersList::size)
131131
.addArgument(count)
132-
.addArgument(peer.getShortNodeId())
132+
.addArgument(peer::getShortNodeId)
133133
.log();
134134
return Optional.of(headersList);
135135
}

‎ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/AbstractRetryingSwitchingPeerTask.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ private void refreshPeers() {
145145
peer -> {
146146
LOG.atDebug()
147147
.setMessage(
148-
"Refresh peers disconnecting peer {}. Waiting for better peers. Current {} of max {}")
148+
"Refresh peers disconnecting peer {}... Waiting for better peers. Current {} of max {}")
149149
.addArgument(peer::getShortNodeId)
150150
.addArgument(peers::peerCount)
151151
.addArgument(peers::getMaxPeers)

‎ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/BufferedGetPooledTransactionsFromPeerFetcher.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,10 @@ public void requestTransactions() {
8989
transactionTracker.markTransactionsAsSeen(peer, retrievedTransactions);
9090

9191
LOG.atTrace()
92-
.setMessage("Got {} transactions of {} hashes requested from peer {}")
92+
.setMessage("Got {} transactions of {} hashes requested from peer {}...")
9393
.addArgument(retrievedTransactions::size)
9494
.addArgument(task.getTransactionHashes()::size)
95-
.addArgument(peer)
95+
.addArgument(peer::getShortNodeId)
9696
.log();
9797

9898
transactionPool.addRemoteTransactions(retrievedTransactions);
@@ -120,8 +120,8 @@ private List<Hash> getTxHashesAnnounced() {
120120
metrics.incrementAlreadySeenTransactions(metricLabel, alreadySeenCount);
121121
LOG.atTrace()
122122
.setMessage(
123-
"Transaction hashes to request from peer {}, fresh count {}, already seen count {}")
124-
.addArgument(peer)
123+
"Transaction hashes to request from peer {}... fresh count {}, already seen count {}")
124+
.addArgument(peer::getShortNodeId)
125125
.addArgument(toRetrieve::size)
126126
.addArgument(alreadySeenCount)
127127
.log();

‎ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/GetBodiesFromPeerTask.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,11 @@ protected PendingPeerRequest sendRequest() {
9393

9494
return sendRequestToPeer(
9595
peer -> {
96-
LOG.debug("Requesting {} bodies from peer {}.", blockHashes.size(), peer);
96+
LOG.atTrace()
97+
.setMessage("Requesting {} bodies from peer {}.")
98+
.addArgument(blockHashes.size())
99+
.addArgument(peer)
100+
.log();
97101
return peer.getBodies(blockHashes);
98102
},
99103
minimumRequiredBlockNumber);
@@ -103,7 +107,7 @@ protected PendingPeerRequest sendRequest() {
103107
protected Optional<List<Block>> processResponse(
104108
final boolean streamClosed, final MessageData message, final EthPeer peer) {
105109
if (streamClosed) {
106-
// All outstanding requests have been responded to and we still haven't found the response
110+
// All outstanding requests have been responded to, and we still haven't found the response
107111
// we wanted. It must have been empty or contain data that didn't match.
108112
peer.recordUselessResponse("bodies");
109113
return Optional.of(Collections.emptyList());

‎ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/GetHeadersFromPeerByHashTask.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,11 +119,11 @@ public static AbstractGetHeadersFromPeerTask forSingleHash(
119119
protected PendingPeerRequest sendRequest() {
120120
return sendRequestToPeer(
121121
peer -> {
122-
LOG.atDebug()
122+
LOG.atTrace()
123123
.setMessage("Requesting {} headers (hash {}...) from peer {}...")
124124
.addArgument(count)
125125
.addArgument(referenceHash.slice(0, 6))
126-
.addArgument(peer.getShortNodeId())
126+
.addArgument(peer::getShortNodeId)
127127
.log();
128128
return peer.getHeadersByHash(referenceHash, count, skip, reverse);
129129
},

‎ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/GetHeadersFromPeerByNumberTask.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,12 @@ public static AbstractGetHeadersFromPeerTask forSingleNumber(
7777
protected PendingPeerRequest sendRequest() {
7878
return sendRequestToPeer(
7979
peer -> {
80-
LOG.debug(
81-
"Requesting {} headers (blockNumber {}) from peer {}.",
82-
count,
83-
blockNumber,
84-
peer.getShortNodeId());
80+
LOG.atTrace()
81+
.setMessage("Requesting {} headers (blockNumber {}) from peer {}.")
82+
.addArgument(count)
83+
.addArgument(blockNumber)
84+
.addArgument(peer::getShortNodeId)
85+
.log();
8586
return peer.getHeadersByNumber(blockNumber, count, skip, reverse);
8687
},
8788
blockNumber);

‎ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/GetNodeDataFromPeerTask.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,11 @@ public static GetNodeDataFromPeerTask forHashes(
6666
protected PendingPeerRequest sendRequest() {
6767
return sendRequestToPeer(
6868
peer -> {
69-
LOG.debug("Requesting {} node data entries from peer {}.", hashes.size(), peer);
69+
LOG.atTrace()
70+
.setMessage("Requesting {} node data entries from peer {}...")
71+
.addArgument(hashes::size)
72+
.addArgument(peer::getShortNodeId)
73+
.log();
7074
return peer.getNodeData(hashes);
7175
},
7276
pivotBlockNumber);

‎ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/GetPooledTransactionsFromPeerTask.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,11 @@ public Set<Hash> getTransactionHashes() {
6161
protected PendingPeerRequest sendRequest() {
6262
return sendRequestToPeer(
6363
peer -> {
64-
LOG.debug("Requesting {} transaction pool entries from peer {}.", hashes.size(), peer);
64+
LOG.atTrace()
65+
.setMessage("Requesting {} transaction pool entries from peer {}...")
66+
.addArgument(hashes::size)
67+
.addArgument(peer::getShortNodeId)
68+
.log();
6569
return peer.getPooledTransactions(new ArrayList<>(hashes));
6670
},
6771
0);

0 commit comments

Comments
 (0)