Skip to content

Commit ec61f51

Browse files
committed
fix: make sure we always have a Metrics instance
1 parent 13ce5ef commit ec61f51

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/CustomResourceCache.java

+3
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ public CustomResourceCache() {
3838

3939
public CustomResourceCache(ObjectMapper objectMapper, Metrics metrics) {
4040
this.objectMapper = objectMapper;
41+
if (metrics == null) {
42+
metrics = Metrics.NOOP;
43+
}
4144
resources = metrics.monitorSizeOf(new ConcurrentHashMap<>(), "cache");
4245
}
4346

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/internal/CustomResourceEventSourceTest.java

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import io.fabric8.kubernetes.client.Watcher;
1111
import io.fabric8.kubernetes.client.dsl.MixedOperation;
1212
import io.fabric8.kubernetes.client.dsl.Resource;
13+
import io.javaoperatorsdk.operator.Metrics;
1314
import io.javaoperatorsdk.operator.TestUtils;
1415
import io.javaoperatorsdk.operator.api.config.ConfigurationService;
1516
import io.javaoperatorsdk.operator.api.config.DefaultControllerConfiguration;
@@ -121,6 +122,7 @@ public TestConfiguration(boolean generationAware) {
121122
mock(ConfigurationService.class));
122123
when(getConfigurationService().getObjectMapper())
123124
.thenReturn(ConfigurationService.OBJECT_MAPPER);
125+
when(getConfigurationService().getMetrics()).thenReturn(Metrics.NOOP);
124126
}
125127
}
126128
}

0 commit comments

Comments
 (0)