add meterTags to counted aspects.

Signed-off-by: Dominique Villard <[email protected]>

Author: doumdoum

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

@@ -17,6 +17,7 @@
 package org.springframework.boot.actuate.autoconfigure.metrics;
 
 import io.micrometer.core.aop.CountedAspect;
+import io.micrometer.core.aop.CountedMeterTagAnnotationHandler;
 import io.micrometer.core.aop.MeterTagAnnotationHandler;
 import io.micrometer.core.aop.TimedAspect;
 import io.micrometer.core.instrument.MeterRegistry;
@@ -46,8 +47,10 @@ public class MetricsAspectsAutoConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean
-	CountedAspect countedAspect(MeterRegistry registry) {
-		return new CountedAspect(registry);
+	CountedAspect countedAspect(MeterRegistry registry, ObjectProvider<CountedMeterTagAnnotationHandler> countedMeterTagAnnotationHandler) {
+		CountedAspect countedAspect = new CountedAspect(registry);
+		countedMeterTagAnnotationHandler.ifAvailable(countedAspect::setMeterTagAnnotationHandler);
+		return countedAspect;
 	}
 
 	@Bean

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

@@ -17,6 +17,7 @@
 package org.springframework.boot.actuate.autoconfigure.metrics;
 
 import io.micrometer.core.aop.CountedAspect;
+import io.micrometer.core.aop.CountedMeterTagAnnotationHandler;
 import io.micrometer.core.aop.MeterTagAnnotationHandler;
 import io.micrometer.core.aop.TimedAspect;
 import io.micrometer.core.instrument.MeterRegistry;
@@ -71,6 +72,15 @@ void shouldConfigureMeterTagAnnotationHandler() {
 		});
 	}
 
+	@Test
+	void shouldConfigureCounterMeterTagAnnotationHandler() {
+		this.contextRunner.withUserConfiguration(MeterTagAnnotationHandlerConfiguration.class).run((context) -> {
+			assertThat(context).hasSingleBean(CountedAspect.class);
+			assertThat(ReflectionTestUtils.getField(context.getBean(CountedAspect.class), "countedMeterTagAnnotationHandler"))
+					.isSameAs(context.getBean(CountedMeterTagAnnotationHandler.class));
+		});
+	}
+
 	@Test
 	void shouldNotConfigureAspectsIfMicrometerIsMissing() {
 		this.contextRunner.withClassLoader(new FilteredClassLoader(MeterRegistry.class)).run((context) -> {
@@ -128,6 +138,10 @@ MeterTagAnnotationHandler meterTagAnnotationHandler() {
 			return new MeterTagAnnotationHandler(null, null);
 		}
 
+		@Bean
+		CountedMeterTagAnnotationHandler countedMeterTagAnnotationHandler() {
+			return new CountedMeterTagAnnotationHandler(null, null);
+		}
 	}
 
 }