Add more metrics to follow deal events and effective deals in all wat…

…chers
iExecBlockchainComputing · Feb 17, 2023 · 7219438 · 7219438
1 parent aee8902
commit 7219438
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 8 deletions.
diff --git a/src/main/java/com/iexec/core/chain/DealWatcherService.java b/src/main/java/com/iexec/core/chain/DealWatcherService.java
@@ -58,7 +58,11 @@ public class DealWatcherService {
     @Getter
     private BigInteger latestBlockNumberWithDeal = BigInteger.ZERO;
     @Getter
-    private int dealEventsCount = 0;
+    private long dealEventsCount = 0;
+    @Getter
+    private long dealsCount = 0;
+    @Getter
+    private long replayDealsCount = 0;
 
     public DealWatcherService(ChainConfig chainConfig,
                               IexecHubService iexecHubService,
@@ -97,7 +101,7 @@ Disposable subscribeToDealEventFromOneBlockToLatest(BigInteger from) {
         EthFilter filter = createDealEventFilter(from, null);
         return iexecHubService.getDealEventObservable(filter)
                 .map(this::schedulerNoticeToDealEvent)
-                .subscribe(dealEvent -> dealEvent.ifPresent(this::onDealEvent));
+                .subscribe(dealEvent -> dealEvent.ifPresent(event -> onDealEvent(event, "start")));
     }
 
     /**
@@ -106,11 +110,16 @@ Disposable subscribeToDealEventFromOneBlockToLatest(BigInteger from) {
      * 
      * @param dealEvent
      */
-    private void onDealEvent(DealEvent dealEvent) {
+    private void onDealEvent(DealEvent dealEvent, String watcher) {
+        if ("replay".equals(watcher)) {
+            replayDealsCount++;
+        } else {
+            dealsCount++;
+        }
         String dealId = dealEvent.getChainDealId();
         BigInteger dealBlock = dealEvent.getBlockNumber();
-        log.info("Received deal [dealId:{}, block:{}]", dealId,
-                dealBlock);
+        log.info("Received deal [dealId:{}, block:{}, watcher: {}]",
+                dealId, dealBlock, watcher);
         if (dealBlock.equals(BigInteger.ZERO)) {
             log.warn("Deal block number is empty, fetching later blockchain " +
                     "events will be more expensive [chainDealId:{}, dealBlock:{}, " +
@@ -193,7 +202,7 @@ private Disposable subscribeToDealEventInRange(BigInteger from, BigInteger to) {
         EthFilter filter = createDealEventFilter(from, to);
         return iexecHubService.getDealEventObservable(filter)
                 .map(this::schedulerNoticeToDealEvent)
-                .subscribe(dealEvent -> dealEvent.ifPresent(this::onDealEvent));
+                .subscribe(dealEvent -> dealEvent.ifPresent(event -> onDealEvent(event, "replay")));
     }
 
     EthFilter createDealEventFilter(BigInteger from, BigInteger to) {

diff --git a/src/main/java/com/iexec/core/metric/MetricService.java b/src/main/java/com/iexec/core/metric/MetricService.java
@@ -46,6 +46,8 @@ public PlatformMetric getPlatformMetrics() {
                 .aliveAvailableGpu(workerService.getAliveAvailableGpu())
                 .completedTasks(taskService.findByCurrentStatus(TaskStatus.COMPLETED).size())
                 .dealEventsCount(dealWatcherService.getDealEventsCount())
+                .dealsCount(dealWatcherService.getDealsCount())
+                .replayDealsCount(dealWatcherService.getReplayDealsCount())
                 .latestBlockNumberWithDeal(dealWatcherService.getLatestBlockNumberWithDeal())
                 .build();
     }

diff --git a/src/main/java/com/iexec/core/metric/PlatformMetric.java b/src/main/java/com/iexec/core/metric/PlatformMetric.java
@@ -33,7 +33,9 @@ public class PlatformMetric {
     private int aliveTotalGpu;
     private int aliveAvailableGpu;
     private int completedTasks;
-    private int dealEventsCount;
+    private long dealEventsCount;
+    private long dealsCount;
+    private long replayDealsCount;
     private BigInteger latestBlockNumberWithDeal;
 
 }
diff --git a/src/test/java/com/iexec/core/metric/MetricServiceTests.java b/src/test/java/com/iexec/core/metric/MetricServiceTests.java
@@ -60,7 +60,9 @@ void shouldGetPlatformMetrics() {
         when(workerService.getAliveAvailableGpu()).thenReturn(1);
         when(taskService.findByCurrentStatus(TaskStatus.COMPLETED))
                 .thenReturn(List.of());
-        when(dealWatcherService.getDealEventsCount()).thenReturn(10);
+        when(dealWatcherService.getDealEventsCount()).thenReturn(10L);
+        when(dealWatcherService.getDealsCount()).thenReturn(8L);
+        when(dealWatcherService.getReplayDealsCount()).thenReturn(2L);
         when(dealWatcherService.getLatestBlockNumberWithDeal()).thenReturn(BigInteger.valueOf(255L));
 
         PlatformMetric metric = metricService.getPlatformMetrics();
@@ -71,6 +73,8 @@ void shouldGetPlatformMetrics() {
         assertThat(metric.getAliveAvailableGpu()).isEqualTo(1);
         assertThat(metric.getCompletedTasks()).isZero();
         assertThat(metric.getDealEventsCount()).isEqualTo(10);
+        assertThat(metric.getDealsCount()).isEqualTo(8);
+        assertThat(metric.getReplayDealsCount()).isEqualTo(2);
         assertThat(metric.getLatestBlockNumberWithDeal()).isEqualTo(255);
     }