Merge pull request #209 from blaugold/fix-metrics-no-tracing

fix(): actuator-metrics works without explicitly setting tracing-enabled to false

Author: oliemansm

graphql-spring-boot-autoconfigure/src/main/java/com/oembedler/moon/graphql/boot/GraphQLInstrumentationAutoConfiguration.java

@@ -11,6 +11,7 @@
 import org.springframework.boot.actuate.autoconfigure.metrics.export.simple.SimpleMetricsExportAutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -44,7 +45,7 @@ public TracingInstrumentation tracingInstrumentation() {
 
     @Bean
     @ConditionalOnMissingBean
-    @ConditionalOnProperty(value = "graphql.servlet.tracing-enabled", havingValue = "false")
+    @ConditionalOnExpression("${graphql.servlet.actuator-metrics:false} && !${graphql.servlet.tracing-enabled:false}")
     public TracingNoResolversInstrumentation tracingNoResolversInstrumentation() {
         return new TracingNoResolversInstrumentation();
     }

graphql-spring-boot-autoconfigure/src/test/java/com/oembedler/moon/graphql/boot/test/instrumentation/GraphQLInstrumentationAutoConfigurationTest.java

@@ -76,17 +76,26 @@ public void actuatorMetricsEnabledAndTracingEnabled() {
         load(DefaultConfiguration.class, "graphql.servlet.tracing-enabled=true", "graphql.servlet.actuator-metrics=true");
 
         Assert.assertNotNull(this.getContext().getBean(TracingInstrumentation.class));
-        this.getContext().getBean(TracingInstrumentation.class);
+        Assert.assertNotNull(this.getContext().getBean(MetricsInstrumentation.class));
+        this.getContext().getBean(TracingNoResolversInstrumentation.class);
     }
 
     @Test
-    public void tracingInstrumentationDisabledndMetricsEnabled() {
+    public void tracingInstrumentationDisabledAndMetricsEnabled() {
         load(DefaultConfiguration.class, "graphql.servlet.tracing-enabled=false", "graphql.servlet.actuator-metrics=true");
 
         Assert.assertNotNull(this.getContext().getBean(MetricsInstrumentation.class));
         Assert.assertNotNull(this.getContext().getBean(TracingNoResolversInstrumentation.class));
     }
 
+    @Test
+    public void actuatorMetricsEnabled() {
+        load(DefaultConfiguration.class, "graphql.servlet.actuator-metrics=true");
+
+        Assert.assertNotNull(this.getContext().getBean(MetricsInstrumentation.class));
+        Assert.assertNotNull(this.getContext().getBean(TracingNoResolversInstrumentation.class));
+    }
+
     @Test(expected = NoSuchBeanDefinitionException.class)
     public void tracingInstrumentationEnabledAndMetricsDisabled() {
         load(DefaultConfiguration.class, "graphql.servlet.tracing-enabled=true", "graphql.servlet.actuator-metrics=false");
@@ -104,8 +113,6 @@ public void tracingInstrumentationDisabledAndMetricsDisabled() {
         this.getContext().getBean(TracingInstrumentation.class);
     }
 
-
-
     @Test(expected = NoSuchBeanDefinitionException.class)
     public void actuatorMetricsDisabled() {
         load(DefaultConfiguration.class, "graphql.servlet.actuator-metrics=false");