return ChainedInstrumentation when registry present in context

Author: agairol

build.gradle

@@ -53,7 +53,7 @@ dependencies {
     compile 'javax.servlet:javax.servlet-api:3.0.1'
 
     // GraphQL
-    compile 'com.graphql-java:graphql-java:9.0'
+    compile 'com.graphql-java:graphql-java:9.2'
 
     testCompile 'io.github.graphql-java:graphql-java-annotations:5.2'
 

src/main/java/graphql/servlet/OsgiGraphQLServlet.java

@@ -1,5 +1,6 @@
 package graphql.servlet;
 
+import graphql.execution.instrumentation.ChainedInstrumentation;
 import graphql.execution.instrumentation.Instrumentation;
 import graphql.execution.instrumentation.dataloader.DataLoaderDispatcherInstrumentation;
 import graphql.execution.preparsed.NoOpPreparsedDocumentProvider;
@@ -207,7 +208,13 @@ protected ExecutionStrategyProvider getExecutionStrategyProvider() {
     @Override
     protected Instrumentation getInstrumentation(GraphQLContext context) {
         return context.getDataLoaderRegistry()
-                .map(DataLoaderDispatcherInstrumentation::new)
+                .map(registry -> {
+                    List<Instrumentation> instrumentations = new ArrayList<>();
+                    instrumentations.add(this.instrumentationProvider.getInstrumentation());
+                    instrumentations.add(new DataLoaderDispatcherInstrumentation(registry));
+
+                    return new ChainedInstrumentation(instrumentations);
+                })
                 .map(Instrumentation.class::cast)
                 .orElse(instrumentationProvider.getInstrumentation());
     }

src/main/java/graphql/servlet/SimpleGraphQLServlet.java

@@ -1,24 +1,28 @@
 package graphql.servlet;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import graphql.execution.ExecutionStrategy;
+import graphql.execution.instrumentation.ChainedInstrumentation;
 import graphql.execution.instrumentation.Instrumentation;
 import graphql.execution.instrumentation.SimpleInstrumentation;
 import graphql.execution.instrumentation.dataloader.DataLoaderDispatcherInstrumentation;
 import graphql.execution.preparsed.NoOpPreparsedDocumentProvider;
 import graphql.execution.preparsed.PreparsedDocumentProvider;
 import graphql.schema.GraphQLSchema;
 
+
+
 /**
  * @author Andrew Potter
  */
 public class SimpleGraphQLServlet extends GraphQLServlet {
-	
+
 
     /**
      * @deprecated use {@link #builder(GraphQLSchema)} instead.
@@ -52,7 +56,7 @@ public SimpleGraphQLServlet(final GraphQLSchema schema, ExecutionStrategyProvide
         this(new DefaultGraphQLSchemaProvider(schema), executionStrategyProvider, objectMapperConfigurer, listeners, instrumentation, errorHandler, contextBuilder, rootObjectBuilder, preparsedDocumentProvider,false);
     }
 
-    
+
     /**
      * @deprecated use {@link #builder(GraphQLSchemaProvider)} instead.
      */
@@ -189,7 +193,7 @@ public Builder withListeners(List<GraphQLServletListener> listeners) {
             this.listeners = listeners;
             return this;
         }
-        
+
         public Builder withAsyncServletMode(boolean value) {
         	this.asyncServletMode=value;
         	return this;
@@ -223,7 +227,15 @@ protected ExecutionStrategyProvider getExecutionStrategyProvider() {
     @Override
     protected Instrumentation getInstrumentation(GraphQLContext context) {
         return context.getDataLoaderRegistry()
-                .map(DataLoaderDispatcherInstrumentation::new)
+                .map(registry -> {
+                    List<Instrumentation> instrumentations = new ArrayList<>();
+                    if (this.instrumentation != null) {
+                        instrumentations.add(this.instrumentation);
+                    }
+                    instrumentations.add(new DataLoaderDispatcherInstrumentation(registry));
+
+                    return new ChainedInstrumentation(instrumentations);
+                })
                 .map(Instrumentation.class::cast)
                 .orElse(this.instrumentation);
     }

src/test/groovy/graphql/servlet/GraphQLServletSpec.groovy

@@ -3,8 +3,8 @@ package graphql.servlet
 import com.fasterxml.jackson.databind.ObjectMapper
 import graphql.Scalars
 import graphql.execution.ExecutionTypeInfo
+import graphql.execution.instrumentation.ChainedInstrumentation
 import graphql.execution.instrumentation.Instrumentation
-import graphql.execution.instrumentation.dataloader.DataLoaderDispatcherInstrumentation
 import graphql.schema.DataFetcher
 import graphql.schema.GraphQLFieldDefinition
 import graphql.schema.GraphQLNonNull
@@ -878,11 +878,11 @@ class GraphQLServletSpec extends Specification {
             Instrumentation actualInstrumentation = simpleGraphQLServlet.getInstrumentation(context)
         then:
         actualInstrumentation == expectedInstrumentation;
-        ! (actualInstrumentation instanceof DataLoaderDispatcherInstrumentation)
+        ! (actualInstrumentation instanceof ChainedInstrumentation)
 
     }
 
-    def "getInstrumentation returns the DataLoaderDispatcherInstrumentation if DataLoader provided in context"() {
+    def "getInstrumentation returns the ChainedInstrumentation if DataLoader provided in context"() {
 
         setup:
             Instrumentation servletInstrumentation = Mock()
@@ -896,8 +896,7 @@ class GraphQLServletSpec extends Specification {
         when:
             Instrumentation actualInstrumentation = simpleGraphQLServlet.getInstrumentation(context)
         then:
-            actualInstrumentation instanceof DataLoaderDispatcherInstrumentation
-            actualInstrumentation != servletInstrumentation;
-
+            actualInstrumentation instanceof ChainedInstrumentation
+            actualInstrumentation != servletInstrumentation
     }
 }