Fix tests for tracing instrumentation being create at the same time as metrics instrumentation

Author: Bruno Rodrigues

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

@@ -36,7 +36,7 @@ public class GraphQLInstrumentationAutoConfiguration {
     private Boolean tracingEnabled;
 
     @Bean
-    @ConditionalOnMissingBean
+    @ConditionalOnMissingBean({TracingInstrumentation.class, MetricsInstrumentation.class})
     @ConditionalOnProperty(value = "graphql.servlet.tracing-enabled", havingValue = "true")
     public TracingInstrumentation tracingInstrumentation() {
         return new TracingInstrumentation();

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

@@ -1,8 +1,8 @@
 package com.oembedler.moon.graphql.boot.metrics;
 
 import graphql.ExecutionResult;
-import graphql.execution.instrumentation.SimpleInstrumentation;
 import graphql.execution.instrumentation.parameters.InstrumentationExecutionParameters;
+import graphql.execution.instrumentation.tracing.TracingInstrumentation;
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.Timer;
 
@@ -14,7 +14,7 @@
 /**
  * @author Bruno Rodrigues
  */
-public class MetricsInstrumentation extends SimpleInstrumentation {
+public class MetricsInstrumentation extends TracingInstrumentation {
 
     private MeterRegistry meterRegistry;
 

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

@@ -71,12 +71,12 @@ public void maxQueryDepthEnabled() {
         Assert.assertNotNull(this.getContext().getBean(MaxQueryDepthInstrumentation.class));
     }
 
-    @Test
+    @Test(expected = NoSuchBeanDefinitionException.class)
     public void actuatorMetricsEnabledAndTracingEnabled() {
         load(DefaultConfiguration.class, "graphql.servlet.tracing-enabled=true", "graphql.servlet.actuator-metrics=true");
 
         Assert.assertNotNull(this.getContext().getBean(TracingInstrumentation.class));
-        Assert.assertNotNull(this.getContext().getBean(MetricsInstrumentation.class));
+        this.getContext().getBean(TracingInstrumentation.class);
     }
 
     @Test