Conditionalize web mvc metrics by @ConditionalOnWebApplication (fixes m…

…icrometer-metrics#244)
pavel-golub · Nov 24, 2017 · 79640b0 · 79640b0
1 parent 66beaee
commit 79640b0
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/.../main/java/io/micrometer/spring/autoconfigure/web/servlet/WebMvcMetricsConfiguration.java b/.../main/java/io/micrometer/spring/autoconfigure/web/servlet/WebMvcMetricsConfiguration.java
@@ -23,6 +23,7 @@
 import io.micrometer.spring.web.servlet.WebMvcTagsProvider;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -37,6 +38,7 @@
  */
 @Configuration
 @ConditionalOnClass(DispatcherServlet.class)
+@ConditionalOnWebApplication
 @EnableConfigurationProperties(MetricsProperties.class)
 public class WebMvcMetricsConfiguration {