Support ObjectName patterns in excludeObjectNameAttributes

Signed-off-by: kgedminas <kgedminas@eisgroup.com>
prometheus · Dec 5, 2023 · d91e138 · d91e138
1 parent 8e4e62f
commit d91e138
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/collector/src/main/java/io/prometheus/jmx/ObjectNameAttributeFilter.java b/collector/src/main/java/io/prometheus/jmx/ObjectNameAttributeFilter.java
@@ -129,10 +129,23 @@ public void add(ObjectName objectName, String attributeName) {
     public boolean exclude(ObjectName objectName, String attributeName) {
         boolean result = false;
 
+        // concrete objectName definition gets precedence
         if (excludeObjectNameAttributesMap.size() > 0) {
             Set<String> attributeNameSet = excludeObjectNameAttributesMap.get(objectName);
             if (attributeNameSet != null) {
-                result = attributeNameSet.contains(attributeName);
+                return attributeNameSet.contains(attributeName);
+            }
+        }
+        for (Map.Entry<ObjectName, Set<String>> objectNameSetEntry :
+                excludeObjectNameAttributesMap.entrySet()) {
+            if (objectNameSetEntry.getKey().isPattern()
+                    && objectNameSetEntry.getKey().apply(objectName)) {
+                // if exclusion found - return
+                // otherwise keep searching as checked object may match multiple patterns
+                // and checked attribute may be defined only under one of them
+                if (objectNameSetEntry.getValue().contains(attributeName)) {
+                    return true;
+                }
             }
         }