Clean up instance telemetry bean in tests

DataDog · Oct 11, 2023 · f6d5978 · f6d5978
1 parent 93e6f90
commit f6d5978
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/src/main/java/org/datadog/jmxfetch/App.java b/src/main/java/org/datadog/jmxfetch/App.java
@@ -197,7 +197,7 @@ public static int getLoopCounter() {
         return loopCounter;
     }
 
-    private void clearInstances(final Collection<Instance> instances) {
+    protected void clearInstances(final Collection<Instance> instances) {
         final List<InstanceTask<Void>> cleanupInstanceTasks =
                 new ArrayList<>(instances.size());
         for (final Instance instance : instances) {

diff --git a/src/test/java/org/datadog/jmxfetch/TestCommon.java b/src/test/java/org/datadog/jmxfetch/TestCommon.java
@@ -110,6 +110,16 @@ public void unregisterMBean() throws MBeanRegistrationException, InstanceNotFoun
         }
     }
 
+    /**
+     * Clear instances and their instance telemetry bean after execution of every test.
+     */
+    @After
+    public void clearInstances() {
+        if (app != null) {
+            app.clearInstances(getInstances());
+        }
+    }
+
     /** Init JMXFetch with the given YAML configuration file. */
     protected void initApplication(String yamlFileName, String autoDiscoveryPipeFile)
             throws FileNotFoundException, IOException {

diff --git a/src/test/resources/jmx_counter_rate.yaml b/src/test/resources/jmx_counter_rate.yaml
@@ -3,7 +3,7 @@ init_config:
 instances:
   -   process_name_regex: .*surefire.*
       refresh_beans: 4
-      name: jmx_test_instance
+      name: jmx_test_instance1
       conf:
         - include:
             domain: org.datadog.jmxfetch.test
@@ -13,7 +13,7 @@ instances:
                 alias: test.counter
   -   process_name_regex: .*surefire.*
       refresh_beans: 4
-      name: jmx_test_instance
+      name: jmx_test_instance2
       conf:
         - include:
             domain: org.datadog.jmxfetch.test

diff --git a/src/test/resources/jmx_sd_pipe_longname.txt b/src/test/resources/jmx_sd_pipe_longname.txt
@@ -4,7 +4,7 @@ init_config:
 
 instances:
     -   process_name_regex: .*surefire.*
-        name: jmx_test_instance
+        name: jmx_test_instance1
         conf:
             - include:
                bean: org.datadog.jmxfetch.test:type=SimpleTestJavaApp,scope=Co|olScope,host=localhost,component=
@@ -25,7 +25,7 @@ init_config:
 
 instances:
     -   process_name_regex: .*surefire.*
-        name: jmx_test_instance
+        name: jmx_test_instance2
         conf:
             - include:
                bean: org.datadog.jmxfetch.test:type=SimpleTestJavaApp,scope=Co|olScope,host=localhost,component=