Use supplier so message isn't calculated when disabled dumper

Author: courtneyeh

Diff for: ethereum/statetransition/src/main/java/tech/pegasys/teku/statetransition/util/DebugDataDumper.java

@@ -22,6 +22,7 @@
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Optional;
+import java.util.function.Supplier;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.tuweni.bytes.Bytes;
@@ -60,7 +61,7 @@ public DebugDataDumper(final Path directory) {
   public void saveGossipMessageDecodingError(
       final String topic,
       final Optional<UInt64> arrivalTimestamp,
-      final Bytes originalMessage,
+      final Supplier<Bytes> originalMessage,
       final Throwable error) {
     if (!enabled) {
       return;
@@ -73,7 +74,9 @@ public void saveGossipMessageDecodingError(
             .resolve(topic.replaceAll("/", "_"));
     final boolean success =
         saveBytesToFile(
-            "gossip message with decoding error", topicPath.resolve(fileName), originalMessage);
+            "gossip message with decoding error",
+            topicPath.resolve(fileName),
+            originalMessage.get());
     if (success) {
       LOG.warn("Failed to decode gossip message on topic {}", topic, error);
     }
@@ -82,7 +85,7 @@ public void saveGossipMessageDecodingError(
   public void saveGossipRejectedMessageToFile(
       final String topic,
       final Optional<UInt64> arrivalTimestamp,
-      final Bytes decodedMessage,
+      final Supplier<Bytes> decodedMessage,
       final Optional<String> reason) {
     if (!enabled) {
       return;
@@ -92,7 +95,8 @@ public void saveGossipRejectedMessageToFile(
     final Path topicPath =
         Path.of(GOSSIP_MESSAGES_DIR).resolve(REJECTED_SUB_DIR).resolve(topic.replaceAll("/", "_"));
     final boolean success =
-        saveBytesToFile("rejected gossip message", topicPath.resolve(fileName), decodedMessage);
+        saveBytesToFile(
+            "rejected gossip message", topicPath.resolve(fileName), decodedMessage.get());
     if (success) {
       LOG.warn(
           "Rejecting gossip message on topic {}, reason: {}",

Diff for: ethereum/statetransition/src/main/java/tech/pegasys/teku/statetransition/util/noop/NoOpDebugDataDumper.java

@@ -15,6 +15,7 @@
 
 import java.nio.file.Path;
 import java.util.Optional;
+import java.util.function.Supplier;
 import org.apache.tuweni.bytes.Bytes;
 import tech.pegasys.teku.infrastructure.unsigned.UInt64;
 import tech.pegasys.teku.spec.datastructures.blocks.SignedBeaconBlock;
@@ -30,14 +31,14 @@ public NoOpDebugDataDumper() {
   public void saveGossipMessageDecodingError(
       final String topic,
       final Optional<UInt64> arrivalTimestamp,
-      final Bytes originalMessage,
+      final Supplier<Bytes> originalMessage,
       final Throwable error) {}
 
   @Override
   public void saveGossipRejectedMessageToFile(
       final String topic,
       final Optional<UInt64> arrivalTimestamp,
-      final Bytes decodedMessage,
+      final Supplier<Bytes> decodedMessage,
       final Optional<String> reason) {}
 
   @Override

Diff for: ethereum/statetransition/src/test/java/tech/pegasys/teku/statetransition/util/DebugDataDumperTest.java

@@ -47,7 +47,7 @@ void saveGossipMessageDecodingError_shouldSaveToFile(@TempDir Path tempDir) {
     final Bytes messageBytes = dataStructureUtil.stateBuilderPhase0().build().sszSerialize();
     final Optional<UInt64> arrivalTimestamp = Optional.of(timeProvider.getTimeInMillis());
     manager.saveGossipMessageDecodingError(
-        "/eth/test/topic", arrivalTimestamp, messageBytes, new Throwable());
+        "/eth/test/topic", arrivalTimestamp, () -> messageBytes, new Throwable());
 
     final String fileName =
         String.format("%s.ssz", formatTimestamp(timeProvider.getTimeInMillis().longValue()));
@@ -66,7 +66,7 @@ void saveGossipRejectedMessageToFile_shouldSaveToFile(@TempDir Path tempDir) {
     final Bytes messageBytes = dataStructureUtil.stateBuilderPhase0().build().sszSerialize();
     final Optional<UInt64> arrivalTimestamp = Optional.of(timeProvider.getTimeInMillis());
     manager.saveGossipRejectedMessageToFile(
-        "/eth/test/topic", arrivalTimestamp, messageBytes, Optional.of("reason"));
+        "/eth/test/topic", arrivalTimestamp, () -> messageBytes, Optional.of("reason"));
 
     final String fileName =
         String.format("%s.ssz", formatTimestamp(timeProvider.getTimeInMillis().longValue()));

Diff for: networking/eth2/src/main/java/tech/pegasys/teku/networking/eth2/gossip/topics/topichandlers/Eth2TopicHandler.java

@@ -138,7 +138,7 @@ private void processMessage(
         debugDataDumper.saveGossipRejectedMessageToFile(
             getTopic(),
             message.getArrivalTimestamp(),
-            message.getDecodedMessage().getDecodedMessage().orElse(Bytes.EMPTY),
+            () -> message.getDecodedMessage().getDecodedMessage().orElse(Bytes.EMPTY),
             internalValidationResult.getDescription());
         P2P_LOG.onGossipRejected(
             getTopic(),
@@ -173,7 +173,7 @@ protected ValidationResult handleMessageProcessingError(
     if (ExceptionUtil.hasCause(err, DecodingException.class)) {
 
       debugDataDumper.saveGossipMessageDecodingError(
-          getTopic(), message.getArrivalTimestamp(), message.getOriginalMessage(), err);
+          getTopic(), message.getArrivalTimestamp(), message::getOriginalMessage, err);
       P2P_LOG.onGossipMessageDecodingError(getTopic(), message.getOriginalMessage(), err);
       response = ValidationResult.Invalid;
     } else if (ExceptionUtil.hasCause(err, RejectedExecutionException.class)) {