Add metrics and logging for transaction traffic split (#10625)

sdimitrov9 · web-flow · commit 2abed4fad477 · 2025-03-17T11:12:53.000-05:00
* Add metrics and logging for transaction traffic split
* update direct transaction traffic logic

---------

Signed-off-by: sdimitrov9 &lt;stoyan.dimitrov@limechain.tech&gt;
diff --git a/hedera-mirror-web3/src/main/java/com/hedera/mirror/web3/controller/GenericControllerAdvice.java b/hedera-mirror-web3/src/main/java/com/hedera/mirror/web3/controller/GenericControllerAdvice.java
@@ -73,7 +73,12 @@ private ResponseEntity<?> badRequest(final Exception e, final WebRequest request
 
     @ExceptionHandler
     private ResponseEntity<?> mirrorEvmTransactionError(final MirrorEvmTransactionException e, WebRequest request) {
-        log.warn("Mirror EVM transaction error: {}, detail: {}, data: {}", e.getMessage(), e.getDetail(), e.getData());
+        log.warn(
+                "Mirror EVM transaction error: {}, detail: {}, data: {}, isCallModularized: {}",
+                e.getMessage(),
+                e.getDetail(),
+                e.getData(),
+                e.getIsCallModularized());
         request.setAttribute(WebUtils.ERROR_EXCEPTION_ATTRIBUTE, e, SCOPE_REQUEST);
         return new ResponseEntity<>(new GenericErrorResponse(e.getMessage(), e.getDetail(), e.getData()), BAD_REQUEST);
     }
diff --git a/hedera-mirror-web3/src/main/java/com/hedera/mirror/web3/evm/properties/MirrorNodeEvmProperties.java b/hedera-mirror-web3/src/main/java/com/hedera/mirror/web3/evm/properties/MirrorNodeEvmProperties.java
@@ -347,7 +347,8 @@ private Map<String, String> buildTransactionProperties() {
      * @return true if the random value between 0 and 1 is less than modularizedTrafficPercent
      */
     public boolean directTrafficThroughTransactionExecutionService() {
-        return RandomUtils.secure().randomDouble(0.0d, 1.0d) < getModularizedTrafficPercent();
+        return isModularizedServices()
+                && RandomUtils.secure().randomDouble(0.0d, 1.0d) < getModularizedTrafficPercent();
     }
 
     @Getter
diff --git a/hedera-mirror-web3/src/main/java/com/hedera/mirror/web3/exception/MirrorEvmTransactionException.java b/hedera-mirror-web3/src/main/java/com/hedera/mirror/web3/exception/MirrorEvmTransactionException.java
@@ -23,25 +23,33 @@ public class MirrorEvmTransactionException extends EvmException {
 
     private final String detail;
     private final String data;
+    private final Boolean isCallModularized;
     private final transient HederaEvmTransactionProcessingResult result;
 
     public MirrorEvmTransactionException(
             final ResponseCodeEnum responseCode, final String detail, final String hexData) {
-        this(responseCode.name(), detail, hexData, null);
+        this(responseCode.name(), detail, hexData, null, null);
     }
 
     public MirrorEvmTransactionException(final String message, final String detail, final String hexData) {
-        this(message, detail, hexData, null);
+        this(message, detail, hexData, null, null);
+    }
+
+    public MirrorEvmTransactionException(
+            final String message, final String detail, final String hexData, final Boolean isCallModularized) {
+        this(message, detail, hexData, null, isCallModularized);
     }
 
     public MirrorEvmTransactionException(
             final String message,
             final String detail,
             final String hexData,
-            HederaEvmTransactionProcessingResult result) {
+            HederaEvmTransactionProcessingResult result,
+            final Boolean isCallModularized) {
         super(message);
         this.detail = detail;
         this.data = hexData;
+        this.isCallModularized = isCallModularized;
         this.result = result;
     }
 
diff --git a/hedera-mirror-web3/src/main/java/com/hedera/mirror/web3/service/ContractCallService.java b/hedera-mirror-web3/src/main/java/com/hedera/mirror/web3/service/ContractCallService.java
@@ -107,7 +107,7 @@ protected HederaEvmTransactionProcessingResult callContract(CallServiceParameter
         }
 
         var result = doProcessCall(params, params.getGas(), true);
-        validateResult(result, params.getCallType());
+        validateResult(result, params.getCallType(), params.isModularized());
         return result;
     }
 
@@ -152,13 +152,14 @@ private void restoreGasToBucket(HederaEvmTransactionProcessingResult result, lon
         }
     }
 
-    protected void validateResult(final HederaEvmTransactionProcessingResult txnResult, final CallType type) {
+    protected void validateResult(
+            final HederaEvmTransactionProcessingResult txnResult, final CallType type, final boolean modularized) {
         if (!txnResult.isSuccessful()) {
             updateGasUsedMetric(ERROR, txnResult.getGasUsed(), 1);
             var revertReason = txnResult.getRevertReason().orElse(Bytes.EMPTY);
             var detail = maybeDecodeSolidityErrorStringToReadableMessage(revertReason);
             throw new MirrorEvmTransactionException(
-                    getStatusOrDefault(txnResult).name(), detail, revertReason.toHexString(), txnResult);
+                    getStatusOrDefault(txnResult).name(), detail, revertReason.toHexString(), txnResult, modularized);
         } else {
             updateGasUsedMetric(type, txnResult.getGasUsed(), 1);
         }
@@ -170,7 +171,9 @@ protected void updateGasUsedMetric(final CallType callType, final long gasUsed,
                 .increment(gasUsed);
     }
 
-    protected void updateGasLimitMetric(final CallType callType, final long gasLimit) {
-        gasLimitCounter.withTags("type", callType.toString()).increment(gasLimit);
+    protected void updateGasLimitMetric(final CallType callType, final long gasLimit, final boolean modularized) {
+        gasLimitCounter
+                .withTags("type", callType.toString(), "modularized", String.valueOf(modularized))
+                .increment(gasLimit);
     }
 }
diff --git a/hedera-mirror-web3/src/main/java/com/hedera/mirror/web3/service/ContractDebugService.java b/hedera-mirror-web3/src/main/java/com/hedera/mirror/web3/service/ContractDebugService.java
@@ -61,15 +61,16 @@ public OpcodesProcessingResult processOpcodeCall(
             ctx.setContractActions(contractActionRepository.findFailedSystemActionsByConsensusTimestamp(
                     params.getConsensusTimestamp()));
             final var ethCallTxnResult = callContract(params, ctx);
-            validateResult(ethCallTxnResult, params.getCallType());
+            validateResult(ethCallTxnResult, params.getCallType(), params.isModularized());
             return new OpcodesProcessingResult(ethCallTxnResult, ctx.getOpcodes());
         });
     }
 
     @Override
-    protected void validateResult(final HederaEvmTransactionProcessingResult txnResult, final CallType type) {
+    protected void validateResult(
+            final HederaEvmTransactionProcessingResult txnResult, final CallType type, boolean modularized) {
         try {
-            super.validateResult(txnResult, type);
+            super.validateResult(txnResult, type, modularized);
         } catch (MirrorEvmTransactionException e) {
             log.warn(
                     "Transaction failed with status: {}, detail: {}, revertReason: {}",
diff --git a/hedera-mirror-web3/src/main/java/com/hedera/mirror/web3/service/ContractExecutionService.java b/hedera-mirror-web3/src/main/java/com/hedera/mirror/web3/service/ContractExecutionService.java
@@ -54,7 +54,7 @@ public String processCall(final ContractExecutionParameters params) {
             var stringResult = "";
 
             try {
-                updateGasLimitMetric(params.getCallType(), params.getGas());
+                updateGasLimitMetric(params.getCallType(), params.getGas(), params.isModularized());
 
                 Bytes result;
                 if (params.isEstimate()) {
@@ -86,7 +86,7 @@ public String processCall(final ContractExecutionParameters params) {
      */
     private Bytes estimateGas(final ContractExecutionParameters params, final ContractCallContext context) {
         final var processingResult = callContract(params, context);
-        validateResult(processingResult, CallType.ETH_ESTIMATE_GAS);
+        validateResult(processingResult, CallType.ETH_ESTIMATE_GAS, params.isModularized());
 
         final var gasUsedByInitialCall = processingResult.getGasUsed();
 
diff --git a/hedera-mirror-web3/src/main/java/com/hedera/mirror/web3/service/TransactionExecutionService.java b/hedera-mirror-web3/src/main/java/com/hedera/mirror/web3/service/TransactionExecutionService.java
@@ -126,7 +126,7 @@ private HederaEvmTransactionProcessingResult handleFailedResult(
         if (result == null) {
             // No result - the call did not reach the EVM and probably failed at pre-checks. No metric to update in this
             // case.
-            throw new MirrorEvmTransactionException(status.protoName(), StringUtils.EMPTY, StringUtils.EMPTY);
+            throw new MirrorEvmTransactionException(status.protoName(), StringUtils.EMPTY, StringUtils.EMPTY, true);
         } else {
             var errorMessage = getErrorMessage(result).orElse(Bytes.EMPTY);
             var detail = maybeDecodeSolidityErrorStringToReadableMessage(errorMessage);
@@ -137,7 +137,8 @@ private HederaEvmTransactionProcessingResult handleFailedResult(
                         detail,
                         errorMessage.toHexString(),
                         HederaEvmTransactionProcessingResult.failed(
-                                result.gasUsed(), 0L, 0L, Optional.of(errorMessage), Optional.empty()));
+                                result.gasUsed(), 0L, 0L, Optional.of(errorMessage), Optional.empty()),
+                        true);
             } else {
                 // If we are in an opcode trace scenario, we need to return a failed result in order to get the
                 // opcode list from the ContractCallContext. If we throw an exception instead of returning a result,
diff --git a/hedera-mirror-web3/src/test/java/com/hedera/mirror/web3/service/AbstractContractCallServiceOpcodeTracerTest.java b/hedera-mirror-web3/src/test/java/com/hedera/mirror/web3/service/AbstractContractCallServiceOpcodeTracerTest.java
@@ -70,6 +70,7 @@ abstract class AbstractContractCallServiceOpcodeTracerTest extends AbstractContr
     @BeforeEach
     void setUpArgumentCaptors() {
         if (!mirrorNodeEvmProperties.isModularizedServices()) {
+            mirrorNodeEvmProperties.setModularizedTrafficPercent(0.0);
             doAnswer(invocation -> {
                         final var transactionProcessingResult =
                                 (HederaEvmTransactionProcessingResult) invocation.callRealMethod();
@@ -80,6 +81,7 @@ void setUpArgumentCaptors() {
                     .when(processor)
                     .execute(paramsCaptor.capture(), gasCaptor.capture());
         } else {
+            mirrorNodeEvmProperties.setModularizedTrafficPercent(1.0);
             doAnswer(invocation -> {
                         final var transactionProcessingResult =
                                 (HederaEvmTransactionProcessingResult) invocation.callRealMethod();
diff --git a/hedera-mirror-web3/src/test/java/com/hedera/mirror/web3/service/AbstractContractCallServiceTest.java b/hedera-mirror-web3/src/test/java/com/hedera/mirror/web3/service/AbstractContractCallServiceTest.java
@@ -121,6 +121,8 @@ protected void setup() {
         modularizedTrafficPercent = mirrorNodeEvmProperties.getModularizedTrafficPercent();
         if (mirrorNodeEvmProperties.isModularizedServices()) {
             mirrorNodeEvmProperties.setModularizedTrafficPercent(1.0);
+        } else {
+            mirrorNodeEvmProperties.setModularizedTrafficPercent(0.0);
         }
 
         genesisRecordFile =
diff --git a/hedera-mirror-web3/src/test/java/com/hedera/mirror/web3/service/ContractCallServiceTest.java b/hedera-mirror-web3/src/test/java/com/hedera/mirror/web3/service/ContractCallServiceTest.java
@@ -1157,10 +1157,22 @@ void transferToNonExistingContract() {
         void testDirectTrafficThroughTransactionExecutionService() {
             MirrorNodeEvmProperties spyEvmProperties = spy(mirrorNodeEvmProperties);
 
+            when(spyEvmProperties.isModularizedServices()).thenReturn(true);
             when(spyEvmProperties.getModularizedTrafficPercent()).thenReturn(1.0);
             assertThat(spyEvmProperties.directTrafficThroughTransactionExecutionService())
                     .isTrue();
 
+            when(spyEvmProperties.isModularizedServices()).thenReturn(true);
+            when(spyEvmProperties.getModularizedTrafficPercent()).thenReturn(0.0);
+            assertThat(spyEvmProperties.directTrafficThroughTransactionExecutionService())
+                    .isFalse();
+
+            when(spyEvmProperties.isModularizedServices()).thenReturn(false);
+            when(spyEvmProperties.getModularizedTrafficPercent()).thenReturn(1.0);
+            assertThat(spyEvmProperties.directTrafficThroughTransactionExecutionService())
+                    .isFalse();
+
+            when(spyEvmProperties.isModularizedServices()).thenReturn(false);
             when(spyEvmProperties.getModularizedTrafficPercent()).thenReturn(0.0);
             assertThat(spyEvmProperties.directTrafficThroughTransactionExecutionService())
                     .isFalse();

Original file line number	Diff line number	Diff line change
`@@ -347,7 +347,8 @@ private Map<String, String> buildTransactionProperties() {`
`347`	`347`	`* @return true if the random value between 0 and 1 is less than modularizedTrafficPercent`
`348`	`348`	`*/`
`349`	`349`	`public boolean directTrafficThroughTransactionExecutionService() {`
`350`		`- return RandomUtils.secure().randomDouble(0.0d, 1.0d) < getModularizedTrafficPercent();`
	`350`	`+ return isModularizedServices()`
	`351`	`+ && RandomUtils.secure().randomDouble(0.0d, 1.0d) < getModularizedTrafficPercent();`
`351`	`352`	`}`
`352`	`353`
`353`	`354`	`@Getter`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ protected HederaEvmTransactionProcessingResult callContract(CallServiceParameter`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`var result = doProcessCall(params, params.getGas(), true);`
`110`		`- validateResult(result, params.getCallType());`
	`110`	`+ validateResult(result, params.getCallType(), params.isModularized());`
`111`	`111`	`return result;`
`112`	`112`	`}`
`113`	`113`
`@@ -152,13 +152,14 @@ private void restoreGasToBucket(HederaEvmTransactionProcessingResult result, lon`
`152`	`152`	`}`
`153`	`153`	`}`
`154`	`154`
`155`		`- protected void validateResult(final HederaEvmTransactionProcessingResult txnResult, final CallType type) {`
	`155`	`+ protected void validateResult(`
	`156`	`+ final HederaEvmTransactionProcessingResult txnResult, final CallType type, final boolean modularized) {`
`156`	`157`	`if (!txnResult.isSuccessful()) {`
`157`	`158`	`updateGasUsedMetric(ERROR, txnResult.getGasUsed(), 1);`
`158`	`159`	`var revertReason = txnResult.getRevertReason().orElse(Bytes.EMPTY);`
`159`	`160`	`var detail = maybeDecodeSolidityErrorStringToReadableMessage(revertReason);`
`160`	`161`	`throw new MirrorEvmTransactionException(`
`161`		`- getStatusOrDefault(txnResult).name(), detail, revertReason.toHexString(), txnResult);`
	`162`	`+ getStatusOrDefault(txnResult).name(), detail, revertReason.toHexString(), txnResult, modularized);`
`162`	`163`	`} else {`
`163`	`164`	`updateGasUsedMetric(type, txnResult.getGasUsed(), 1);`
`164`	`165`	`}`
`@@ -170,7 +171,9 @@ protected void updateGasUsedMetric(final CallType callType, final long gasUsed,`
`170`	`171`	`.increment(gasUsed);`
`171`	`172`	`}`
`172`	`173`
`173`		`- protected void updateGasLimitMetric(final CallType callType, final long gasLimit) {`
`174`		`- gasLimitCounter.withTags("type", callType.toString()).increment(gasLimit);`
	`174`	`+ protected void updateGasLimitMetric(final CallType callType, final long gasLimit, final boolean modularized) {`
	`175`	`+ gasLimitCounter`
	`176`	`+ .withTags("type", callType.toString(), "modularized", String.valueOf(modularized))`
	`177`	`+ .increment(gasLimit);`
`175`	`178`	`}`
`176`	`179`	`}`
Original file line number	Diff line number	Diff line change
`@@ -121,6 +121,8 @@ protected void setup() {`
`121`	`121`	`modularizedTrafficPercent = mirrorNodeEvmProperties.getModularizedTrafficPercent();`
`122`	`122`	`if (mirrorNodeEvmProperties.isModularizedServices()) {`
`123`	`123`	`mirrorNodeEvmProperties.setModularizedTrafficPercent(1.0);`
	`124`	`+ } else {`
	`125`	`+ mirrorNodeEvmProperties.setModularizedTrafficPercent(0.0);`
`124`	`126`	`}`
`125`	`127`
`126`	`128`	`genesisRecordFile =`