From: danielhanrahan <daniel.hanrahan@est.tech>
Date: Fri, 24 Jan 2025 16:09:07 +0000 (+0000)
Subject: Disable JVM process metrics by default
X-Git-Tag: 3.6.0~8
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F21%2F140021%2F1;p=cps.git

Disable JVM process metrics by default

Issue-ID: CPS-2583
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
Change-Id: I9c7a543201a63c1f128737bb0995843af6075a6b
---

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 8481eadf1b..b85f391b8e 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
@@ -28,6 +28,7 @@ import io.micrometer.core.instrument.Gauge;
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.binder.MeterBinder;
 import lombok.RequiredArgsConstructor;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -45,11 +46,13 @@ public class MicroMeterConfig {
     }
 
     @Bean
+    @ConditionalOnProperty("cps.monitoring.micrometer-jvm-extras")
     public MeterBinder processMemoryMetrics() {
         return new ProcessMemoryMetrics();
     }
 
     @Bean
+    @ConditionalOnProperty("cps.monitoring.micrometer-jvm-extras")
     public MeterBinder processThreadMetrics() {
         return new ProcessThreadMetrics();
     }
diff --git a/cps-application/src/main/resources/application.yml b/cps-application/src/main/resources/application.yml
index 0b5d59ecc9..6b9c694cf2 100644
--- a/cps-application/src/main/resources/application.yml
+++ b/cps-application/src/main/resources/application.yml
@@ -152,6 +152,8 @@ security:
         password: ${CPS_PASSWORD:cpsr0cks!}
 
 cps:
+    monitoring:
+        micrometer-jvm-extras: false
     tracing:
         sampler:
             jaeger_remote:
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index 86b2ffd582..0828d6f3a9 100644
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -68,6 +68,7 @@ services:
       ONAP_OTEL_EXPORTER_ENDPOINT: http://jaeger-service:4317
       POLICY_SERVICE_ENABLED: 'false'
       POLICY_SERVICE_DEFAULT_DECISION: 'deny from env'
+      CPS_MONITORING_MICROMETER_JVM_EXTRAS: 'true'
       JAVA_TOOL_OPTIONS: "-XX:InitialRAMPercentage=70.0 -XX:MaxRAMPercentage=70.0"
       ### DEBUG: Uncomment next line to enable java debugging
       ### JAVA_TOOL_OPTIONS: -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005