Fix boot 1 configuration to not require AOP

micrometer-metrics · Jun 17, 2017 · cc8c23d · cc8c23d
1 parent 4b09ec1
commit cc8c23d
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/main/java/org/springframework/metrics/boot/MetricsBoot1Configuration.java b/src/main/java/org/springframework/metrics/boot/MetricsBoot1Configuration.java
@@ -31,6 +31,7 @@
  * @author Jon Schneider
  */
 @Configuration
+// this class didn't exist until Spring 5
 @ConditionalOnMissingClass("org.springframework.web.server.WebFilter") // TODO got to be a better way...
 @Import({
         InstrumentRestTemplateConfiguration.class,
@@ -53,7 +54,7 @@ static class WebMvcConfiguration {}
      * If AOP is not enabled, scheduled interception will not work.
      */
     @Bean
-    @ConditionalOnClass({RestTemplate.class, JoinPoint.class})
+    @ConditionalOnClass(name = {"org.springframework.web.client.RestTemplate", "org.aopalliance.intercept.JoinPoint"})
     @ConditionalOnProperty(value = "spring.aop.enabled", havingValue = "true", matchIfMissing = true)
     public MetricsSchedulingAspect metricsSchedulingAspect(MeterRegistry registry) {
         return new MetricsSchedulingAspect(registry);
@@ -64,7 +65,7 @@ public MetricsSchedulingAspect metricsSchedulingAspect(MeterRegistry registry) {
      * will always be evaluated to "none".
      */
     @Configuration
-    @ConditionalOnClass({RestTemplate.class, JoinPoint.class})
+    @ConditionalOnClass(name = {"org.springframework.web.client.RestTemplate", "org.aopalliance.intercept.JoinPoint"})
     @ConditionalOnProperty(value = "spring.aop.enabled", havingValue = "true", matchIfMissing = true)
     static class MetricsRestTemplateAspectConfiguration {
         @Bean