AMLII-1173 - Modify JMXFetch to pass back a tag with the jmx_check_na…

…me to the Agent (#492)
DataDog · Nov 6, 2023 · 1f40ce0 · 1f40ce0
1 parent 7c2921b
commit 1f40ce0
Show file tree

Hide file tree

Showing 6 changed files with 174 additions and 155 deletions.
diff --git a/src/main/java/org/datadog/jmxfetch/JmxAttribute.java b/src/main/java/org/datadog/jmxfetch/JmxAttribute.java
@@ -172,6 +172,7 @@ private List<String> getBeanParametersList(
         List<String> beanTags = new ArrayList<String>();
         beanTags.add("instance:" + instanceName);
         beanTags.add("jmx_domain:" + domain);
+        beanTags.add("jmx_check_name:" + checkName);
 
         if (renameCassandraMetrics()) {
             beanTags.addAll(getCassandraBeanTags(beanParameters));

diff --git a/src/test/java/org/datadog/jmxfetch/TestApp.java b/src/test/java/org/datadog/jmxfetch/TestApp.java
diff --git a/src/test/java/org/datadog/jmxfetch/TestCommon.java b/src/test/java/org/datadog/jmxfetch/TestCommon.java
@@ -1,5 +1,7 @@
 package org.datadog.jmxfetch;
 
+import static org.hamcrest.CoreMatchers.hasItem;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -280,7 +282,7 @@ public void assertMetric(
                     assertEquals(countTags, mTags.size());
                 }
                 for (String t : tags) {
-                    assertTrue(mTags.contains(t));
+                    assertThat(mTags, hasItem(t));
                 }
 
                 if (metricType != null) {

diff --git a/src/test/resources/jmx_additional_tags.yml → src/test/resources/jmx_additional_tags.yaml b/src/test/resources/jmx_additional_tags.yml → src/test/resources/jmx_additional_tags.yaml
diff --git a/src/test/resources/jmx_exclude_tags.yml → src/test/resources/jmx_exclude_tags.yaml b/src/test/resources/jmx_exclude_tags.yml → src/test/resources/jmx_exclude_tags.yaml
diff --git a/...ces/jmx_exclude_tags_override_service.yml → ...es/jmx_exclude_tags_override_service.yaml b/...ces/jmx_exclude_tags_override_service.yml → ...es/jmx_exclude_tags_override_service.yaml