Fix getTagsMap generic parameter handling

Instead of recovering on ClassCastException to fallback on List handling, use instanceof to determine the type of tagsMap
DataDog · Feb 12, 2020 · 9e309da · 9e309da
1 parent 5fbff55
commit 9e309da
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/main/java/org/datadog/jmxfetch/Instance.java b/src/main/java/org/datadog/jmxfetch/Instance.java
@@ -316,14 +316,14 @@ private static Map<String, String> getTagsMap(Object tagsMap, AppConfig appConfi
             tags.putAll(appConfig.getGlobalTags());
         }
         if (tagsMap != null) {
-            try {
-                // Input has `Map` format
+            if (tagsMap instanceof Map) {
                 tags.putAll((Map<String, String>) tagsMap);
-            } catch (ClassCastException e) {
-                // Input has `List` format
+            } else if (tagsMap instanceof List) {
                 for (String tag : (List<String>) tagsMap) {
                     tags.put(tag, null);
                 }
+            } else {
+                log.warn("Unsupported type for tagsMap: " + tagsMap.getClass().getCanonicalName());
             }
         }
         return tags;