Polish

See gh-32518
spring-projects · Sep 30, 2022 · 5b092f5 · 5b092f5
1 parent 7f7ecdc
commit 5b092f5
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 10 deletions.
diff --git a/...c/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsProperties.java b/...c/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsProperties.java
@@ -149,6 +149,7 @@ public static class ClientRequest {
 				 */
 				private String metricName = "http.client.requests";
 
+				@Deprecated
 				@DeprecatedConfigurationProperty(replacement = "management.observations.http.client.requests.name")
 				public String getMetricName() {
 					return this.metricName;

diff --git a/...oot/actuate/autoconfigure/metrics/web/client/HttpClientObservationsAutoConfiguration.java b/...oot/actuate/autoconfigure/metrics/web/client/HttpClientObservationsAutoConfiguration.java
@@ -25,6 +25,7 @@
 import org.springframework.boot.actuate.autoconfigure.metrics.MetricsProperties;
 import org.springframework.boot.actuate.autoconfigure.metrics.OnlyOnceLoggingDenyMeterFilter;
 import org.springframework.boot.actuate.autoconfigure.observation.ObservationAutoConfiguration;
+import org.springframework.boot.actuate.autoconfigure.observation.ObservationProperties;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
@@ -61,11 +62,15 @@ class MeterFilterConfiguration {
 
 		@Bean
 		@Order(0)
-		MeterFilter metricsHttpClientUriTagFilter(MetricsProperties properties) {
-			String metricName = properties.getWeb().getClient().getRequest().getMetricName();
-			MeterFilter denyFilter = new OnlyOnceLoggingDenyMeterFilter(() -> String.format(
-					"Reached the maximum number of URI tags for '%s'. Are you using 'uriVariables'?", metricName));
-			return MeterFilter.maximumAllowableTags(metricName, "uri", properties.getWeb().getClient().getMaxUriTags(),
+		@SuppressWarnings("deprecation")
+		MeterFilter metricsHttpClientUriTagFilter(ObservationProperties observationProperties,
+				MetricsProperties metricsProperties) {
+			String metricName = metricsProperties.getWeb().getClient().getRequest().getMetricName();
+			String observationName = observationProperties.getHttp().getClient().getRequests().getName();
+			String name = (observationName != null) ? observationName : metricName;
+			MeterFilter denyFilter = new OnlyOnceLoggingDenyMeterFilter(() -> String
+					.format("Reached the maximum number of URI tags for '%s'. Are you using 'uriVariables'?", name));
+			return MeterFilter.maximumAllowableTags(name, "uri", metricsProperties.getWeb().getClient().getMaxUriTags(),
 					denyFilter);
 		}
 

diff --git a/...oot/actuate/autoconfigure/metrics/web/client/ClientObservationConventionAdapterTests.java b/...oot/actuate/autoconfigure/metrics/web/client/ClientObservationConventionAdapterTests.java
@@ -37,7 +37,7 @@
  *
  * @author Brian Clozel
  */
-@SuppressWarnings("deprecation")
+@SuppressWarnings({ "deprecation", "removal" })
 class ClientObservationConventionAdapterTests {
 
 	private static final String TEST_METRIC_NAME = "test.metric.name";

diff --git a/...boot/actuate/autoconfigure/metrics/web/client/WebClientObservationConfigurationTests.java b/...boot/actuate/autoconfigure/metrics/web/client/WebClientObservationConfigurationTests.java
@@ -55,7 +55,7 @@
  * @author Stephane Nicoll
  */
 @ExtendWith(OutputCaptureExtension.class)
-@SuppressWarnings("deprecation")
+@SuppressWarnings({ "deprecation", "removal" })
 class WebClientObservationConfigurationTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner().with(MetricsRun.simple())

diff --git a/...mework/boot/actuate/metrics/web/reactive/client/DefaultWebClientExchangeTagsProvider.java b/...mework/boot/actuate/metrics/web/reactive/client/DefaultWebClientExchangeTagsProvider.java
@@ -32,7 +32,8 @@
  * @deprecated since 3.0.0 for removal in 3.2.0 in favor of
  * {@link org.springframework.web.reactive.function.client.DefaultClientObservationConvention}
  */
-@Deprecated
+@Deprecated(since = "3.0.0", forRemoval = true)
+@SuppressWarnings({ "deprecation", "removal" })
 public class DefaultWebClientExchangeTagsProvider implements WebClientExchangeTagsProvider {
 
 	@Override

diff --git a/...k/boot/actuate/metrics/web/reactive/client/DefaultWebClientExchangeTagsProviderTests.java b/...k/boot/actuate/metrics/web/reactive/client/DefaultWebClientExchangeTagsProviderTests.java
@@ -39,7 +39,7 @@
  * @author Brian Clozel
  * @author Nishant Raut
  */
-@SuppressWarnings("deprecation")
+@SuppressWarnings({ "deprecation", "removal" })
 class DefaultWebClientExchangeTagsProviderTests {
 
 	private static final String URI_TEMPLATE_ATTRIBUTE = WebClient.class.getName() + ".uriTemplate";

diff --git a/.../springframework/boot/actuate/metrics/web/reactive/client/WebClientExchangeTagsTests.java b/.../springframework/boot/actuate/metrics/web/reactive/client/WebClientExchangeTagsTests.java
@@ -40,7 +40,7 @@
  * @author Brian Clozel
  * @author Nishant Raut
  */
-@SuppressWarnings({"deprecation", "removal"})
+@SuppressWarnings({ "deprecation", "removal" })
 class WebClientExchangeTagsTests {
 
 	private static final String URI_TEMPLATE_ATTRIBUTE = WebClient.class.getName() + ".uriTemplate";