Skip to content
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

issue-695: revert bulk loading of attributes #702

Merged
merged 2 commits into from
May 22, 2022
Merged

issue-695: revert bulk loading of attributes #702

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25c148a
issue-695: revert bulk loading of attributes
Apr 20, 2022
9a048c6
Revert to 1-by-1 loading if bulk loading fails
fstab May 22, 2022
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
46 changes: 18 additions & 28 deletions collector/src/main/java/io/prometheus/jmx/JmxScraper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,41 +138,31 @@ private void scrapeBean(MBeanServerConnection beanConn, ObjectName mbeanName) {
}
MBeanAttributeInfo[] attrInfos = info.getAttributes();

Map<String, MBeanAttributeInfo> name2AttrInfo = new LinkedHashMap<String, MBeanAttributeInfo>();
for (int idx = 0; idx < attrInfos.length; ++idx) {
MBeanAttributeInfo attr = attrInfos[idx];
if (!attr.isReadable()) {
logScrape(mbeanName, attr, "not readable");
continue;
}
name2AttrInfo.put(attr.getName(), attr);
}
final AttributeList attributes;
try {
attributes = beanConn.getAttributes(mbeanName, name2AttrInfo.keySet().toArray(new String[0]));
if (attributes == null) {
logScrape(mbeanName.toString(), "getAttributes Fail: attributes are null");
return;
}
} catch (Exception e) {
logScrape(mbeanName, name2AttrInfo.keySet(), "Fail: " + e);
return;
}
for (Object attributeObj : attributes.asList()) {
if (Attribute.class.isInstance(attributeObj)) {
Attribute attribute = (Attribute)(attributeObj);
MBeanAttributeInfo attr = name2AttrInfo.get(attribute.getName());
logScrape(mbeanName, attr, "process");
processBeanValue(
mbeanName.getDomain(),
jmxMBeanPropertyCache.getKeyPropertyList(mbeanName),
new LinkedList<String>(),
attr.getName(),
attr.getType(),
attr.getDescription(),
attribute.getValue()
);

Object value;
try {
value = beanConn.getAttribute(mbeanName, attr.getName());
} catch(Exception e) {
logScrape(mbeanName, attr, "Fail: " + e);
continue;
}

logScrape(mbeanName, attr, "process");
processBeanValue(
mbeanName.getDomain(),
jmxMBeanPropertyCache.getKeyPropertyList(mbeanName),
new LinkedList<String>(),
attr.getName(),
attr.getType(),
attr.getDescription(),
value
);
}
}

Expand Down