Fix test for GraphQlTest annotation because of actuator auto configuration

Author: Bruno Rodrigues

gradle.properties

@@ -40,7 +40,6 @@ LIB_GRAPHQL_JAVA_VER = 9.2
 LIB_JUNIT_VER = 4.12
 LIB_SPRING_CORE_VER = 5.0.4.RELEASE
 LIB_SPRING_BOOT_VER = 2.0.5.RELEASE
-LIB_MICROMETER_VER = 1.0.6
 LIB_GRAPHQL_SERVLET_VER = 6.1.4
 LIB_GRAPHQL_JAVA_TOOLS_VER = 5.3.3
 LIB_COMMONS_IO_VER = 2.6

graphql-spring-boot-autoconfigure/build.gradle

@@ -21,7 +21,7 @@ dependencies {
     compile "org.springframework.boot:spring-boot-configuration-processor:$LIB_SPRING_BOOT_VER"
     compile "org.springframework.boot:spring-boot-autoconfigure:$LIB_SPRING_BOOT_VER"
     compile "org.springframework.boot:spring-boot-starter-websocket:$LIB_SPRING_BOOT_VER"
-    compile "io.micrometer:micrometer-core:$LIB_MICROMETER_VER"
+    compile "org.springframework.boot:spring-boot-starter-actuator:$LIB_SPRING_BOOT_VER"
     compile "com.graphql-java-kickstart:graphql-java-servlet:$LIB_GRAPHQL_SERVLET_VER"
     compile "commons-io:commons-io:$LIB_COMMONS_IO_VER"
     compile "com.graphql-java-kickstart:graphql-java-tools:$LIB_GRAPHQL_JAVA_TOOLS_VER"

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

@@ -5,6 +5,10 @@
 import graphql.execution.instrumentation.tracing.TracingInstrumentation;
 import io.micrometer.core.instrument.MeterRegistry;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration;
+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.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -15,6 +19,7 @@
  * @author Marcel Overdijk
  */
 @Configuration
+@AutoConfigureAfter({MetricsAutoConfiguration.class, SimpleMetricsExportAutoConfiguration.class})
 @ConditionalOnProperty(value = "graphql.servlet.enabled", havingValue = "true", matchIfMissing = true)
 @EnableConfigurationProperties({GraphQLServletProperties.class})
 public class GraphQLInstrumentationAutoConfiguration {
@@ -47,8 +52,9 @@ public MaxQueryDepthInstrumentation maxQueryDepthInstrumentation() {
     }
 
     @Bean
-    @ConditionalOnMissingBean
     @ConditionalOnProperty(value = "graphql.servlet.actuator-metrics", havingValue = "true")
+    @ConditionalOnBean(MeterRegistry.class)
+    @ConditionalOnMissingBean
     public MetricsInstrumentation metricsInstrumentation(MeterRegistry meterRegistry) {
         return new MetricsInstrumentation(meterRegistry);
     }

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

@@ -17,10 +17,6 @@
  */
 public class MetricsInstrumentation extends SimpleInstrumentation {
 
-    public InstrumentationState createState() {
-        return new MetricsSupport();
-    }
-
     private MeterRegistry meterRegistry;
 
     private static final String OPERATION_TIME_METRIC_NAME = "graphql.timer.operation";
@@ -34,21 +30,28 @@ public MetricsInstrumentation(MeterRegistry meterRegistry) {
         this.meterRegistry = meterRegistry;
     }
 
+    //This create a custom instrumentation state that stores any needed value.
+    //In this case, it stores the begin time of the query
+    @Override
+    public InstrumentationState createState() {
+        return new MetricsSupport();
+    }
+
     @Override
     public InstrumentationContext<ExecutionResult> beginExecution(InstrumentationExecutionParameters parameters) {
 
         return new SimpleInstrumentationContext<ExecutionResult>() {
             @Override
             public void onCompleted(ExecutionResult result, Throwable t) {
 
-            GraphQLContext graphQLContext = parameters.getContext();
-            MetricsSupport metricsSupport = parameters.getInstrumentationState();
-            if (graphQLContext.getHttpServletRequest().isPresent()) {
+                GraphQLContext graphQLContext = parameters.getContext();
+                MetricsSupport metricsSupport = parameters.getInstrumentationState();
+                if (graphQLContext.getHttpServletRequest().isPresent()) {
 
-                Timer timer = buildTimer(parameters.getOperation(), t);
-                timer.record(metricsSupport.getTotalTime(), TimeUnit.NANOSECONDS);
+                    Timer timer = buildTimer(parameters.getOperation(), t);
+                    timer.record(metricsSupport.getTotalTime(), TimeUnit.NANOSECONDS);
 
-            }
+                }
 
             }
 

graphql-spring-boot-test-autoconfigure/src/main/java/com/graphql/spring/boot/test/GraphQLTest.java

@@ -3,26 +3,27 @@
 import com.coxautodev.graphql.tools.GraphQLResolver;
 import com.coxautodev.graphql.tools.SchemaParserDictionary;
 import com.coxautodev.graphql.tools.SchemaParserOptions;
-import com.graphql.spring.boot.test.GraphQLTestAutoConfiguration;
-import com.oembedler.moon.graphql.boot.*;
+import com.oembedler.moon.graphql.boot.GraphQLInstrumentationAutoConfiguration;
+import com.oembedler.moon.graphql.boot.GraphQLJavaToolsAutoConfiguration;
+import com.oembedler.moon.graphql.boot.GraphQLWebAutoConfiguration;
 import graphql.execution.ExecutionStrategy;
 import graphql.execution.instrumentation.Instrumentation;
 import graphql.execution.preparsed.PreparsedDocumentProvider;
 import graphql.schema.GraphQLScalarType;
 import graphql.schema.GraphQLSchema;
 import graphql.schema.idl.SchemaParser;
 import graphql.servlet.*;
+import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration;
+import org.springframework.boot.actuate.autoconfigure.metrics.export.simple.SimpleMetricsExportAutoConfiguration;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.autoconfigure.web.servlet.ServletWebServerFactoryAutoConfiguration;
 import org.springframework.boot.autoconfigure.websocket.servlet.WebSocketServletAutoConfiguration;
 import org.springframework.boot.test.autoconfigure.OverrideAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.PropertySource;
 import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
 import org.springframework.core.annotation.AliasFor;
 import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.TestPropertySource;
 import org.springframework.web.filter.CorsFilter;
 import org.springframework.web.socket.server.standard.ServerEndpointExporter;
 
@@ -87,12 +88,15 @@
             annotation = ImportAutoConfiguration.class
     )
     Class<?>[] classes() default {
+            GraphQLInstrumentationAutoConfiguration.class,
             ServletWebServerFactoryAutoConfiguration.class,
             GraphQLJavaToolsAutoConfiguration.class,
             GraphQLWebAutoConfiguration.class,
             GraphQLTestAutoConfiguration.class,
             PropertySourcesPlaceholderConfigurer.class,
-            WebSocketServletAutoConfiguration.class
+            WebSocketServletAutoConfiguration.class,
+            MetricsAutoConfiguration.class,
+            SimpleMetricsExportAutoConfiguration.class
     };
 
     @AliasFor(