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

Guard against InaccessibleObjectException in ExecutorServiceMetrics #2452

Merged
merged 1 commit into from Feb 17, 2021
Merged

Guard against InaccessibleObjectException in ExecutorServiceMetrics #2452

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
4 changes: 3 additions & 1 deletion ...r-core/src/main/java/io/micrometer/core/instrument/binder/jvm/ExecutorServiceMetrics.java
View file
Open in desktop
Expand Up @@ -297,8 +297,10 @@ private ThreadPoolExecutor unwrapThreadPoolExecutor(ExecutorService executor, Cl
Field e = wrapper.getDeclaredField("e");
e.setAccessible(true);
return (ThreadPoolExecutor) e.get(executor);
} catch (NoSuchFieldException | IllegalAccessException e) {
} catch (NoSuchFieldException | IllegalAccessException | RuntimeException e) {
// Cannot use InaccessibleObjectException since it was introduced in Java 9, so catch all RuntimeExceptions instead
// Do nothing. We simply can't get to the underlying ThreadPoolExecutor.
log.info("Cannot unwrap ThreadPoolExecutor for monitoring from {} due to {}: {}", wrapper.getName(), e.getClass().getName(), e.getMessage());
}
return null;
}
Expand Down
15 changes: 14 additions & 1 deletion ...re/src/test/java/io/micrometer/core/instrument/binder/jvm/ExecutorServiceMetricsTest.java
View file
Open in desktop
Expand Up @@ -15,19 +15,23 @@
*/
package io.micrometer.core.instrument.binder.jvm;

import io.micrometer.core.Issue;
import io.micrometer.core.instrument.MeterRegistry;
import io.micrometer.core.instrument.MockClock;
import io.micrometer.core.instrument.Tag;
import io.micrometer.core.instrument.Tags;
import io.micrometer.core.instrument.simple.SimpleConfig;
import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledForJreRange;
import org.junit.jupiter.api.condition.JRE;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.CsvSource;

import java.util.concurrent.*;

import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
import static org.assertj.core.api.AssertionsForClassTypes.*;

/**
* Tests for {@link ExecutorServiceMetrics}.
Expand Down Expand Up @@ -106,6 +110,7 @@ void scheduledThreadPoolExecutorAsExecutorService(String metricPrefix, String ex
}

@DisplayName("ExecutorService can be monitored with a default set of metrics")
@DisabledForJreRange(min = JRE.JAVA_16, disabledReason = "See gh-2317 for why we can't run this full test on Java 16+")
@ParameterizedTest
@CsvSource({ "custom,custom.", "custom.,custom.", ",''", "' ',''" })
void monitorExecutorService(String metricPrefix, String expectedMetricPrefix) throws InterruptedException {
Expand Down Expand Up @@ -137,6 +142,14 @@ void monitorExecutorService(String metricPrefix, String expectedMetricPrefix) th
assertThat(registry.get(expectedMetricPrefix + "executor.queued").tags(userTags).gauge().value()).isEqualTo(0.0);
}

@DisplayName("No exception thrown trying to monitor Executors private class")
@Test
@Issue("#2447") // Note: only reproduces on Java 16+ or with --illegal-access=deny
void monitorExecutorsExecutorServicePrivateClass() {
assertThatCode(() -> ExecutorServiceMetrics.monitor(registry, Executors.newSingleThreadExecutor(), ""))
.doesNotThrowAnyException();
}

@DisplayName("ScheduledExecutorService can be monitored with a default set of metrics")
@ParameterizedTest
@CsvSource({ "custom,custom.", "custom.,custom.", ",''", "' ',''" })
Expand Down