From 249cc24be4d40b31ab0e7723800d6615ebd38fb2 Mon Sep 17 00:00:00 2001
From: Thomas Georgios Giannos <thgiannos@cite.gr>
Date: Mon, 15 Apr 2024 12:26:16 +0300
Subject: [PATCH] Metrics config cleanup and bug fix

---
 .../service/metrics/MetricsServiceImpl.java      | 16 ++++++++--------
 .../src/main/resources/config/metrics-devel.yml  |  4 ++++
 .../web/src/main/resources/config/metrics.yml    |  8 ++++----
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/metrics/MetricsServiceImpl.java b/dmp-backend/core/src/main/java/eu/eudat/service/metrics/MetricsServiceImpl.java
index 2e86cefc5..71983ce21 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/service/metrics/MetricsServiceImpl.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/service/metrics/MetricsServiceImpl.java
@@ -66,15 +66,15 @@ public class MetricsServiceImpl implements MetricsService {
             this.setGaugeValue(gauges, MetricNames.NEXUS_PREFIX + MetricNames.DMP, calculatePublishedDmps(true), MetricLabels.PUBLISHED);
             this.setGaugeValue(gauges, MetricNames.NEXUS_PREFIX + MetricNames.DMP, calculateDoiedDmps(true), MetricLabels.DOIED);
 
-            this.setGaugeValue(gauges, MetricNames.DMP, calculateDraftDmpsWithGrant(false), MetricLabels.DRAFT);
-            this.setGaugeValue(gauges, MetricNames.DMP, calculateFinalizedDmpsWithGrant(false), MetricLabels.FINALIZED);
-            this.setGaugeValue(gauges, MetricNames.DMP, calculatePublishedDmpsWithGrant(false), MetricLabels.PUBLISHED);
-            this.setGaugeValue(gauges, MetricNames.DMP, calculateDoiedDmpsWithGrant(false), MetricLabels.DOIED);
+            this.setGaugeValue(gauges, MetricNames.DMP_WITH_GRANT, calculateDraftDmpsWithGrant(false), MetricLabels.DRAFT);
+            this.setGaugeValue(gauges, MetricNames.DMP_WITH_GRANT, calculateFinalizedDmpsWithGrant(false), MetricLabels.FINALIZED);
+            this.setGaugeValue(gauges, MetricNames.DMP_WITH_GRANT, calculatePublishedDmpsWithGrant(false), MetricLabels.PUBLISHED);
+            this.setGaugeValue(gauges, MetricNames.DMP_WITH_GRANT, calculateDoiedDmpsWithGrant(false), MetricLabels.DOIED);
 
-            this.setGaugeValue(gauges, MetricNames.NEXUS_PREFIX + MetricNames.DMP, calculateDraftDmpsWithGrant(true), MetricLabels.DRAFT);
-            this.setGaugeValue(gauges, MetricNames.NEXUS_PREFIX + MetricNames.DMP, calculateFinalizedDmpsWithGrant(true), MetricLabels.FINALIZED);
-            this.setGaugeValue(gauges, MetricNames.NEXUS_PREFIX + MetricNames.DMP, calculatePublishedDmpsWithGrant(true), MetricLabels.PUBLISHED);
-            this.setGaugeValue(gauges, MetricNames.NEXUS_PREFIX + MetricNames.DMP, calculateDoiedDmpsWithGrant(true), MetricLabels.DOIED);
+            this.setGaugeValue(gauges, MetricNames.NEXUS_PREFIX + MetricNames.DMP_WITH_GRANT, calculateDraftDmpsWithGrant(true), MetricLabels.DRAFT);
+            this.setGaugeValue(gauges, MetricNames.NEXUS_PREFIX + MetricNames.DMP_WITH_GRANT, calculateFinalizedDmpsWithGrant(true), MetricLabels.FINALIZED);
+            this.setGaugeValue(gauges, MetricNames.NEXUS_PREFIX + MetricNames.DMP_WITH_GRANT, calculatePublishedDmpsWithGrant(true), MetricLabels.PUBLISHED);
+            this.setGaugeValue(gauges, MetricNames.NEXUS_PREFIX + MetricNames.DMP_WITH_GRANT, calculateDoiedDmpsWithGrant(true), MetricLabels.DOIED);
 
             this.setGaugeValue(gauges, MetricNames.FUNDERS, calculateAllFunders(false), null);
             this.setGaugeValue(gauges, MetricNames.GRANTS, calculateAllGrants(false), null);
diff --git a/dmp-backend/web/src/main/resources/config/metrics-devel.yml b/dmp-backend/web/src/main/resources/config/metrics-devel.yml
index ba506bfab..5e9147e8f 100644
--- a/dmp-backend/web/src/main/resources/config/metrics-devel.yml
+++ b/dmp-backend/web/src/main/resources/config/metrics-devel.yml
@@ -1,5 +1,9 @@
 metrics:
   task:
+    enable: true
+    intervalSeconds: 600
+    nexusDate: "2021-01-01T00:00:00.00Z"
+    usersLoginClient: ${IDP_APIKEY_CLIENT_ID_UUID:}
     referenceTypes:
       funderIds: ["538928bb-c7c6-452e-b66d-08e539f5f082"]
       grantIds: ["5b9c284f-f041-4995-96cc-fad7ad13289c"]
diff --git a/dmp-backend/web/src/main/resources/config/metrics.yml b/dmp-backend/web/src/main/resources/config/metrics.yml
index ec44ac45f..0f6163011 100644
--- a/dmp-backend/web/src/main/resources/config/metrics.yml
+++ b/dmp-backend/web/src/main/resources/config/metrics.yml
@@ -1,9 +1,9 @@
 metrics:
   task:
-    enable: true
-    intervalSeconds: 600
-    nexusDate: "2021-01-01T00:00:00.00Z"
-    usersLoginClient: ${IDP_APIKEY_CLIENT_ID_UUID:}
+    enable: false
+    intervalSeconds: null
+    nexusDate: null
+    usersLoginClient: null
     referenceTypes:
       funderIds: []
       grantIds: []