move tracing back to executeField

Author: yaacovCR

src/diagnostics.ts

@@ -174,12 +174,3 @@ export function traceMixed<T>(
       });
   });
 }
-
-/**
- * Check if a channel is defined and has subscribers.
- */
-export function shouldTrace(
-  channel: MinimalTracingChannel | undefined,
-): channel is MinimalTracingChannel {
-  return channel?.hasSubscribers === true;
-}

src/execution/Executor.ts

@@ -44,8 +44,7 @@ import {
 } from '../type/definition.js';
 import type { GraphQLSchema } from '../type/schema.js';
 
-import type { MinimalTracingChannel } from '../diagnostics.js';
-import { resolveChannel, shouldTrace, traceMixed } from '../diagnostics.js';
+import { resolveChannel, traceMixed } from '../diagnostics.js';
 
 import { AbortedGraphQLExecutionError } from './AbortedGraphQLExecutionError.js';
 import { withCancellation } from './cancellablePromise.js';
@@ -481,9 +480,6 @@ export class Executor<
     groupedFieldSet: GroupedFieldSet,
     positionContext: TPositionContext | undefined,
   ): PromiseOrValue<ObjMap<unknown>> {
-    const tracingChannel = shouldTrace(resolveChannel)
-      ? resolveChannel
-      : undefined;
     return promiseReduce(
       groupedFieldSet,
       (results, [responseName, fieldDetailsList]) => {
@@ -497,7 +493,6 @@ export class Executor<
           fieldDetailsList,
           fieldPath,
           positionContext,
-          tracingChannel,
         );
         if (result === undefined) {
           return results;
@@ -528,9 +523,6 @@ export class Executor<
   ): PromiseOrValue<ObjMap<unknown>> {
     const results = Object.create(null);
     let containsPromise = false;
-    const tracingChannel = shouldTrace(resolveChannel)
-      ? resolveChannel
-      : undefined;
 
     try {
       for (const [responseName, fieldDetailsList] of groupedFieldSet) {
@@ -541,7 +533,6 @@ export class Executor<
           fieldDetailsList,
           fieldPath,
           positionContext,
-          tracingChannel,
         );
 
         if (result !== undefined) {
@@ -583,7 +574,6 @@ export class Executor<
     fieldDetailsList: FieldDetailsList,
     path: Path,
     positionContext: TPositionContext | undefined,
-    tracingChannel: MinimalTracingChannel | undefined,
   ): PromiseOrValue<unknown> {
     const validatedExecutionArgs = this.validatedExecutionArgs;
     const { schema, contextValue, variableValues, hideSuggestions } =
@@ -597,7 +587,18 @@ export class Executor<
     }
 
     const returnType = fieldDef.type;
-    const resolveFn = fieldDef.resolve ?? validatedExecutionArgs.fieldResolver;
+    let resolveFn = fieldDef.resolve ?? validatedExecutionArgs.fieldResolver;
+
+    if (resolveChannel?.hasSubscribers) {
+      const channel = resolveChannel;
+      const originalResolveFn = resolveFn;
+      resolveFn = (s, args, c, info) =>
+        traceMixed(
+          channel,
+          this.buildResolveCtx(args, info, fieldDef.resolve === undefined),
+          () => originalResolveFn(s, args, c, info),
+        );
+    }
 
     const info = buildResolveInfo(
       validatedExecutionArgs,
@@ -625,17 +626,7 @@ export class Executor<
       // The resolve function's optional third argument is a context value that
       // is provided to every resolve function within an execution. It is commonly
       // used to represent an authenticated user, or request-specific caches.
-      const result = tracingChannel
-        ? this.invokeResolverWithTracing(
-            tracingChannel,
-            resolveFn,
-            source,
-            args,
-            contextValue,
-            info,
-            fieldDef.resolve === undefined,
-          )
-        : resolveFn(source, args, contextValue, info);
+      const result = resolveFn(source, args, contextValue, info);
 
       if (isPromiseLike(result)) {
         return this.completePromisedValue(
@@ -672,22 +663,6 @@ export class Executor<
     }
   }
 
-  invokeResolverWithTracing(
-    tracingChannel: MinimalTracingChannel,
-    resolveFn: GraphQLFieldResolver<unknown, unknown>,
-    source: unknown,
-    args: { readonly [argument: string]: unknown },
-    contextValue: unknown,
-    info: GraphQLResolveInfo,
-    isTrivialResolver: boolean,
-  ): PromiseOrValue<unknown> {
-    return traceMixed(
-      tracingChannel,
-      this.buildResolveCtx(args, info, isTrivialResolver),
-      () => resolveFn(source, args, contextValue, info),
-    );
-  }
-
   /**
    * Build a graphql:resolve channel context for a single field invocation.
    *

src/language/parser.ts

@@ -3,7 +3,7 @@ import type { Maybe } from '../jsutils/Maybe.js';
 import type { GraphQLError } from '../error/GraphQLError.js';
 import { syntaxError } from '../error/syntaxError.js';
 
-import { parseChannel, shouldTrace } from '../diagnostics.js';
+import { parseChannel } from '../diagnostics.js';
 
 import type {
   ArgumentCoordinateNode,
@@ -134,7 +134,7 @@ export function parse(
   source: string | Source,
   options?: ParseOptions,
 ): DocumentNode {
-  return shouldTrace(parseChannel)
+  return parseChannel?.hasSubscribers
     ? parseChannel.traceSync(() => parseImpl(source, options), { source })
     : parseImpl(source, options);
 }

src/validation/validate.ts

@@ -12,7 +12,7 @@ import { assertValidSchema } from '../type/validate.js';
 
 import { TypeInfo, visitWithTypeInfo } from '../utilities/TypeInfo.js';
 
-import { shouldTrace, validateChannel } from '../diagnostics.js';
+import { validateChannel } from '../diagnostics.js';
 
 import { specifiedRules, specifiedSDLRules } from './specifiedRules.js';
 import type { SDLValidationRule, ValidationRule } from './ValidationContext.js';
@@ -63,7 +63,7 @@ export function validate(
   rules: ReadonlyArray<ValidationRule> = specifiedRules,
   options?: ValidationOptions,
 ): ReadonlyArray<GraphQLError> {
-  return shouldTrace(validateChannel)
+  return validateChannel?.hasSubscribers
     ? validateChannel.traceSync(
         () => validateImpl(schema, documentAST, rules, options),
         { schema, document: documentAST },