Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] add more broadcast logs to scroll-v5.7.11 #1075

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from

Conversation

0xmountaintop
Copy link
Member

@0xmountaintop 0xmountaintop commented Oct 17, 2024

Summary by CodeRabbit

  • New Features

    • Enhanced logging for transaction handling and broadcasting, improving visibility and traceability of events.
  • Bug Fixes

    • Improved error logging for transaction failures and decoding errors, facilitating better debugging.
  • Documentation

    • Updated logs now provide additional context, including sender and recipient details during transaction processing.

@0xmountaintop 0xmountaintop changed the title [WIP] add more broadcast logs [WIP] add more broadcast logs to scroll-v5.7.11 Oct 17, 2024
Copy link

coderabbitai bot commented Oct 17, 2024

Walkthrough

The changes introduced in this pull request focus on enhancing logging capabilities across several files related to transaction handling and broadcasting. Key updates include upgrades to logging levels, the addition of new logging statements for transaction details, and improvements in error visibility. These modifications aim to provide better monitoring and debugging capabilities without altering the declarations of exported or public entities.

Changes

File(s) Change Summary
core/tx_pool.go Upgraded logging levels from log.Trace to log.Error or log.Info for discarded transactions; added context logs for sender and recipient details.
eth/fetcher/tx_fetcher.go Added detailed logging in scheduleFetches method, capturing peers and transaction hashes being fetched.
eth/handler.go Included logs in BroadcastTransactions for peer representation, number of transactions sent, and specific transaction hashes.
eth/protocols/eth/broadcast.go Changed error logging from Debug to Error for transaction sending failures; added Info logs for transaction counts.
eth/protocols/eth/handlers.go Updated log levels from Debug to Error for decoding errors; added Info logs for processed hashes.
eth/protocols/eth/peer.go Enhanced logging in RequestTxs method for each transaction being requested to improve traceability.

Poem

In the warren where logs now gleam,
Transactions dance, a lively dream.
With errors bright and details clear,
Our rabbit hearts leap, full of cheer!
Hops of joy in the code we share,
Monitoring magic fills the air! 🐇✨


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 13

🧹 Outside diff range and nitpick comments (6)
eth/protocols/eth/broadcast.go (2)

109-111: Improved logging for transaction broadcasting.

The changes enhance the visibility of the transaction broadcasting process. The new Info log provides valuable details about each transaction being sent, which can be helpful for debugging and monitoring.

Changing the error logging level from Debug to Error is appropriate, as it highlights failed transaction broadcasts more prominently.

Consider adding the peer ID to the log messages to help identify which peer is involved in the transaction broadcast. This can be achieved by using p.ID() in the log statements.

Also applies to: 114-114


187-189: Enhanced logging for transaction announcements.

The changes improve the visibility of the transaction announcement process, similar to the improvements in the broadcastTransactions method. The new Info log provides detailed information about each transaction being announced, which is valuable for debugging and monitoring.

Elevating the error logging level from Debug to Error is appropriate, as it gives more prominence to failed transaction announcements.

For consistency with the previous suggestion, consider adding the peer ID to these log messages as well. This can be done by including p.ID() in the log statements.

Also applies to: 192-192

eth/protocols/eth/peer.go (1)

429-431: Approve the addition of detailed logging with suggestions for optimization

The addition of more detailed logging for each requested transaction is beneficial for debugging and monitoring. However, consider the following suggestions:

  1. To reduce log verbosity while maintaining the added information, you could consolidate the logging:
log.Info("Requesting transactions", "RequestId", id, "Peer.id", p.id, "count", len(hashes), "hashes", hashes)

This approach logs all hashes in a single log entry, reducing the number of log lines while still providing all the necessary information.

  1. Consider the performance impact of logging each transaction hash, especially for large numbers of transactions. If performance is a concern, you might want to add a limit to the number of hashes logged or log only in debug mode:
if log.GetHandler().GetLevel() <= log.LvlDebug {
    for _, hash := range hashes {
        log.Debug("Requesting transaction", "RequestId", id, "Peer.id", p.id, "count", len(hashes), "hash", hash)
    }
}
eth/protocols/eth/handlers.go (2)

Line range hint 441-450: Ensure consistent error handling and logging across functions

The changes in this function improve error visibility and add nil transaction checking, which is good. However, there are some inconsistencies with the changes made in previous functions:

  1. Improved error logging:
    The change in log level for decoding errors (line 441) is consistent with other functions and improves visibility.

  2. Nil transaction handling:
    The new error log for nil transactions (line 450) is consistent with the handleTransactions function.

  3. Transaction-level logging:
    Unlike the other modified functions, this one doesn't add new Info or Debug level logs for individual transactions.

To maintain consistency across functions, consider the following:

  1. Add debug-level logging for individual transactions (when count is low):
 log.Debug("handlePooledTransactions66", "peer", peer.String(), "len(txs)", len(txs.PooledTransactionsPacket))
+if len(txs.PooledTransactionsPacket) <= 10 {
+    for _, tx := range txs.PooledTransactionsPacket {
+        log.Debug("handlePooledTransactions66", "peer", peer.String(), "len(txs)", len(txs.PooledTransactionsPacket), "tx", tx.Hash().Hex())
+    }
+}
  1. Consider adding a metric for nil transactions, similar to handleTransactions:
 if tx == nil {
     pooledTxs66NilMeter.Mark(1)
     log.Error("handlePooledTransactions: transaction is nil", "peer", peer.String(), "i", i)
+    nilPooledTxCounter.Inc(1)
     return fmt.Errorf("%w: transaction %d is nil", errDecode, i)
 }

These changes will ensure consistency in logging and error handling across all modified functions.


Line range hint 1-459: Summary: Improve logging consistency and consider performance impacts

The changes in this file generally improve error visibility and handling across multiple functions. However, there are some inconsistencies in the implementation of transaction-level logging that should be addressed. Here's a summary of the key points:

  1. Error logging: The upgrade of log levels for decoding errors from Debug to Error is consistent and beneficial.
  2. Nil transaction handling: The addition of specific error logs for nil transactions improves error reporting.
  3. Transaction-level logging: The introduction of Info-level logs for individual transactions in some functions may lead to excessive verbosity and potential performance issues.

To improve the overall quality and consistency of the changes:

  1. Implement a consistent logging strategy across all modified functions. Consider using Debug-level logs for individual transactions and limit this to cases with a small number of transactions (e.g., 10 or fewer).
  2. Add metrics for nil transactions in all relevant functions to improve monitoring capabilities.
  3. Consider implementing a configurable verbosity level for transaction logging, allowing operators to adjust the logging detail based on their needs and system capabilities.

By addressing these points, you'll enhance the consistency of the code and provide more flexible logging options while maintaining the improved error visibility introduced by these changes.

core/tx_pool.go (1)

Line range hint 1-2000: Overall assessment: Logging changes require refinement for balance and efficiency

The changes made to core/tx_pool.go primarily focus on enhancing logging capabilities. While the intent to improve visibility and debugging is commendable, the current implementation could benefit from several refinements:

  1. Log Levels: The widespread use of log.Error and log.Info for routine operations is excessive. Consider a more balanced approach, reserving higher log levels for truly exceptional conditions.

  2. Verbosity: The addition of numerous detailed logs could lead to significant log pollution. Implement strategies to manage verbosity, such as conditional logging or aggregation of high-frequency events.

  3. Performance: The increased logging could impact performance, especially in high-throughput scenarios. Consider the performance implications and optimize where necessary.

  4. Security: Ensure that sensitive transaction details are not being over-exposed in logs, particularly in production environments.

  5. Consistency: Strive for consistency in log levels, formats, and information provided across similar events.

Recommendations:

  1. Implement a verbose logging mode that can be toggled dynamically for debugging purposes.
  2. Use log aggregation for high-frequency events to provide periodic summaries instead of individual logs.
  3. Review and adjust log levels across the file, using log.Debug for most routine operations, log.Info for noteworthy events, log.Warn for unusual but non-critical issues, and log.Error for critical problems.
  4. Consider implementing structured logging to improve log parsing and analysis capabilities.
  5. Add metrics for key events (e.g., underpriced transactions, pool overflow) to complement logging and provide a more efficient way to monitor system health.

By refining the logging strategy, you can achieve the desired visibility for debugging while maintaining performance and managing log volume effectively.

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Files that changed from the base of the PR and between c88cc48 and ff296c0.

📒 Files selected for processing (6)
  • core/tx_pool.go (7 hunks)
  • eth/fetcher/tx_fetcher.go (1 hunks)
  • eth/handler.go (1 hunks)
  • eth/protocols/eth/broadcast.go (2 hunks)
  • eth/protocols/eth/handlers.go (5 hunks)
  • eth/protocols/eth/peer.go (1 hunks)
🧰 Additional context used
🔇 Additional comments (1)
eth/protocols/eth/broadcast.go (1)

109-111: Overall improvement in logging with a note on performance.

The changes successfully address the PR objective of adding more broadcast logs. The enhanced logging in both broadcastTransactions and announceTransactions methods will significantly improve debugging capabilities and provide better insights into the transaction broadcasting process.

However, it's important to consider the potential performance impact of the increased logging, especially at the Info level. To ensure these changes don't introduce any significant overhead, please run performance tests focusing on high-volume transaction scenarios. You can use the following script to analyze the impact:

Also applies to: 114-114, 187-189, 192-192

Comment on lines +412 to +418
log.Error("Failed to decode `TransactionsPacket`", "peer", peer.String(), "err", err)
return fmt.Errorf("%w: message %v: %v", errDecode, msg, err)
}
log.Debug("handleTransactions", "peer", peer.String(), "len(txs)", len(txs))
for _, tx := range txs {
log.Info("handleTransactions", "peer", peer.String(), "len(txs)", len(txs), "tx", tx.Hash().Hex())
}
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Improve logging consistency and nil transaction handling

The changes in this function follow a similar pattern to the previous ones, with improved error visibility and potentially verbose transaction logging. Additionally, there's a new check for nil transactions.

  1. Verbose logging:
    The Info level log for each transaction (lines 416-418) might impact performance for large transaction batches.

  2. Nil transaction handling:
    The new error log for nil transactions (line 424) is a good addition for improved error reporting.

Consider the following changes:

  1. Adjust the transaction logging to be consistent with previous functions:
 log.Debug("handleTransactions", "peer", peer.String(), "len(txs)", len(txs))
-for _, tx := range txs {
-    log.Info("handleTransactions", "peer", peer.String(), "len(txs)", len(txs), "tx", tx.Hash().Hex())
+if len(txs) <= 10 {
+    for _, tx := range txs {
+        log.Debug("handleTransactions", "peer", peer.String(), "len(txs)", len(txs), "tx", tx.Hash().Hex())
+    }
 }
  1. Consider adding a metric for nil transactions:
 if tx == nil {
     handleTxsNilMeter.Mark(1)
     log.Error("handleTransactions: transaction is nil", "peer", peer.String(), "i", i)
+    nilTxCounter.Inc(1)
     return fmt.Errorf("%w: transaction %d is nil", errDecode, i)
 }

These changes will maintain consistency with previous functions and provide additional metrics for monitoring nil transactions.

Also applies to: 424-425

Comment on lines +341 to +349
log.Error("Failed to decode `NewPooledTransactionHashesPacket`", "peer", peer.String(), "err", err)
newPooledTxHashesFailMeter.Mark(1)
return fmt.Errorf("%w: message %v: %v", errDecode, msg, err)
}
// Schedule all the unknown hashes for retrieval
log.Debug("handleNewPooledTransactionHashes", "peer", peer.String(), "len(ann)", len(*ann))
for _, hash := range *ann {
log.Info("handleNewPooledTransactionHashes", "peer", peer.String(), "len(ann)", len(*ann), "hash", hash.Hex())
}
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Consider the performance impact of verbose logging

The changes improve error visibility by upgrading the log level for decoding errors from Debug to Error, which is good. However, the new Info level log for each transaction hash (line 348) might be too verbose and could potentially impact performance, especially when dealing with a large number of transactions.

Consider one of the following options:

  1. Remove the loop that logs each hash individually.
  2. Change the log level from Info to Debug for individual hash logging.
  3. Add a condition to only log individual hashes when their count is below a certain threshold.

Example implementation for option 3:

 log.Debug("handleNewPooledTransactionHashes", "peer", peer.String(), "len(ann)", len(*ann))
-for _, hash := range *ann {
-    log.Info("handleNewPooledTransactionHashes", "peer", peer.String(), "len(ann)", len(*ann), "hash", hash.Hex())
+if len(*ann) <= 10 {
+    for _, hash := range *ann {
+        log.Debug("handleNewPooledTransactionHashes", "peer", peer.String(), "len(ann)", len(*ann), "hash", hash.Hex())
+    }
 }

This change will limit the logging of individual hashes to cases where there are 10 or fewer transactions, reducing the verbosity for larger batches.

📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
log.Error("Failed to decode `NewPooledTransactionHashesPacket`", "peer", peer.String(), "err", err)
newPooledTxHashesFailMeter.Mark(1)
return fmt.Errorf("%w: message %v: %v", errDecode, msg, err)
}
// Schedule all the unknown hashes for retrieval
log.Debug("handleNewPooledTransactionHashes", "peer", peer.String(), "len(ann)", len(*ann))
for _, hash := range *ann {
log.Info("handleNewPooledTransactionHashes", "peer", peer.String(), "len(ann)", len(*ann), "hash", hash.Hex())
}
log.Error("Failed to decode `NewPooledTransactionHashesPacket`", "peer", peer.String(), "err", err)
newPooledTxHashesFailMeter.Mark(1)
return fmt.Errorf("%w: message %v: %v", errDecode, msg, err)
}
// Schedule all the unknown hashes for retrieval
log.Debug("handleNewPooledTransactionHashes", "peer", peer.String(), "len(ann)", len(*ann))
if len(*ann) <= 10 {
for _, hash := range *ann {
log.Debug("handleNewPooledTransactionHashes", "peer", peer.String(), "len(ann)", len(*ann), "hash", hash.Hex())
}
}

Comment on lines +361 to +369
log.Error("Failed to decode `GetPooledTransactionsPacket66`", "peer", peer.String(), "err", err)
getPooledTxsFailMeter.Mark(1)
return fmt.Errorf("%w: message %v: %v", errDecode, msg, err)
}
hashes, txs := answerGetPooledTransactions(backend, query.GetPooledTransactionsPacket, peer)
log.Debug("handleGetPooledTransactions", "peer", peer.String(), "RequestId", query.RequestId, "len(query)", len(query.GetPooledTransactionsPacket), "retrieved", len(hashes))
for _, hash := range hashes {
log.Info("handleGetPooledTransactions", "peer", peer.String(), "RequestId", query.RequestId, "len(query)", len(query.GetPooledTransactionsPacket), "retrieved", len(hashes), "hash", hash.Hex())
}
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Consistent logging strategy needed

Similar to the changes in handleNewPooledTransactionHashes, this function has improved error visibility by upgrading the log level for decoding errors. However, it also introduces potentially verbose logging for individual transaction hashes.

To maintain consistency and prevent performance issues, consider applying the same logging strategy as suggested for handleNewPooledTransactionHashes. For example:

 log.Debug("handleGetPooledTransactions", "peer", peer.String(), "RequestId", query.RequestId, "len(query)", len(query.GetPooledTransactionsPacket), "retrieved", len(hashes))
-for _, hash := range hashes {
-    log.Info("handleGetPooledTransactions", "peer", peer.String(), "RequestId", query.RequestId, "len(query)", len(query.GetPooledTransactionsPacket), "retrieved", len(hashes), "hash", hash.Hex())
+if len(hashes) <= 10 {
+    for _, hash := range hashes {
+        log.Debug("handleGetPooledTransactions", "peer", peer.String(), "RequestId", query.RequestId, "len(query)", len(query.GetPooledTransactionsPacket), "retrieved", len(hashes), "hash", hash.Hex())
+    }
 }

This change will limit the logging of individual hashes to cases where there are 10 or fewer transactions, reducing the verbosity for larger batches while maintaining consistency with the previous function.

📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
log.Error("Failed to decode `GetPooledTransactionsPacket66`", "peer", peer.String(), "err", err)
getPooledTxsFailMeter.Mark(1)
return fmt.Errorf("%w: message %v: %v", errDecode, msg, err)
}
hashes, txs := answerGetPooledTransactions(backend, query.GetPooledTransactionsPacket, peer)
log.Debug("handleGetPooledTransactions", "peer", peer.String(), "RequestId", query.RequestId, "len(query)", len(query.GetPooledTransactionsPacket), "retrieved", len(hashes))
for _, hash := range hashes {
log.Info("handleGetPooledTransactions", "peer", peer.String(), "RequestId", query.RequestId, "len(query)", len(query.GetPooledTransactionsPacket), "retrieved", len(hashes), "hash", hash.Hex())
}
log.Error("Failed to decode `GetPooledTransactionsPacket66`", "peer", peer.String(), "err", err)
getPooledTxsFailMeter.Mark(1)
return fmt.Errorf("%w: message %v: %v", errDecode, msg, err)
}
hashes, txs := answerGetPooledTransactions(backend, query.GetPooledTransactionsPacket, peer)
log.Debug("handleGetPooledTransactions", "peer", peer.String(), "RequestId", query.RequestId, "len(query)", len(query.GetPooledTransactionsPacket), "retrieved", len(hashes))
if len(hashes) <= 10 {
for _, hash := range hashes {
log.Debug("handleGetPooledTransactions", "peer", peer.String(), "RequestId", query.RequestId, "len(query)", len(query.GetPooledTransactionsPacket), "retrieved", len(hashes), "hash", hash.Hex())
}
}

Comment on lines +522 to +524
for _, hash := range hashes {
log.Info("Transactions being broadcasted to", "peer", peer.String(), "len", len(hashes), "hash", hash)
}
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Consider optimizing the new logging statements.

While the additional logging provides valuable information for debugging, there are a few concerns:

  1. Using log.Info for each transaction might be too verbose. Consider using log.Debug instead.
  2. Logging inside loops could impact performance, especially with large transaction sets.
  3. Some information is duplicated from the existing debug logs.

Consider the following improvements:

  1. Change log.Info to log.Debug to reduce verbosity in production.
  2. Move the logging outside the loops and aggregate the information:
 for peer, hashes := range txset {
 	directPeers++
 	directCount += len(hashes)
 	peer.AsyncSendTransactions(hashes)
 	log.Debug("Transactions being broadcasted to", "peer", peer.String(), "len", len(hashes))
-	for _, hash := range hashes {
-		log.Info("Transactions being broadcasted to", "peer", peer.String(), "len", len(hashes), "hash", hash)
-	}
 }
+log.Debug("Transactions broadcast details", "directPeers", directPeers, "directCount", directCount)

 for peer, hashes := range annos {
 	annoPeers++
 	annoCount += len(hashes)
 	peer.AsyncSendPooledTransactionHashes(hashes)
 	log.Debug("Transactions being announced to", "peer", peer.String(), "len", len(hashes))
-	for _, hash := range hashes {
-		log.Info("Transactions being announced to", "peer", peer.String(), "len", len(hashes), "hash", hash)
-	}
 }
+log.Debug("Transactions announcement details", "annoPeers", annoPeers, "annoCount", annoCount)

This approach will provide the necessary information for debugging while minimizing the performance impact and log verbosity.

Also applies to: 531-533

Comment on lines +798 to +801
for _, hash := range hashes {
log.Info("Scheduling transaction retrieval", "peer", peer, "len(f.announces[peer])", len(f.announces[peer]), "len(hashes)", len(hashes), "hash", hash)
}

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Consider adjusting log levels and reducing log verbosity

The added logging statements provide valuable information for debugging the transaction retrieval process. However, there are a few considerations:

  1. The log.Info level might be too verbose for production environments, especially when inside a loop that could potentially generate a large number of log entries.
  2. Logging each transaction hash individually could impact performance if there are many transactions being processed.

Consider the following improvements:

  1. Use log.Debug instead of log.Info for detailed per-transaction logs:
-log.Info("Scheduling transaction retrieval", "peer", peer, "len(f.announces[peer])", len(f.announces[peer]), "len(hashes)", len(hashes), "hash", hash)
+log.Debug("Scheduling transaction retrieval", "peer", peer, "len(f.announces[peer])", len(f.announces[peer]), "len(hashes)", len(hashes), "hash", hash)
  1. Add a summary log at the Info level outside the loop:
if len(hashes) > 0 {
    log.Info("Scheduled transaction retrievals", "peer", peer, "announcements", len(f.announces[peer]), "retrievals", len(hashes))
}

These changes will maintain the detailed logging for debugging purposes while reducing the verbosity and potential performance impact in production environments.

Comment on lines +820 to 822
log.Error("Discarding transaction due to too many changes since reorg", "hash", hash)
throttleTxMeter.Mark(1)
return false, ErrTxPoolOverflow
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Adjust log level and add context for transactions discarded due to reorg frequency.

The change from log.Trace to log.Error for transactions discarded due to frequent reorgs is an improvement in visibility, but there are some considerations:

  1. Log Level: While this situation is more significant than regular transaction discards, log.Error might still be too severe. Consider using log.Warn instead.

  2. Context: The current message doesn't provide enough information about why this is happening. Adding more context would be beneficial for debugging and monitoring.

  3. Threshold: It would be helpful to log the current threshold and the actual count of changes since the last reorg.

-			log.Error("Discarding transaction due to too many changes since reorg", "hash", hash)
+			log.Warn("Discarding transaction due to high reorg frequency", "hash", hash, "changesSinceReorg", pool.changesSinceReorg, "threshold", int(pool.config.GlobalSlots/4))

Consider also adding a metric to track how often this situation occurs, as it might indicate network instability or other issues that require attention.

📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
log.Error("Discarding transaction due to too many changes since reorg", "hash", hash)
throttleTxMeter.Mark(1)
return false, ErrTxPoolOverflow
log.Warn("Discarding transaction due to high reorg frequency", "hash", hash, "changesSinceReorg", pool.changesSinceReorg, "threshold", int(pool.config.GlobalSlots/4))
throttleTxMeter.Mark(1)
return false, ErrTxPoolOverflow

Comment on lines +840 to 843
log.Error("Discarding freshly underpriced transaction", "hash", tx.Hash(), "gasTipCap", tx.GasTipCap(), "gasFeeCap", tx.GasFeeCap())
underpricedTxMeter.Mark(1)
pool.removeTx(tx.Hash(), false)
}
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Harmonize logging for underpriced transactions and consider aggregation.

This log statement is very similar to the one we reviewed earlier for underpriced transactions. For consistency and improved logging practices, consider the following:

  1. Log Level: As with the previous underpriced transaction log, log.Error is likely too severe for this normal operation. Use log.Debug or log.Info instead.

  2. Consistency: Ensure that the logging for all underpriced transactions (both fresh and existing) uses the same level and format.

  3. Aggregation: Given that this could occur frequently during gas price fluctuations, consider aggregating these logs to prevent flooding.

  4. Context: The additional gasTipCap and gasFeeCap information is valuable. Consider adding the minimum required values for comparison.

-			log.Error("Discarding freshly underpriced transaction", "hash", tx.Hash(), "gasTipCap", tx.GasTipCap(), "gasFeeCap", tx.GasFeeCap())
+			log.Debug("Discarding freshly underpriced transaction", "hash", tx.Hash(), "gasTipCap", tx.GasTipCap(), "gasFeeCap", tx.GasFeeCap(), "minTip", pool.gasPrice, "minFeeCap", pool.priced.urgent.baseFee)
+			if metrics.Enabled {
+				underpricedTxCounter.Inc(1)
+			}

Additionally, implement a periodic summary log that provides an overview of underpriced transactions discarded in the last interval, including both fresh and existing ones. This would offer valuable insights without risking log saturation.

Committable suggestion was skipped due to low confidence.

Comment on lines +811 to 813
log.Error("Discarding underpriced transaction", "hash", hash, "gasTipCap", tx.GasTipCap(), "gasFeeCap", tx.GasFeeCap())
underpricedTxMeter.Mark(1)
return false, ErrUnderpriced
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Adjust log level for underpriced transactions and consider aggregating logs.

The changes to this log statement have both positive and potentially problematic aspects:

Positives:

  1. Including gasTipCap and gasFeeCap provides valuable context for understanding why transactions are considered underpriced.

Areas for improvement:

  1. Log Level: Using log.Error for underpriced transactions is likely too severe. This is a normal part of transaction pool management, especially during periods of gas price volatility.
  2. Potential for Log Flooding: In busy networks or during gas price spikes, this could generate an excessive number of log entries.

Suggestions:

  1. Change the log level to log.Debug or log.Info.
  2. Consider implementing an aggregated logging approach for underpriced transactions.
-			log.Error("Discarding underpriced transaction", "hash", hash, "gasTipCap", tx.GasTipCap(), "gasFeeCap", tx.GasFeeCap())
+			log.Debug("Discarding underpriced transaction", "hash", hash, "gasTipCap", tx.GasTipCap(), "gasFeeCap", tx.GasFeeCap())
+			if metrics.Enabled {
+				underpricedTxCounter.Inc(1)
+			}

Also, consider adding a periodic log that summarizes the number of underpriced transactions discarded in the last interval, rather than logging each one individually.

Committable suggestion was skipped due to low confidence.

Comment on lines +832 to 834
log.Error("Discarding overflown transaction", "hash", hash)
overflowedTxMeter.Mark(1)
return false, ErrTxPoolOverflow
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Refine logging for overflown transactions with appropriate level and additional context.

The change from log.Trace to log.Error for overflown transactions increases visibility, but there are opportunities for improvement:

  1. Log Level: While a full transaction pool is significant, it's not necessarily an error condition. Consider using log.Warn instead.

  2. Context: The current message doesn't provide information about the pool's state. Adding details about current capacity and limits would be beneficial for monitoring and debugging.

  3. Frequency: If this condition occurs often, it might lead to log pollution. Consider implementing a rate limiter or aggregating these logs.

-			log.Error("Discarding overflown transaction", "hash", hash)
+			log.Warn("Discarding transaction due to full pool", "hash", hash, "poolSize", pool.all.Count(), "capacity", pool.config.GlobalSlots+pool.config.GlobalQueue)
+			if metrics.Enabled {
+				overflownTxCounter.Inc(1)
+			}

Also, consider adding a periodic summary log that provides an overview of the pool's state and the number of overflown transactions in the last interval. This would provide valuable insights without the risk of log flooding.

Committable suggestion was skipped due to low confidence.

Comment on lines +803 to 805
log.Error("Discarding invalid transaction", "hash", hash, "err", err)
invalidTxMeter.Mark(1)
return false, err
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Reconsider log level for invalid transactions and add rate limiting.

Changing the log level for invalid transactions from log.Trace to log.Error significantly increases visibility, which can be beneficial for detecting issues. However, this approach might have some drawbacks:

  1. Log Pollution: If there are many invalid transactions, this could flood the error logs.
  2. Performance: Frequent error logging might have a slight performance impact.

While invalid transactions are more concerning than known transactions, not all of them may warrant an error log. Consider the following improvements:

  1. Use log.Warn instead of log.Error for most cases.
  2. Implement a rate limiter for this log to prevent flooding.
  3. Consider categorizing errors and only use log.Error for severe cases.
-		log.Error("Discarding invalid transaction", "hash", hash, "err", err)
+		if isSevereError(err) {
+			log.Error("Discarding invalid transaction", "hash", hash, "err", err)
+		} else {
+			log.Warn("Discarding invalid transaction", "hash", hash, "err", err)
+		}
+		logInvalidTxCounter.Inc(1)

Also, consider adding a rate limiter to this logging call and a function isSevereError to categorize error severity.

Committable suggestion was skipped due to low confidence.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant