Add SR set change and empty block detection

Author: warku123

common/src/main/java/org/tron/common/prometheus/MetricKeys.java

@@ -14,6 +14,8 @@ public static class Counter {
     public static final String TXS = "tron:txs";
     public static final String MINER = "tron:miner";
     public static final String BLOCK_FORK = "tron:block_fork";
+    public static final String BLOCK_EMPTY = "tron:block_empty";
+    public static final String SR_SET_CHANGE = "tron:sr_set_change";
     public static final String P2P_ERROR = "tron:p2p_error";
     public static final String P2P_DISCONNECT = "tron:p2p_disconnect";
     public static final String INTERNAL_SERVICE_FAIL = "tron:internal_service_fail";

common/src/main/java/org/tron/common/prometheus/MetricLabels.java

@@ -31,6 +31,8 @@ public static class Counter {
     public static final String TXS_FAIL_SIG = "sig";
     public static final String TXS_FAIL_TAPOS = "tapos";
     public static final String TXS_FAIL_DUP = "dup";
+    public static final String SR_ADD = "add";
+    public static final String SR_REMOVE = "remove";
 
     private Counter() {
       throw new IllegalStateException("Counter");

common/src/main/java/org/tron/common/prometheus/MetricsCounter.java

@@ -14,6 +14,8 @@ class MetricsCounter {
     init(MetricKeys.Counter.TXS, "tron  txs  info .", "type", "detail");
     init(MetricKeys.Counter.MINER, "tron  miner info .", "miner", "type");
     init(MetricKeys.Counter.BLOCK_FORK, "tron  block fork info .", "type");
+    init(MetricKeys.Counter.BLOCK_EMPTY, "tron  empty block count .", "miner");
+    init(MetricKeys.Counter.SR_SET_CHANGE, "tron sr set change .", "action", "witness");
     init(MetricKeys.Counter.P2P_ERROR, "tron p2p error  info .", "type");
     init(MetricKeys.Counter.P2P_DISCONNECT, "tron p2p disconnect .", "type");
     init(MetricKeys.Counter.INTERNAL_SERVICE_FAIL, "internal Service fail.",

framework/src/main/java/org/tron/core/metrics/blockchain/BlockChainMetricManager.java

@@ -3,10 +3,13 @@
 import com.codahale.metrics.Counter;
 import com.google.protobuf.ByteString;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.SortedMap;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
 import lombok.Getter;
 import lombok.Setter;
 import org.bouncycastle.util.encoders.Hex;
@@ -42,6 +45,7 @@ public class BlockChainMetricManager {
   private long failProcessBlockNum = 0;
   @Setter
   private String failProcessBlockReason = "";
+  private final Set<String> lastActiveWitnesses = ConcurrentHashMap.newKeySet();
 
   public BlockChainInfo getBlockChainInfo() {
     BlockChainInfo blockChainInfo = new BlockChainInfo();
@@ -168,6 +172,45 @@ public void applyBlock(BlockCapsule block) {
       MetricsUtil.meterMark(MetricsKey.BLOCKCHAIN_TPS, block.getTransactions().size());
       Metrics.counterInc(MetricKeys.Counter.TXS, block.getTransactions().size(),
           MetricLabels.Counter.TXS_SUCCESS, MetricLabels.Counter.TXS_SUCCESS);
+    } else {
+      // Empty block
+      Metrics.counterInc(MetricKeys.Counter.BLOCK_EMPTY, 1,
+          StringUtil.encode58Check(address));
+    }
+
+    // SR set change detection
+    Set<String> currentWitnesses = chainBaseManager.getWitnessScheduleStore().getActiveWitnesses()
+        .stream()
+        .map(w -> Hex.toHexString(w.toByteArray()))
+        .collect(Collectors.toSet());
+    recordSrSetChange(currentWitnesses);
+  }
+
+  private void recordSrSetChange(Set<String> currentWitnesses) {
+    if (currentWitnesses.isEmpty()) {
+      return;
+    }
+    if (lastActiveWitnesses.isEmpty()) {
+      lastActiveWitnesses.addAll(currentWitnesses);
+      return;
+    }
+    Set<String> added = new HashSet<>(currentWitnesses);
+    added.removeAll(lastActiveWitnesses);
+
+    Set<String> removed = new HashSet<>(lastActiveWitnesses);
+    removed.removeAll(currentWitnesses);
+
+    for (String address : added) {
+      Metrics.counterInc(MetricKeys.Counter.SR_SET_CHANGE, 1,
+          MetricLabels.Counter.SR_ADD, StringUtil.encode58Check(Hex.decode(address)));
+    }
+    for (String address : removed) {
+      Metrics.counterInc(MetricKeys.Counter.SR_SET_CHANGE, 1,
+          MetricLabels.Counter.SR_REMOVE, StringUtil.encode58Check(Hex.decode(address)));
+    }
+    if (!added.isEmpty() || !removed.isEmpty()) {
+      lastActiveWitnesses.clear();
+      lastActiveWitnesses.addAll(currentWitnesses);
     }
   }