Clean up instance telemetry bean in tests (#485)

DataDog · Nov 2, 2023 · 7c2921b · 7c2921b
1 parent 8771182
commit 7c2921b
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 9 deletions.
diff --git a/src/main/java/org/datadog/jmxfetch/App.java b/src/main/java/org/datadog/jmxfetch/App.java
@@ -244,6 +244,10 @@ public TaskStatusHandler invoke(
         }
     }
 
+    protected void clearAllInstances() {
+        this.clearInstances(this.instances);
+    }
+
     /**
      * Builds an {@link ExecutorService} of the specified fixed size. Threads will be created
      * and executed as daemons if {@link AppConfig#isDaemon()} is true. Defaults to false.

diff --git a/src/test/java/org/datadog/jmxfetch/TestApp.java b/src/test/java/org/datadog/jmxfetch/TestApp.java
@@ -152,7 +152,7 @@ public void testRegexpAliasing() throws Exception {
         List<String> tags =
                 Arrays.asList(
                         "jmx_domain:org.datadog.jmxfetch.test",
-                        "instance:jmx_test_instance",
+                        "instance:jmx_test_instance1",
                         "foo:Bar",
                         "qux:Baz");
 
@@ -963,7 +963,7 @@ public void testServiceDiscovery() throws Exception {
         List<String> tags = Arrays.asList(
             "type:SimpleTestJavaApp",
             "scope:CoolScope",
-            "instance:jmx_test_instance",
+            "instance:jmx_test_instance2",
             "jmx_domain:org.datadog.jmxfetch.test",
             "bean_host:localhost",
             "component"
@@ -998,7 +998,7 @@ public void testServiceDiscovery() throws Exception {
         tags =
                 Arrays.asList(
                         "jmx_domain:org.datadog.jmxfetch.test",
-                        "instance:jmx_test_instance",
+                        "instance:jmx_test_instance1",
                         "foo:Bar",
                         "qux:Baz");
 

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.clearAllInstances();
+        }
+    }
+
     /** 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_alias_match.yaml b/src/test/resources/jmx_alias_match.yaml
@@ -2,7 +2,7 @@ init_config:
 
 instances:
     -   process_name_regex: .*surefire.*
-        name: jmx_test_instance
+        name: jmx_test_instance1
         conf:
             - include:
                domain: org.datadog.jmxfetch.test

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.txt b/src/test/resources/jmx_sd_pipe.txt
@@ -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=

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_instance2
         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_instance3
         conf:
             - include:
                bean: org.datadog.jmxfetch.test:type=SimpleTestJavaApp,scope=Co|olScope,host=localhost,component=