More

graphql-hive · Feb 12, 2025 · a3b872e · a3b872e
1 parent 4703c15
commit a3b872e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 15 deletions.
diff --git a/packages/fusion-runtime/src/utils.ts b/packages/fusion-runtime/src/utils.ts
@@ -291,7 +291,7 @@ export function wrapExecutorWithHooks({
       }
       loggerForExecutionRequest.set(baseExecutionRequest, execReqLogger);
     }
-    execReqLogger = execReqLogger?.child?.(subgraphName);
+    execReqLogger = execReqLogger?.child?.({ subgraph: subgraphName });
     if (onSubgraphExecuteHooks.length === 0) {
       return baseExecutor(baseExecutionRequest);
     }

diff --git a/packages/runtime/src/plugins/useFetchDebug.ts b/packages/runtime/src/plugins/useFetchDebug.ts
@@ -10,15 +10,11 @@ export function useFetchDebug<TContext extends Record<string, any>>(opts: {
     onYogaInit({ yoga }) {
       fetchAPI = yoga.fetchAPI;
     },
-    onFetch({ url, options, logger = opts.logger, requestId }) {
+    onFetch({ url, options, logger = opts.logger }) {
       const fetchId = fetchAPI.crypto.randomUUID();
-      const loggerMeta: Record<string, string> = {
+      const fetchLogger = logger.child({
         fetchId,
-      };
-      if (requestId) {
-        loggerMeta['requestId'] = requestId;
-      }
-      const fetchLogger = logger.child(loggerMeta);
+      });
       const httpFetchRequestLogger = fetchLogger.child('http-fetch-request');
       httpFetchRequestLogger.debug(() => ({
         url,

diff --git a/packages/runtime/src/plugins/useSubgraphExecuteDebug.ts b/packages/runtime/src/plugins/useSubgraphExecuteDebug.ts
@@ -11,15 +11,11 @@ export function useSubgraphExecuteDebug<
     onYogaInit({ yoga }) {
       fetchAPI = yoga.fetchAPI;
     },
-    onSubgraphExecute({ executionRequest, logger = opts.logger, requestId }) {
+    onSubgraphExecute({ executionRequest, logger = opts.logger }) {
       const subgraphExecuteId = fetchAPI.crypto.randomUUID();
-      const loggerMeta: Record<string, string> = {
+      const subgraphExecuteHookLogger = logger.child({
         subgraphExecuteId,
-      };
-      if (requestId) {
-        loggerMeta['requestId'] = requestId;
-      }
-      const subgraphExecuteHookLogger = logger.child(loggerMeta);
+      });
       if (executionRequest) {
         const subgraphExecuteStartLogger = subgraphExecuteHookLogger.child(
           'subgraph-execute-start',