Avoid exposing time-related task metrics

Fixes gh-28535

Author: scottfrederick

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/task/TaskExecutorMetricsAutoConfiguration.java

@@ -16,6 +16,7 @@
 
 package org.springframework.boot.actuate.autoconfigure.metrics.task;
 
+import java.util.Collections;
 import java.util.Map;
 import java.util.concurrent.Executor;
 import java.util.concurrent.ThreadPoolExecutor;
@@ -66,7 +67,7 @@ else if (executor instanceof ThreadPoolTaskScheduler) {
 
 	private void monitor(MeterRegistry registry, ThreadPoolExecutor threadPoolExecutor, String name) {
 		if (threadPoolExecutor != null) {
-			ExecutorServiceMetrics.monitor(registry, threadPoolExecutor, name);
+			new ExecutorServiceMetrics(threadPoolExecutor, name, Collections.emptyList()).bindTo(registry);
 		}
 	}
 

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/task/TaskExecutorMetricsAutoConfigurationTests.java

@@ -21,6 +21,7 @@
 
 import io.micrometer.core.instrument.FunctionCounter;
 import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.search.MeterNotFoundException;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.actuate.autoconfigure.metrics.test.MetricsRun;
@@ -34,6 +35,7 @@
 import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
 
@@ -56,6 +58,8 @@ void taskExecutorUsingAutoConfigurationIsInstrumented() {
 					Collection<FunctionCounter> meters = registry.get("executor.completed").functionCounters();
 					assertThat(meters).singleElement().satisfies(
 							(meter) -> assertThat(meter.getId().getTag("name")).isEqualTo("applicationTaskExecutor"));
+					assertThatExceptionOfType(MeterNotFoundException.class)
+							.isThrownBy(() -> registry.get("executor").timer());
 				});
 	}
 
@@ -101,6 +105,8 @@ void taskSchedulerUsingAutoConfigurationIsInstrumented() {
 					Collection<FunctionCounter> meters = registry.get("executor.completed").functionCounters();
 					assertThat(meters).singleElement()
 							.satisfies((meter) -> assertThat(meter.getId().getTag("name")).isEqualTo("taskScheduler"));
+					assertThatExceptionOfType(MeterNotFoundException.class)
+							.isThrownBy(() -> registry.get("executor").timer());
 				});
 	}