Skip to content

Commit f67aad6

Browse files
committed
fix?: make sure we wrap all ExecutorServices
1 parent 720e9a0 commit f67aad6

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ExecutorServiceManager.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ public class ExecutorServiceManager {
2020
private final ExecutorService executor;
2121
private final int terminationTimeoutSeconds;
2222

23-
private ExecutorServiceManager(ExecutorService executor, int terminationTimeoutSeconds) {
23+
private ExecutorServiceManager(InstrumentedExecutorService executor,
24+
int terminationTimeoutSeconds) {
2425
this.executor = executor;
2526
this.terminationTimeoutSeconds = terminationTimeoutSeconds;
2627
}
@@ -46,7 +47,8 @@ public static void stop() {
4647

4748
public static void useTestInstance() {
4849
if (instance == null) {
49-
instance = new ExecutorServiceManager(Executors.newFixedThreadPool(5), 1);
50+
instance = new ExecutorServiceManager(
51+
new InstrumentedExecutorService(Executors.newFixedThreadPool(5)), 1);
5052
}
5153
}
5254

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/CustomResourceSelectorTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
2020
import io.javaoperatorsdk.operator.Operator;
2121
import io.javaoperatorsdk.operator.api.config.ConfigurationService;
22-
import io.javaoperatorsdk.operator.api.config.ExecutorServiceManager;
2322
import io.javaoperatorsdk.operator.api.config.Version;
2423
import io.javaoperatorsdk.operator.api.reconciler.Context;
2524
import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
@@ -49,7 +48,6 @@ public class CustomResourceSelectorTest {
4948
@SuppressWarnings("unchecked")
5049
@BeforeEach
5150
void setUpResources() {
52-
ExecutorServiceManager.useTestInstance();
5351
configurationService = spy(ConfigurationService.class);
5452
when(configurationService.checkCRDAndValidateLocalModel()).thenReturn(false);
5553
when(configurationService.getVersion()).thenReturn(new Version("1", "1", new Date()));

0 commit comments

Comments
 (0)