Feature: WebSphere PMI subcollections support for connection pool metrics

CHANGELOG.md

@@ -1,6 +1,7 @@
 Changelog
 =========
 # 0.51.1 / TBC
+- [FEATURE] Add support for WebSphere PMI Stats objects with subCollections [#XXX][]
 
 # 0.51.0 / 2025-10-28
 - [FEATURE] Add configuration-level dynamic tags for JMX attribute values via `dynamic_tags` [#581][]

src/main/java/org/datadog/jmxfetch/Instance.java

@@ -704,6 +704,27 @@ private void getMatchingAttributes() throws IOException {
                                 cassandraAliasing,
                                 emptyDefaultHostname,
                                 normalizeBeanParamTags);
+                } else if (PmiSubCollectionAttribute.matchAttribute(
+                        attributeType, beanName, attributeInfo, connection)) {
+                    log.debug(
+                            ATTRIBUTE
+                            + beanName
+                            + " : "
+                            + attributeInfo
+                            + " has attributeInfo WebSphere Stats type with "
+                            + "subCollections");
+                    jmxAttribute =
+                        new PmiSubCollectionAttribute(
+                                attributeInfo,
+                                beanName,
+                                className,
+                                instanceName,
+                                checkName,
+                                connection,
+                                serviceNameProvider,
+                                tags,
+                                emptyDefaultHostname,
+                                normalizeBeanParamTags);
                 } else if (JmxComplexAttribute.matchAttributeType(attributeType)) {
                     log.debug(
                             ATTRIBUTE

src/main/java/org/datadog/jmxfetch/JmxComplexAttribute.java

@@ -76,6 +76,9 @@ private void populateSubAttributeList(Object attributeValue) {
             this.subAttributeList.addAll(JeeStatisticsAttributes.attributesFor(attributeValue));
         } else if (JeeStatisticsAttributes.isJeeStat(attributeValue)) {
             this.subAttributeList.addAll(JeeStatisticsAttributes.getStatisticNames(attributeValue));
+        } else {
+            log.trace("beanName {} attributeValue type {}: no match {}",
+                getBeanName(), attributeValue.getClass(), attributeValue);
         }
     }
 
@@ -136,21 +139,6 @@ public boolean match(Configuration configuration) {
         return matchAttribute(configuration) && !excludeMatchAttribute(configuration);
     }
 
-    private boolean matchSubAttribute(
-            Filter params, String subAttributeName, boolean matchOnEmpty) {
-        if ((params.getAttribute() instanceof Map<?, ?>)
-                && ((Map<String, Object>) (params.getAttribute()))
-                        .containsKey(subAttributeName)) {
-            return true;
-        } else if ((params.getAttribute() instanceof List<?>
-                && ((List<String>) (params.getAttribute())).contains(subAttributeName))) {
-            return true;
-        } else if (params.getAttribute() == null) {
-            return matchOnEmpty;
-        }
-        return false;
-    }
-
     private boolean matchAttribute(Configuration configuration) {
         if (matchSubAttribute(configuration.getInclude(), getAttributeName(), true)) {
             return true;

src/main/java/org/datadog/jmxfetch/JmxSubAttribute.java

@@ -2,6 +2,8 @@
 
 import org.datadog.jmxfetch.service.ServiceNameProvider;
 
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -49,4 +51,80 @@ public Metric getCachedMetric(String name) {
         cachedMetrics.put(name, metric);
         return metric;
     }
+
+    /**
+     * Check if a sub-attribute matches the filter parameters.
+     *
+     * @param params the filter parameters
+     * @param subAttributeName the sub-attribute name to check
+     * @param matchOnEmpty whether to match if the attribute filter is null
+     * @return true if the sub-attribute matches
+     */
+    protected boolean matchSubAttribute(
+            Filter params, String subAttributeName, boolean matchOnEmpty) {
+        if ((params.getAttribute() instanceof Map<?, ?>)
+                && ((Map<String, Object>) (params.getAttribute()))
+                        .containsKey(subAttributeName)) {
+            return true;
+        } else if ((params.getAttribute() instanceof List<?>
+                && ((List<String>) (params.getAttribute())).contains(subAttributeName))) {
+            return true;
+        } else if (params.getAttribute() == null) {
+            return matchOnEmpty;
+        }
+        return false;
+    }
+
+    /**
+     * Get the attribute configuration for a specific metric key.
+     *
+     * @param key the metric key
+     * @return the attribute configuration map, or null if not found
+     */
+    protected Map<String, ?> getAttributesFor(String key) {
+        Filter include = getMatchingConf().getInclude();
+        if (include != null) {
+            Object includeAttribute = include.getAttribute();
+            if (includeAttribute instanceof Map<?, ?>) {
+                return (Map<String, ?>) ((Map) includeAttribute).get(key);
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Sort and filter metrics based on limit and sort order.
+     *
+     * @param metricKey the metric key
+     * @param metrics the list of metrics to sort and filter
+     * @return the sorted and filtered list of metrics
+     */
+    protected List<Metric> sortAndFilter(String metricKey, List<Metric> metrics) {
+        Map<String, ?> attributes = getAttributesFor(metricKey);
+        if (attributes == null || !attributes.containsKey("limit")) {
+            return metrics;
+        }
+        Integer limit = (Integer) attributes.get("limit");
+        if (metrics.size() <= limit) {
+            return metrics;
+        }
+        MetricComparator comp = new MetricComparator();
+        Collections.sort(metrics, comp);
+        String sort = (String) attributes.get("sort");
+        if (sort == null || sort.equals("desc")) {
+            metrics.subList(0, limit).clear();
+        } else {
+            metrics.subList(metrics.size() - limit, metrics.size()).clear();
+        }
+        return metrics;
+    }
+
+    /**
+     * Comparator for sorting metrics by value.
+     */
+    protected static class MetricComparator implements Comparator<Metric> {
+        public int compare(Metric o1, Metric o2) {
+            return Double.compare(o1.getValue(), o2.getValue());
+        }
+    }
 }

src/main/java/org/datadog/jmxfetch/JmxTabularAttribute.java

@@ -133,17 +133,6 @@ protected String[] getTags(String key, String subAttribute)
         return tags;
     }
 
-    private Map<String, ?> getAttributesFor(String key) {
-        Filter include = getMatchingConf().getInclude();
-        if (include != null) {
-            Object includeAttribute = include.getAttribute();
-            if (includeAttribute instanceof Map<?, ?>) {
-                return (Map<String, ?>) ((Map) includeAttribute).get(key);
-            }
-        }
-        return null;
-    }
-
     @Override
     public List<Metric> getMetrics()
             throws AttributeNotFoundException, InstanceNotFoundException, MBeanException,
@@ -179,32 +168,6 @@ public List<Metric> getMetrics()
         return metrics;
     }
 
-    private List<Metric> sortAndFilter(String metricKey, List<Metric> metrics) {
-        Map<String, ?> attributes = getAttributesFor(metricKey);
-        if (!attributes.containsKey("limit")) {
-            return metrics;
-        }
-        Integer limit = (Integer) attributes.get("limit");
-        if (metrics.size() <= limit) {
-            return metrics;
-        }
-        MetricComparator comp = new MetricComparator();
-        Collections.sort(metrics, comp);
-        String sort = (String) attributes.get("sort");
-        if (sort == null || sort.equals("desc")) {
-            metrics.subList(0, limit).clear();
-        } else {
-            metrics.subList(metrics.size() - limit, metrics.size()).clear();
-        }
-        return metrics;
-    }
-
-    private class MetricComparator implements Comparator<Metric> {
-        public int compare(Metric o1, Metric o2) {
-            return Double.compare(o1.getValue(), o2.getValue());
-        }
-    }
-
     private Object getValue(String key, String subAttribute)
             throws AttributeNotFoundException, InstanceNotFoundException, MBeanException,
                     ReflectionException, IOException {
@@ -268,21 +231,6 @@ public boolean match(Configuration configuration) {
         return matchAttribute(configuration); // TODO && !excludeMatchAttribute(configuration);
     }
 
-    private boolean matchSubAttribute(
-            Filter params, String subAttributeName, boolean matchOnEmpty) {
-        if ((params.getAttribute() instanceof Map<?, ?>)
-                && ((Map<String, Object>) (params.getAttribute()))
-                        .containsKey(subAttributeName)) {
-            return true;
-        } else if ((params.getAttribute() instanceof List<?>
-                && ((List<String>) (params.getAttribute())).contains(subAttributeName))) {
-            return true;
-        } else if (params.getAttribute() == null) {
-            return matchOnEmpty;
-        }
-        return false;
-    }
-
     private boolean matchAttribute(Configuration configuration) {
         if (matchSubAttribute(configuration.getInclude(), getAttributeName(), true)) {
             return true;