Fixed tests for metrics instrumentation

Author: Bruno Rodrigues

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 TracingInstrumentation {
+public class MetricsInstrumentation extends SimpleInstrumentation {
 
     private MeterRegistry meterRegistry;
 

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

@@ -2,6 +2,7 @@
 
 import com.oembedler.moon.graphql.boot.GraphQLInstrumentationAutoConfiguration;
 import com.oembedler.moon.graphql.boot.metrics.MetricsInstrumentation;
+import com.oembedler.moon.graphql.boot.metrics.TracingNoResolversInstrumentation;
 import com.oembedler.moon.graphql.boot.test.AbstractAutoConfigurationTest;
 import graphql.analysis.MaxQueryComplexityInstrumentation;
 import graphql.analysis.MaxQueryDepthInstrumentation;
@@ -49,16 +50,9 @@ public void noDefaultInstrumentations() {
         this.getContext().getBean(Instrumentation.class);
     }
 
-    @Test(expected = NoSuchBeanDefinitionException.class)
-    public void tracingInstrumentationDisabled() {
-        load(DefaultConfiguration.class, "graphql.servlet.tracingEnabled=false");
-
-        this.getContext().getBean(TracingInstrumentation.class);
-    }
-
     @Test
     public void tracingInstrumentationEnabled() {
-        load(DefaultConfiguration.class, "graphql.servlet.tracingEnabled=true");
+        load(DefaultConfiguration.class, "graphql.servlet.tracing-enabled=true");
 
         Assert.assertNotNull(this.getContext().getBean(TracingInstrumentation.class));
     }
@@ -78,12 +72,40 @@ public void maxQueryDepthEnabled() {
     }
 
     @Test
-    public void actuatorMetricsEnabled() {
-        load(DefaultConfiguration.class, "graphql.servlet.actuator-metrics=true");
+    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));
     }
 
+    @Test
+    public void tracingInstrumentationDisabledndMetricsEnabled() {
+        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(expected = NoSuchBeanDefinitionException.class)
+    public void tracingInstrumentationEnabledAndMetricsDisabled() {
+        load(DefaultConfiguration.class, "graphql.servlet.tracing-enabled=true", "graphql.servlet.actuator-metrics=false");
+
+        Assert.assertNotNull(this.getContext().getBean(TracingInstrumentation.class));
+        this.getContext().getBean(MetricsInstrumentation.class);
+    }
+
+    @Test(expected = NoSuchBeanDefinitionException.class)
+    public void tracingInstrumentationDisabledAndMetricsDisabled() {
+        load(DefaultConfiguration.class, "graphql.servlet.tracing-enabled=false", "graphql.servlet.actuator-metrics=false");
+
+        this.getContext().getBean(MetricsInstrumentation.class);
+        this.getContext().getBean(TracingNoResolversInstrumentation.class);
+        this.getContext().getBean(TracingInstrumentation.class);
+    }
+
+
+
     @Test(expected = NoSuchBeanDefinitionException.class)
     public void actuatorMetricsDisabled() {
         load(DefaultConfiguration.class, "graphql.servlet.actuator-metrics=false");