RED-235: add queueLengthAll and tx age buckets to report

src/p2p/Sync.ts

@@ -319,7 +319,8 @@ export function digestCycle(cycle: P2P.CycleCreatorTypes.CycleRecord, source: st
     cycle.archiverListHash = Archivers.computeNewArchiverListHash()
 
     // for join v2, also get the standby node list hash
-    if (config.p2p.useJoinProtocolV2) {
+    // [TODO] We can remove `source !== 'syncV2'` once we shut down ITN2
+    if (config.p2p.useJoinProtocolV2 && source !== 'syncV2') {
       cycle.standbyNodeListHash = JoinV2.computeNewStandbyListHash()
     }
   }

src/reporter/index.ts

@@ -306,9 +306,10 @@ class Reporter {
     // Server load
     const currentNetworkLoad = this.loadDetection.getCurrentLoad()
     const currentNodeLoad = this.loadDetection.getCurrentNodeLoad()
-    let queueLength = this.statistics.getPreviousElement('queueLength')
+    const queueLengthAll = this.statistics.getPreviousElement('queueLength')
     const executeQueueLength = this.statistics.getPreviousElement('executeQueueLength')
-    queueLength = executeQueueLength //debug hack until the monitor client can show this
+    const queueLength = executeQueueLength
+    const queueLengthBuckets = this.stateManager.transactionQueue.getQueueLengthBuckets()
     const txTimeInQueue = this.statistics.getPreviousElement('txTimeInQueue') / 1000 // ms to sec
     const maxTxTimeInQueue = this.statistics.getMax('txTimeInQueue') / 1000
     const isNodeLost = this.checkIsNodeLost(Self.id)
@@ -365,8 +366,10 @@ class Reporter {
           networkLoad: currentNetworkLoad,
           nodeLoad: currentNodeLoad,
         },
+        queueLengthAll,
         queueLength,
         executeQueueLength,
+        queueLengthBuckets,
         txTimeInQueue,
         maxTxTimeInQueue,
         rareCounters,

src/state-manager/TransactionQueue.ts

@@ -8482,6 +8482,7 @@ getDebugStuckTxs(opts): unknown {
   getDebugQueueInfo(queueEntry: QueueEntry): any {
     return {
       txId: queueEntry.acceptedTx.txId,
+      tx: queueEntry.acceptedTx,
       logID: queueEntry.logID,
       nodeId: Self.id,
       state: queueEntry.state,
@@ -8500,18 +8501,18 @@ getDebugStuckTxs(opts): unknown {
       dataSharedTimestamp: queueEntry.dataSharedTimestamp,
       firstVoteTimestamp: queueEntry.firstVoteReceivedTimestamp,
       lastVoteTimestamp: queueEntry.lastVoteReceivedTimestamp,
-      firstConfirmationsTimestamp: queueEntry.firstConfirmOrChallengeTimestamp,
-      robustBestConfirmation: queueEntry.receivedBestConfirmation,
-      robustBestVote: queueEntry.receivedBestVote,
-      robustBestChallenge: queueEntry.receivedBestChallenge,
-      completedRobustVote: queueEntry.robustQueryVoteCompleted,
-      completedRobustChallenge: queueEntry.robustQueryConfirmOrChallengeCompleted,
+      // firstConfirmationsTimestamp: queueEntry.firstConfirmOrChallengeTimestamp,
+      // robustBestConfirmation: queueEntry.receivedBestConfirmation,
+      // robustBestVote: queueEntry.receivedBestVote,
+      // robustBestChallenge: queueEntry.receivedBestChallenge,
+      // completedRobustVote: queueEntry.robustQueryVoteCompleted,
+      // completedRobustChallenge: queueEntry.robustQueryConfirmOrChallengeCompleted,
       txDebug: queueEntry.txDebug,
       executionDebug: queueEntry.executionDebug,
       waitForReceiptOnly: queueEntry.waitForReceiptOnly,
       ourVote: queueEntry.ourVote || null,
       receipt2: this.stateManager.getReceipt2(queueEntry) || null,
-      uniqueChallenges: queueEntry.uniqueChallengesCount,
+      // uniqueChallenges: queueEntry.uniqueChallengesCount,
       collectedVoteCount: queueEntry.collectedVoteHashes.length,
       simpleDebugStr: this.app.getSimpleTxDebugValue ? this.app.getSimpleTxDebugValue(queueEntry.acceptedTx?.data) : "",
     }
@@ -8565,6 +8566,34 @@ getDebugStuckTxs(opts): unknown {
     this.debugLastAwaitedCallInnerStack = {}
     this.debugLastAwaitedAppCallStack = {}
   }
+
+  getQueueLengthBuckets(): any {
+  const buckets = { c15: 0, c60: 0, c120: 0, c600: 0 };
+
+  if (!this._transactionQueue || this._transactionQueue.length === 0) {
+    return buckets;
+  }
+
+  const currentTime = shardusGetTime();
+
+  this._transactionQueue.forEach((queueEntry) => {
+    if (queueEntry && queueEntry.acceptedTx && queueEntry.acceptedTx.timestamp) {
+      const txAgeInSeconds = (currentTime - queueEntry.acceptedTx.timestamp) / 1000
+
+      if (txAgeInSeconds >= 15 && txAgeInSeconds < 60) {
+        buckets.c15++
+      } else if (txAgeInSeconds >= 60 && txAgeInSeconds < 120) {
+        buckets.c60++
+      } else if (txAgeInSeconds >= 120 && txAgeInSeconds < 600) {
+        buckets.c120++
+      } else if (txAgeInSeconds >= 600) {
+        buckets.c600++
+      }
+    }
+  })
+
+  return buckets;
+  }
 }
 
 export default TransactionQueue