Fix NullPointerException for cm handle state metrics

- ensure the certain beans are created in a specific order:
1-AdminCacheConfig
2-CmHandleStateMonitor
3-CmHandleStateConfig
- extract cm handle state config from MicroMeterRegistry to allow
  control order of bean initialization to prevent NullPointerException
- introduce @DependsOn annotation

Issue-ID: CPS-2677

Change-Id: I8dfec54cc7e603bded6a24e7362437042b222fd3
Signed-off-by: halil.cakal <halil.cakal@est.tech>

2 files changed, 3 insertions, 102 deletions

diff --git a/cps-application/src/main/java/org/onap/cps/config/MicroMeterConfig.java b/cps-application/src/main/java/org/onap/cps/config/MicroMeterConfig.java
index 6782669db2..6bf3f87d17 100644
--- a/cps-application/src/main/java/org/onap/cps/config/MicroMeterConfig.java
+++ b/cps-application/src/main/java/org/onap/cps/config/MicroMeterConfig.java
@@ -1,6 +1,6 @@
 /*
  * ============LICENSE_START=======================================================
- * Copyright (C) 2023-2025 Nordix Foundation.
+ * Copyright (C) 2023-2025 OpenInfra Foundation Europe. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,11 +20,9 @@
 
 package org.onap.cps.config;
 
-import com.hazelcast.map.IMap;
 import io.github.mweirauch.micrometer.jvm.extras.ProcessMemoryMetrics;
 import io.github.mweirauch.micrometer.jvm.extras.ProcessThreadMetrics;
 import io.micrometer.core.aop.TimedAspect;
-import io.micrometer.core.instrument.Gauge;
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.binder.MeterBinder;
 import lombok.RequiredArgsConstructor;
@@ -36,10 +34,6 @@ import org.springframework.context.annotation.Configuration;
 @RequiredArgsConstructor
 public class MicroMeterConfig {
 
-    private static final String STATE_TAG = "state";
-    private static final String CM_HANDLE_STATE_GAUGE = "cps_ncmp_inventory_cm_handles_by_state";
-    final IMap<String, Integer> cmHandlesByState;
-
     @Bean
     public TimedAspect timedAspect(final MeterRegistry meterRegistry) {
         return new TimedAspect(meterRegistry);
@@ -57,79 +51,4 @@ public class MicroMeterConfig {
         return new ProcessThreadMetrics();
     }
 
-    /**
-     * Register gauge metric for cm handles with state 'advised'.
-     *
-     * @param meterRegistry meter registry
-     * @return cm handle state gauge
-     */
-    @Bean
-    public Gauge advisedCmHandles(final MeterRegistry meterRegistry) {
-        return Gauge.builder(CM_HANDLE_STATE_GAUGE, cmHandlesByState,
-                        value -> cmHandlesByState.get("advisedCmHandlesCount"))
-                .tag(STATE_TAG, "ADVISED")
-                .description("Current number of cm handles in advised state")
-                .register(meterRegistry);
-    }
-
-    /**
-     * Register gauge metric for cm handles with state 'ready'.
-     *
-     * @param meterRegistry meter registry
-     * @return cm handle state gauge
-     */
-    @Bean
-    public Gauge readyCmHandles(final MeterRegistry meterRegistry) {
-        return Gauge.builder(CM_HANDLE_STATE_GAUGE, cmHandlesByState,
-                        value -> cmHandlesByState.get("readyCmHandlesCount"))
-                .tag(STATE_TAG, "READY")
-                .description("Current number of cm handles in ready state")
-                .register(meterRegistry);
-    }
-
-    /**
-     * Register gauge metric for cm handles with state 'locked'.
-     *
-     * @param meterRegistry meter registry
-     * @return cm handle state gauge
-     */
-    @Bean
-    public Gauge lockedCmHandles(final MeterRegistry meterRegistry) {
-        return Gauge.builder(CM_HANDLE_STATE_GAUGE, cmHandlesByState,
-                value -> cmHandlesByState.get("lockedCmHandlesCount"))
-                .tag(STATE_TAG, "LOCKED")
-                .description("Current number of cm handles in locked state")
-                .register(meterRegistry);
-    }
-
-    /**
-     * Register gauge metric for cm handles with state 'deleting'.
-     *
-     * @param meterRegistry meter registry
-     * @return cm handle state gauge
-     */
-    @Bean
-    public Gauge deletingCmHandles(final MeterRegistry meterRegistry) {
-        return Gauge.builder(CM_HANDLE_STATE_GAUGE, cmHandlesByState,
-                        value -> cmHandlesByState.get("deletingCmHandlesCount"))
-                .tag(STATE_TAG, "DELETING")
-                .description("Current number of cm handles in deleting state")
-                .register(meterRegistry);
-    }
-
-    /**
-     * Register gauge metric for cm handles with state 'deleted'.
-     *
-     * @param meterRegistry meter registry
-     * @return cm handle state gauge
-     */
-    @Bean
-    public Gauge deletedCmHandles(final MeterRegistry meterRegistry) {
-        return Gauge.builder(CM_HANDLE_STATE_GAUGE, cmHandlesByState,
-                        value -> cmHandlesByState.get("deletedCmHandlesCount"))
-                .tag(STATE_TAG, "DELETED")
-                .description("Number of cm handles that have been deleted since the application started")
-                .register(meterRegistry);
-    }
-
 }
diff --git a/cps-application/src/test/groovy/org/onap/cps/config/MicroMeterConfigSpec.groovy b/cps-application/src/test/groovy/org/onap/cps/config/MicroMeterConfigSpec.groovy
index faef32b04b..29cb65cfbb 100644
--- a/cps-application/src/test/groovy/org/onap/cps/config/MicroMeterConfigSpec.groovy
+++ b/cps-application/src/test/groovy/org/onap/cps/config/MicroMeterConfigSpec.groovy
@@ -1,6 +1,6 @@
 /*
  * ============LICENSE_START=======================================================
- * Copyright (C) 2023-2025 Nordix Foundation.
+ * Copyright (C) 2023-2025 OpenInfra Foundation Europe. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,14 +20,12 @@
 
 package org.onap.cps.config
 
-import com.hazelcast.map.IMap
 import io.micrometer.core.instrument.simple.SimpleMeterRegistry
 import spock.lang.Specification
 
 class MicroMeterConfigSpec extends Specification {
 
-    def cmHandlesByState = Mock(IMap)
-    def objectUnderTest = new MicroMeterConfig(cmHandlesByState)
+    def objectUnderTest = new MicroMeterConfig()
     def simpleMeterRegistry = new SimpleMeterRegistry()
 
     def 'Creating a timed aspect.'() {
@@ -42,20 +40,4 @@ class MicroMeterConfigSpec extends Specification {
             assert objectUnderTest.processThreadMetrics() != null
     }
 
-    def 'Creating gauges for cm handle states.'() {
-        given: 'cache returns value for each state'
-            cmHandlesByState.get(_) >> 1
-        when: 'gauges for each state are created'
-             objectUnderTest.advisedCmHandles(simpleMeterRegistry)
-             objectUnderTest.readyCmHandles(simpleMeterRegistry)
-             objectUnderTest.lockedCmHandles(simpleMeterRegistry)
-             objectUnderTest.deletingCmHandles(simpleMeterRegistry)
-             objectUnderTest.deletedCmHandles(simpleMeterRegistry)
-        then: 'each state has the correct value when queried'
-            ['ADVISED', 'READY', 'LOCKED', 'DELETING', 'DELETED'].each { state ->
-                def gaugeValue = simpleMeterRegistry.get(objectUnderTest.CM_HANDLE_STATE_GAUGE).tag('state',state).gauge().value()
-                assert gaugeValue == 1
-            }
-    }
-
 }