move subscription event tracing to mapSourceToResponse

to cover custom perEventExecutors

Author: yaacovCR

src/execution/execute.ts

@@ -268,14 +268,7 @@ export function executeSync(args: ExecutionArgs): ExecutionResult {
 export function executeSubscriptionEvent(
   validatedExecutionArgs: ValidatedExecutionArgs,
 ): PromiseOrValue<ExecutionResult> {
-  if (!executeChannel?.hasSubscribers) {
-    return executeQueryOrMutationOrSubscriptionEvent(validatedExecutionArgs);
-  }
-  return traceMixed(
-    executeChannel,
-    buildExecuteCtxFromValidatedArgs(validatedExecutionArgs),
-    () => executeQueryOrMutationOrSubscriptionEvent(validatedExecutionArgs),
-  );
+  return executeQueryOrMutationOrSubscriptionEvent(validatedExecutionArgs);
 }
 
 /**
@@ -624,7 +617,14 @@ function mapSourceToResponse(
       ...validatedExecutionArgs,
       rootValue: payload,
     };
-    return validatedExecutionArgs.perEventExecutor(perEventExecutionArgs);
+    if (!executeChannel?.hasSubscribers) {
+      return validatedExecutionArgs.perEventExecutor(perEventExecutionArgs);
+    }
+    return traceMixed(
+      executeChannel,
+      buildExecuteCtxFromValidatedArgs(validatedExecutionArgs),
+      () => validatedExecutionArgs.perEventExecutor(perEventExecutionArgs),
+    );
   }
 
   const externalAbortSignal = validatedExecutionArgs.externalAbortSignal;