Skip to content

Support ObjectName patterns in excludeObjectNameAttributes #897

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
KestasG wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Support ObjectName patterns in excludeObjectNameAttributes #897

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d91e138
Support ObjectName patterns in excludeObjectNameAttributes
kgedminas-dot Dec 5, 2023
b0c2dd5
Simplified implementation
kgedminas-dot Dec 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Support ObjectName patterns in excludeObjectNameAttributes 
Signed-off-by: kgedminas <kgedminas@eisgroup.com>
  • Loading branch information
@kgedminas-dot
kgedminas-dot committed Dec 5, 2023
commit d91e13846ef940179a74739c7d452f29a71602fb
15 changes: 14 additions & 1 deletion collector/src/main/java/io/prometheus/jmx/ObjectNameAttributeFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
}

Expand Down