Keep old metrics name on /metrics endpoint to avoid breaking change (#745)

Author: jbern0rd

CHANGELOG.md

@@ -13,7 +13,7 @@ All notable changes to this project will be documented in this file.
 - Configuration server is now optional by default. (#728)
 - Improve switch statements after Java 17 migration. (#729)
 - Remove redundant blockchain calls to diminish pressure on Ethereum JSON-RPC API. (#734)
-- Compute alive workers metrics in `WorkerService#updateMetrics` scheduled job. (#739)
+- Compute alive workers metrics in `WorkerService#updateMetrics` scheduled job. (#739 #745)
 - Fix Spring Security deprecations after Spring Boot 3.3.8 upgrade. (#740)
 - Remove code related to reopen PoCo feature in `IexecHubService` and `TaskUpdateManager`. (#743)
 - Harmonize YML internal variables to proper case. (#744)

iexec-task-api/src/main/java/com/iexec/core/metric/PlatformMetric.java

@@ -40,6 +40,29 @@ public class PlatformMetric {
     long replayDealsCount;
     BigInteger latestBlockNumberWithDeal;
 
+    // region backward compatibility
+    /**
+     * @deprecated Use aliveComputingCpu = aliveRegisteredCpu - aliveComputingCpu instead
+     */
+    @Deprecated(forRemoval = true, since = "9.0.0")
+    int aliveAvailableCpu;
+    /**
+     * @deprecated Use aliveRegisteredCpu instead
+     */
+    @Deprecated(forRemoval = true, since = "9.0.0")
+    int aliveTotalCpu;
+    /**
+     * @deprecated Use aliveComputingGpu = aliveRegisteredGpu - aliveComputingGpu instead
+     */
+    @Deprecated(forRemoval = true, since = "9.0.0")
+    int aliveAvailableGpu;
+    /**
+     * @deprecated Use aliveRegisteredGpu instead
+     */
+    @Deprecated(forRemoval = true, since = "9.0.0")
+    int aliveTotalGpu;
+    // endregion
+
     @JsonPOJOBuilder(withPrefix = "")
     public static class PlatformMetricBuilder {
     }

src/main/java/com/iexec/core/metric/MetricService.java

@@ -53,6 +53,10 @@ public PlatformMetric getPlatformMetrics() {
                 .dealsCount(dealWatcherService.getDealsCount())
                 .replayDealsCount(dealWatcherService.getReplayDealsCount())
                 .latestBlockNumberWithDeal(dealWatcherService.getLatestBlockNumberWithDeal())
+                .aliveAvailableCpu(aliveWorkerMetrics.aliveRegisteredCpu() - aliveWorkerMetrics.aliveComputingCpu())
+                .aliveTotalCpu(aliveWorkerMetrics.aliveRegisteredCpu())
+                .aliveAvailableGpu(aliveWorkerMetrics.aliveRegisteredGpu() - aliveWorkerMetrics.aliveComputingGpu())
+                .aliveTotalGpu(aliveWorkerMetrics.aliveRegisteredGpu())
                 .build();
     }
 

src/test/java/com/iexec/core/metric/MetricServiceTests.java

@@ -64,6 +64,10 @@ void shouldGetPlatformMetrics() {
 
         PlatformMetric metric = metricService.getPlatformMetrics();
         Assertions.assertAll(
+                () -> assertThat(metric.getAliveAvailableCpu()).isZero(),
+                () -> assertThat(metric.getAliveTotalCpu()).isEqualTo(1),
+                () -> assertThat(metric.getAliveAvailableGpu()).isZero(),
+                () -> assertThat(metric.getAliveTotalGpu()).isEqualTo(1),
                 () -> assertThat(metric.getAliveWorkers()).isEqualTo(1),
                 () -> assertThat(metric.getAliveComputingCpu()).isEqualTo(1),
                 () -> assertThat(metric.getAliveRegisteredCpu()).isEqualTo(1),