Polish "Allow configuration of auto-timed metrics"

This commit makes sure the "auto-time-requests" property is still
available in a deprecated fashion.

See gh-15988

Author: snicoll

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

@@ -184,13 +184,37 @@ public ServerRequest getRequest() {
 				return this.request;
 			}
 
+			/**
+			 * Return whether server requests should be automatically timed.
+			 * @return {@code true} if server request should be automatically timed
+			 * @deprecated since 2.2.0 in favor of {@link Autotime#isEnabled()}
+			 */
+			@DeprecatedConfigurationProperty(
+					replacement = "management.metrics.web.server.request.autotime.enabled")
+			@Deprecated
+			public boolean isAutoTimeRequests() {
+				return this.request.getAutotime().isEnabled();
+			}
+
+			/**
+			 * Set whether server requests should be automatically timed.
+			 * @param autoTimeRequests whether server requests should be automatically
+			 * timed
+			 * @deprecated since 2.2.0 in favor of {@link Autotime#isEnabled()}
+			 */
+			@Deprecated
+			public void setAutoTimeRequests(boolean autoTimeRequests) {
+				this.request.getAutotime().setEnabled(autoTimeRequests);
+			}
+
 			/**
 			 * Return name of the metric for server requests.
 			 * @return request metric name
 			 * @deprecated since 2.2.0 in favor of {@link ServerRequest#getMetricName()}
 			 */
 			@DeprecatedConfigurationProperty(
 					replacement = "management.metrics.web.server.request.metric-name")
+			@Deprecated
 			public String getRequestsMetricName() {
 				return this.request.getMetricName();
 			}
@@ -201,6 +225,7 @@ public String getRequestsMetricName() {
 			 * @deprecated since 2.2.0 in favor of
 			 * {@link ServerRequest#setMetricName(String)}
 			 */
+			@Deprecated
 			public void setRequestsMetricName(String requestsMetricName) {
 				this.request.setMetricName(requestsMetricName);
 			}

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/reactive/WebFluxMetricsAutoConfigurationTests.java

@@ -109,6 +109,20 @@ public void metricsAreNotRecordedIfAutoTimeRequestsIsDisabled() {
 				});
 	}
 
+	@Test
+	@Deprecated
+	public void metricsAreNotRecordedIfAutoTimeRequestsIsDisabledWithDeprecatedProperty() {
+		this.contextRunner
+				.withConfiguration(AutoConfigurations.of(WebFluxAutoConfiguration.class))
+				.withUserConfiguration(TestController.class)
+				.withPropertyValues(
+						"management.metrics.web.server.auto-time-requests=false")
+				.run((context) -> {
+					MeterRegistry registry = getInitializedMeterRegistry(context);
+					assertThat(registry.find("http.server.requests").meter()).isNull();
+				});
+	}
+
 	private MeterRegistry getInitializedMeterRegistry(
 			AssertableReactiveWebApplicationContext context) {
 		WebTestClient webTestClient = WebTestClient.bindToApplicationContext(context)