Merge pull request #240 from jmccaull/enable_full_tracing_metrics

Added option to enable full tracing metrics with tracing disabled and…

Author: oliemansm

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

@@ -33,19 +33,21 @@ public class GraphQLInstrumentationAutoConfiguration {
     @Value("${graphql.servlet.maxQueryDepth:#{null}}")
     private Integer maxQueryDepth;
 
-    @Value("${graphql.servlet.tracing-enabled:#{false}}")
-    private Boolean tracingEnabled;
+    @Value("${graphql.servlet.tracing-enabled:'false'}")
+    private String tracingEnabled;
 
     @Bean
     @ConditionalOnMissingBean({TracingInstrumentation.class, MetricsInstrumentation.class})
-    @ConditionalOnProperty(value = "graphql.servlet.tracing-enabled", havingValue = "true")
+    @ConditionalOnExpression("${graphql.servlet.tracing-enabled:'false'}.equals('metrics-only')"
+        + "|| ${graphql.servlet.tracing-enabled:'false'}.equals(true)")
     public TracingInstrumentation tracingInstrumentation() {
         return new TracingInstrumentation();
     }
 
     @Bean
     @ConditionalOnMissingBean
-    @ConditionalOnExpression("${graphql.servlet.actuator-metrics:false} && !${graphql.servlet.tracing-enabled:false}")
+    @ConditionalOnExpression("${graphql.servlet.actuator-metrics:false}"
+        + "&& ${graphql.servlet.tracing-enabled:'false'}.toString().equals('false')")
     public TracingNoResolversInstrumentation tracingNoResolversInstrumentation() {
         return new TracingNoResolversInstrumentation();
     }
@@ -69,7 +71,7 @@ public MaxQueryDepthInstrumentation maxQueryDepthInstrumentation() {
     @ConditionalOnBean({MeterRegistry.class, TracingInstrumentation.class})
     @ConditionalOnMissingBean
     public MetricsInstrumentation metricsInstrumentation(MeterRegistry meterRegistry) {
-        return new MetricsInstrumentation(meterRegistry, tracingEnabled);
+        return new MetricsInstrumentation(meterRegistry, Boolean.TRUE.toString().equals(tracingEnabled));
     }
 
 }

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

@@ -88,6 +88,14 @@ public void tracingInstrumentationDisabledAndMetricsEnabled() {
         Assert.assertNotNull(this.getContext().getBean(TracingNoResolversInstrumentation.class));
     }
 
+    @Test
+    public void tracingMetricsWithTracingDisabled() {
+        load(DefaultConfiguration.class, "graphql.servlet.tracing-enabled='metrics-only'", "graphql.servlet.actuator-metrics=true");
+
+        Assert.assertNotNull(this.getContext().getBean("metricsInstrumentation"));
+        Assert.assertNotNull(this.getContext().getBean("tracingInstrumentation"));
+    }
+
     @Test
     public void actuatorMetricsEnabled() {
         load(DefaultConfiguration.class, "graphql.servlet.actuator-metrics=true");