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

Support jsr77 j2ee statistics #531

Merged
merged 6 commits into from
Jul 10, 2024
Merged

Support jsr77 j2ee statistics #531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
624c956
Support jsr77 j2ee statistics
amarziali Jun 26, 2024
16f3904
adjust tests
amarziali Jun 27, 2024
7a9710e
implement missing stat class
amarziali Jun 27, 2024
d8b68bc
Add classloader weak cache
amarziali Jun 27, 2024
b1da343
move dependency to scope test
amarziali Jul 4, 2024
6ea5428
review
amarziali Jul 4, 2024
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
7 changes: 7 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,13 @@
<artifactId>snakeyaml</artifactId>
<version>${snakeyaml.version}</version>
</dependency>
<dependency>
<groupId>javax.management.j2ee</groupId>
<artifactId>javax.management.j2ee-api</artifactId>
<version>1.1.2</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand Down
12 changes: 12 additions & 0 deletions src/main/java/org/datadog/jmxfetch/JmxComplexAttribute.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import lombok.extern.slf4j.Slf4j;

import org.datadog.jmxfetch.service.ServiceNameProvider;
import org.datadog.jmxfetch.util.JeeStatisticsAttributes;

import java.io.IOException;
import java.util.ArrayList;
Expand All @@ -26,9 +27,12 @@ public class JmxComplexAttribute extends JmxSubAttribute {
Arrays.asList(
"javax.management.openmbean.CompositeData",
"javax.management.openmbean.CompositeDataSupport",
"javax.management.j2ee.statistics.Statistic",
"javax.management.j2ee.statistics.Stats",
"java.util.HashMap",
"java.util.Map");


private List<String> subAttributeList = new ArrayList<String>();

/** JmxComplexAttribute constructor. */
Expand Down Expand Up @@ -68,6 +72,10 @@ private void populateSubAttributeList(Object attributeValue) {
for (String key : data.keySet()) {
this.subAttributeList.add(key);
}
} else if (JeeStatisticsAttributes.isJeeStatistic(attributeValue)) {
this.subAttributeList.addAll(JeeStatisticsAttributes.attributesFor(attributeValue));
} else if (JeeStatisticsAttributes.isJeeStat(attributeValue)) {
this.subAttributeList.addAll(JeeStatisticsAttributes.getStatisticNames(attributeValue));
}
}

Expand Down Expand Up @@ -96,6 +104,10 @@ private Object getValue(String subAttribute)
} else if (value instanceof java.util.Map) {
Map<String, Object> data = (Map<String, Object>) value;
return data.get(subAttribute);
} else if (JeeStatisticsAttributes.isJeeStatistic(value)) {
return JeeStatisticsAttributes.dataFor(value, subAttribute);
} else if (JeeStatisticsAttributes.isJeeStat(value)) {
return JeeStatisticsAttributes.getStatisticDataFor(value, subAttribute);
}
throw new NumberFormatException();
}
Expand Down
Loading
Loading