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

Jump to bottom

PAYARA-2686 Custom metrics are in addition to defaults, rather than o… #2665

Merged
merged 1 commit into from Apr 25, 2018
Merged

PAYARA-2686 Custom metrics are in addition to defaults, rather than o… #2665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 13 additions & 12 deletions ...s/microprofile/metrics/src/main/java/fish/payara/microprofile/metrics/MetricsService.java
View file
Open in desktop
Expand Up @@ -55,13 +55,9 @@
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.annotation.PostConstruct;
import javax.inject.Inject;
import javax.xml.bind.JAXB;
import org.eclipse.microprofile.config.Config;
import org.eclipse.microprofile.config.ConfigProvider;
import org.eclipse.microprofile.metrics.Metadata;
import org.eclipse.microprofile.metrics.Metric;
import org.eclipse.microprofile.metrics.MetricRegistry;
Expand Down Expand Up @@ -104,7 +100,7 @@ public MetricsService() {
public void init() {
events.register(this);
metricsServiceConfiguration = serviceLocator.getService(MetricsServiceConfiguration.class);
initMetadataConfig(JAXB.unmarshal(getConfigStream(), MBeanMetadataConfig.class));
initMetadataConfig(getConfig());
}

@Override
Expand Down Expand Up @@ -135,20 +131,25 @@ private void initMetadataConfig(MBeanMetadataConfig metadataConfig) {
globalTags);
}

private InputStream getConfigStream() {
InputStream configStream = null;
private MBeanMetadataConfig getConfig() {

InputStream defaultConfig = MetricsHelper.class.getResourceAsStream("/metrics.xml");
MBeanMetadataConfig config = JAXB.unmarshal(defaultConfig, MBeanMetadataConfig.class);


File metricsResource = new File(serverEnv.getConfigDirPath(), "metrics.xml");
if (metricsResource.exists()) {
try {
configStream = new FileInputStream(metricsResource);
InputStream userMetrics = new FileInputStream(metricsResource);
MBeanMetadataConfig extraConfig = JAXB.unmarshal(userMetrics, MBeanMetadataConfig.class);
config.addBaseMetadata(extraConfig.getBaseMetadata());
config.addVendorMetadata(extraConfig.getVendorMetadata());

} catch (FileNotFoundException ex) {
//ignore
}
}
if (configStream == null) {
configStream = MetricsHelper.class.getResourceAsStream("/metrics.xml");
}
return configStream;
return config;
}

public Boolean isMetricsEnabled() {
Expand Down
14 changes: 14 additions & 0 deletions ...ofile/metrics/src/main/java/fish/payara/microprofile/metrics/jmx/MBeanMetadataConfig.java
View file
Open in desktop
Expand Up @@ -70,6 +70,13 @@ public List<MBeanMetadata> getBaseMetadata() {
public void setBaseMetadata(List<MBeanMetadata> baseMetadata) {
this.baseMetadata = baseMetadata;
}

public void addBaseMetadata(List<MBeanMetadata> baseMetadata) {
if (this.baseMetadata == null) {
this.baseMetadata = new ArrayList<>();
}
this.baseMetadata.addAll(baseMetadata);
}

public List<MBeanMetadata> getVendorMetadata() {
if (vendorMetadata == null) {
Expand All @@ -82,4 +89,11 @@ public void setVendorMetadata(List<MBeanMetadata> vendorMetadata) {
this.vendorMetadata = vendorMetadata;
}

public void addVendorMetadata(List<MBeanMetadata> vendorMetadata) {
if (this.vendorMetadata == null) {
this.vendorMetadata = new ArrayList<>();
}
this.vendorMetadata.addAll(vendorMetadata);
}

}