wip

dondonz · Jul 21, 2025 · May 19, 2025 · May 19, 2025 · May 20, 2025 · May 20, 2025
commit 275eaac079cfc84c52bce072923e56850f8d0090
diff --git a/src/main/java/graphql/GraphQL.java b/src/main/java/graphql/GraphQL.java
@@ -424,7 +424,7 @@ public CompletableFuture<ExecutionResult> executeAsync(ExecutionInput executionI
         EngineRunningState engineRunningState = new EngineRunningState(executionInput, profiler);
         return engineRunningState.engineRun(() -> {
             ExecutionInput executionInputWithId = ensureInputHasId(executionInput);
-            profiler.setExecutionId(executionInputWithId.getExecutionId());
+            profiler.executionInput(executionInputWithId);
             engineRunningState.updateExecutionId(executionInputWithId.getExecutionId());
 
             CompletableFuture<InstrumentationState> instrumentationStateCF = instrumentation.createStateAsync(new InstrumentationCreateStateParameters(this.graphQLSchema, executionInputWithId));

diff --git a/src/main/java/graphql/Profiler.java b/src/main/java/graphql/Profiler.java
@@ -1,7 +1,6 @@
 package graphql;
 
 import graphql.execution.EngineRunningObserver;
-import graphql.execution.ExecutionId;
 import graphql.execution.ResultPath;
 import graphql.language.OperationDefinition;
 import graphql.schema.DataFetcher;
@@ -25,7 +24,7 @@ default void subSelectionCount(int size) {
 
     }
 
-    default void setExecutionId(ExecutionId executionId) {
+    default void executionInput(ExecutionInput executionInput) {
 
     }
 

diff --git a/src/main/java/graphql/ProfilerImpl.java b/src/main/java/graphql/ProfilerImpl.java
@@ -3,6 +3,7 @@
 import graphql.execution.EngineRunningObserver;
 import graphql.execution.ExecutionId;
 import graphql.execution.ResultPath;
+import graphql.execution.instrumentation.dataloader.DataLoaderDispatchingContextKeys;
 import graphql.language.OperationDefinition;
 import graphql.schema.DataFetcher;
 import graphql.schema.PropertyDataFetcher;
@@ -29,8 +30,10 @@ public ProfilerImpl(GraphQLContext graphQLContext) {
     }
 
     @Override
-    public void setExecutionId(ExecutionId executionId) {
-        profilerResult.setExecutionId(executionId);
+    public void executionInput(ExecutionInput executionInput) {
+        profilerResult.setExecutionId(executionInput.getExecutionId());
+        boolean dataLoaderChainingEnabled = executionInput.getGraphQLContext().getBoolean(DataLoaderDispatchingContextKeys.ENABLE_DATA_LOADER_CHAINING, false);
+        profilerResult.setDataLoaderChainingEnabled(dataLoaderChainingEnabled);
     }
 
     @Override
@@ -55,7 +58,7 @@ public void fieldFetched(Object fetchedObject, DataFetcher<?> dataFetcher, Resul
             } else {
                 dataFetcherResultType = ProfilerResult.DataFetcherResultType.MATERIALIZED;
             }
-            profilerResult.setDataFetcherResultType(path.toString(), dataFetcherResultType);
+            profilerResult.setDataFetcherResultType(key, dataFetcherResultType);
         }
 
         profilerResult.setDataFetcherType(key, dataFetcherType);

diff --git a/src/main/java/graphql/ProfilerResult.java b/src/main/java/graphql/ProfilerResult.java
@@ -26,10 +26,11 @@ public class ProfilerResult {
     private final Map<String, Integer> dataFetcherInvocationCount = new ConcurrentHashMap<>();
     private final Map<String, DataFetcherType> dataFetcherTypeMap = new ConcurrentHashMap<>();
 
-    // the key is the whole result key, not just the query path
     private final Map<String, DataFetcherResultType> dataFetcherResultType = new ConcurrentHashMap<>();
     private volatile String operationName;
     private volatile String operationType;
+    private volatile boolean dataLoaderChainingEnabled;
+
 
 
     public enum DataFetcherType {
@@ -47,6 +48,11 @@ public enum DataFetcherResultType {
 
     // setters are package private to prevent exposure
 
+    void setDataLoaderChainingEnabled(boolean dataLoaderChainingEnabled) {
+        this.dataLoaderChainingEnabled = dataLoaderChainingEnabled;
+    }
+
+
     void setDataFetcherType(String key, DataFetcherType dataFetcherType) {
         dataFetcherTypeMap.putIfAbsent(key, dataFetcherType);
         totalDataFetcherInvocations.incrementAndGet();
@@ -55,8 +61,8 @@ void setDataFetcherType(String key, DataFetcherType dataFetcherType) {
         }
     }
 
-    void setDataFetcherResultType(String resultPath, DataFetcherResultType fetchedType) {
-        dataFetcherResultType.put(resultPath, fetchedType);
+    void setDataFetcherResultType(String key, DataFetcherResultType fetchedType) {
+        dataFetcherResultType.putIfAbsent(key, fetchedType);
     }
 
     void incrementDataFetcherInvocationCount(String key) {
@@ -148,9 +154,7 @@ public Map<String, DataFetcherResultType> getDataFetcherResultType() {
         return dataFetcherResultType;
     }
 
-
-    @Override
-    public String toString() {
+    public String fullSummary() {
         return "ProfilerResult{" +
                 "executionId=" + executionId +
                 ", operation=" + operationType + ":" + operationName +
@@ -164,6 +168,29 @@ public String toString() {
                 ", dataFetcherInvocationCount=" + dataFetcherInvocationCount +
                 ", dataFetcherTypeMap=" + dataFetcherTypeMap +
                 ", dataFetcherResultType=" + dataFetcherResultType +
+                ", dataLoaderChainingEnabled=" + dataLoaderChainingEnabled +
                 '}';
     }
+
+    public String shortSummary() {
+        return "ProfilerResult{" +
+                "executionId=" + executionId +
+                ", operation=" + operationType + ":" + operationName +
+                ", startTime=" + startTime +
+                ", endTime=" + endTime +
+                ", totalRunTime=" + (endTime - startTime) + "(" + (endTime - startTime) / 1_000_000 + "ms)" +
+                ", engineTotalRunningTime=" + engineTotalRunningTime + "(" + engineTotalRunningTime / 1_000_000 + "ms)" +
+                ", totalDataFetcherInvocations=" + totalDataFetcherInvocations +
+                ", totalPropertyDataFetcherInvocations=" + totalPropertyDataFetcherInvocations +
+                ", fieldsFetchedCount=" + fieldsFetched.size() +
+                ", dataLoaderChainingEnabled=" + dataLoaderChainingEnabled +
+                '}';
+
+
+    }
+
+    @Override
+    public String toString() {
+        return shortSummary();
+    }
 }
diff --git a/src/test/groovy/graphql/ProfilerTest.groovy b/src/test/groovy/graphql/ProfilerTest.groovy
@@ -132,7 +132,7 @@ class ProfilerTest extends Specification {
         given:
         def sdl = '''
             type Query {
-                foo: Foo
+                foo: [Foo]
             }
             type Foo {
                 id: String
@@ -144,7 +144,7 @@ class ProfilerTest extends Specification {
                         foo: { DataFetchingEnvironment dfe ->
                             return CompletableFuture.supplyAsync {
                                 Thread.sleep(100)
-                                return [id: "1", name: "foo"]
+                                return [[id: "1", name: "foo"]]
                             }
                         } as DataFetcher],
                 Foo  : [
@@ -164,7 +164,7 @@ class ProfilerTest extends Specification {
         def profilerResult = ei.getGraphQLContext().get(ProfilerResult.PROFILER_CONTEXT_KEY) as ProfilerResult
 
         then:
-        result.getData() == [foo: [id: "1", name: "foo"]]
+        result.getData() == [foo: [[id: "1", name: "foo"]]]
         profilerResult.getDataFetcherResultType() == ["/foo/name": COMPLETABLE_FUTURE_COMPLETED, "/foo": COMPLETABLE_FUTURE_NOT_COMPLETED]