Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import java.io.InputStream;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.time.Duration;
import java.util.List;

/** An {@link AgentListener} that enables JMX metrics during agent startup. */
Expand All @@ -32,22 +33,22 @@ public void afterAgent(AutoConfiguredOpenTelemetrySdk autoConfiguredSdk) {

if (config.getBoolean("otel.jmx.enabled", true)) {
JmxMetricInsight service =
JmxMetricInsight.createService(GlobalOpenTelemetry.get(), beanDiscoveryDelay(config));
JmxMetricInsight.createService(
GlobalOpenTelemetry.get(), beanDiscoveryDelay(config).toMillis());
MetricConfiguration conf = buildMetricConfiguration(config);
service.start(conf);
}
}

private static long beanDiscoveryDelay(ConfigProperties configProperties) {
Long discoveryDelay = configProperties.getLong("otel.jmx.discovery.delay");
private static Duration beanDiscoveryDelay(ConfigProperties configProperties) {
Duration discoveryDelay = configProperties.getDuration("otel.jmx.discovery.delay");
if (discoveryDelay != null) {
return discoveryDelay;
}

// If discovery delay has not been configured, have a peek at the metric export interval.
// It makes sense for both of these values to be similar.
long exportInterval = configProperties.getLong("otel.metric.export.interval", 60000);
return exportInterval;
return configProperties.getDuration("otel.metric.export.interval", Duration.ofMinutes(1));
}

private static String resourceFor(String platform) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,13 @@ class BeanFinder {

private final MetricRegistrar registrar;
private MetricConfiguration conf;
private final ScheduledExecutorService exec = Executors.newSingleThreadScheduledExecutor();
private final ScheduledExecutorService exec =
Executors.newSingleThreadScheduledExecutor(
runnable -> {
Thread result = new Thread(runnable, "jmx_bean_finder");
result.setDaemon(true);
return result;
});
private final long discoveryDelay;
private final long maxDelay;
private long delay = 1000; // number of milliseconds until first attempt to discover MBeans
Expand All @@ -39,12 +45,18 @@ class BeanFinder {
void discoverBeans(MetricConfiguration conf) {
this.conf = conf;

if (!conf.isEmpty()) {
// Issue 9336: Corner case: PlatformMBeanServer will remain unitialized until a direct
// reference to it is made. This call makes sure that the PlatformMBeanServer will be in
// the set of MBeanServers reported by MBeanServerFactory.
ManagementFactory.getPlatformMBeanServer();
}
exec.schedule(
() -> {
// Issue 9336: Corner case: PlatformMBeanServer will remain unitialized until a direct
// reference to it is made. This call makes sure that the PlatformMBeanServer will be in
// the set of MBeanServers reported by MBeanServerFactory.
// Issue 11143: This call initializes java.util.logging.LogManager. We should not call it
// before application has had a chance to configure custom log manager. This is needed for
// wildfly.
ManagementFactory.getPlatformMBeanServer();
},
discoveryDelay,
TimeUnit.MILLISECONDS);

exec.schedule(
new Runnable() {
Expand Down
Loading