From f4237dbc78cba59fd1e45e89066427ffc780cbdd Mon Sep 17 00:00:00 2001
From: Brian Floersch <brian.floersch@datadoghq.com>
Date: Fri, 11 Dec 2020 09:02:15 -0500
Subject: [PATCH] Added config to not collect default JVM metrics (#345)

* added flag to not collect default JVM metrics

* cleanup log line
---
 src/main/java/org/datadog/jmxfetch/Instance.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/datadog/jmxfetch/Instance.java b/src/main/java/org/datadog/jmxfetch/Instance.java
index 9b1364c9d..de5cb9b99 100644
--- a/src/main/java/org/datadog/jmxfetch/Instance.java
+++ b/src/main/java/org/datadog/jmxfetch/Instance.java
@@ -224,8 +224,13 @@ public Instance(
             }
         }
 
-        loadDefaultConfig("default-jmx-metrics.yaml");
-        loadDefaultConfig(gcMetricConfig);
+        Boolean collectDefaultJvmMetrics = (Boolean) instanceMap.get("collect_default_jvm_metrics");
+        if (collectDefaultJvmMetrics == null || collectDefaultJvmMetrics) {
+            loadDefaultConfig("default-jmx-metrics.yaml");
+            loadDefaultConfig(gcMetricConfig);
+        } else {
+            log.info("collect_default_jvm_metrics is false - not collecting default JVM metrics");
+        }
     }
 
     public static boolean isDirectInstance(Map<String, Object> configInstance) {